mcode/binary_file: rename write routines.

7 files changed, 13 insertions, 16 deletions

diff --git a/src/ortho/mcode/binary_file-coff.adb b/src/ortho/mcode/binary_file-coff.adb
index cf3cba3f4..5115d37e8 100644
--- a/src/ortho/mcode/binary_file-coff.adb
+++ b/src/ortho/mcode/binary_file-coff.adb
@@ -15,13 +15,12 @@
 --  along with GCC; see the file COPYING.  If not, write to the Free
 --  Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 --  02111-1307, USA.
-with Ada.Characters.Latin_1;
 with Coff; use Coff;
 
 package body Binary_File.Coff is
-   NUL : Character renames Ada.Characters.Latin_1.NUL;
+   NUL : Character renames ASCII.NUL;
 
-   procedure Write_Coff (Fd : GNAT.OS_Lib.File_Descriptor)
+   procedure Write (Fd : GNAT.OS_Lib.File_Descriptor)
    is
       use GNAT.OS_Lib;
 
@@ -402,6 +401,6 @@ package body Binary_File.Coff is
             raise Program_Error;
          end if;
       end;
-   end Write_Coff;
+   end Write;
 
 end Binary_File.Coff;
diff --git a/src/ortho/mcode/binary_file-coff.ads b/src/ortho/mcode/binary_file-coff.ads
index e671555ea..014b5decb 100644
--- a/src/ortho/mcode/binary_file-coff.ads
+++ b/src/ortho/mcode/binary_file-coff.ads
@@ -18,6 +18,6 @@
 with GNAT.OS_Lib;
 
 package Binary_File.Coff is
-   procedure Write_Coff (Fd : GNAT.OS_Lib.File_Descriptor);
+   procedure Write (Fd : GNAT.OS_Lib.File_Descriptor);
 end Binary_File.Coff;
 
diff --git a/src/ortho/mcode/binary_file-elf.adb b/src/ortho/mcode/binary_file-elf.adb
index 329dbacd3..94f04e34d 100644
--- a/src/ortho/mcode/binary_file-elf.adb
+++ b/src/ortho/mcode/binary_file-elf.adb
@@ -16,12 +16,11 @@
 --  Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 --  02111-1307, USA.
 with Ada.Text_IO; use Ada.Text_IO;
-with Ada.Characters.Latin_1;
 with Elf_Common;
 with Elf32;
 
 package body Binary_File.Elf is
-   NUL : Character renames Ada.Characters.Latin_1.NUL;
+   NUL : Character renames ASCII.NUL;
 
    type Arch_Bool is array (Arch_Kind) of Boolean;
    Is_Rela : constant Arch_Bool := (Arch_Unknown => False,
@@ -29,7 +28,7 @@ package body Binary_File.Elf is
                                     Arch_Sparc => True,
                                     Arch_Ppc => True);
 
-   procedure Write_Elf (Fd : GNAT.OS_Lib.File_Descriptor)
+   procedure Write (Fd : GNAT.OS_Lib.File_Descriptor)
    is
       use Elf_Common;
       use Elf32;
@@ -674,6 +673,6 @@ package body Binary_File.Elf is
             end case;
          end loop;
       end;
-   end Write_Elf;
+   end Write;
 
 end Binary_File.Elf;
diff --git a/src/ortho/mcode/binary_file-elf.ads b/src/ortho/mcode/binary_file-elf.ads
index e0d3a4d2a..6575a15e7 100644
--- a/src/ortho/mcode/binary_file-elf.ads
+++ b/src/ortho/mcode/binary_file-elf.ads
@@ -18,5 +18,5 @@
 with GNAT.OS_Lib;
 
 package Binary_File.Elf is
-   procedure Write_Elf (Fd : GNAT.OS_Lib.File_Descriptor);
+   procedure Write (Fd : GNAT.OS_Lib.File_Descriptor);
 end Binary_File.Elf;
diff --git a/src/ortho/mcode/ortho_code_main.adb b/src/ortho/mcode/ortho_code_main.adb
index a0e6dc6c6..c515f581c 100644
--- a/src/ortho/mcode/ortho_code_main.adb
+++ b/src/ortho/mcode/ortho_code_main.adb
@@ -155,9 +155,9 @@ begin
       if Fd /= Invalid_FD then
          case Format is
             when Format_Elf =>
-               Binary_File.Elf.Write_Elf (Fd);
+               Binary_File.Elf.Write (Fd);
             when Format_Coff =>
-               Binary_File.Coff.Write_Coff (Fd);
+               Binary_File.Coff.Write (Fd);
          end case;
          Close (Fd);
       end if;
diff --git a/src/ortho/mcode/ortho_jit.adb b/src/ortho/mcode/ortho_jit.adb
index 7aa9724f2..907aea0b6 100644
--- a/src/ortho/mcode/ortho_jit.adb
+++ b/src/ortho/mcode/ortho_jit.adb
@@ -76,7 +76,7 @@ package body Ortho_Jit is
                Status := False;
                return;
             else
-               Binary_File.Elf.Write_Elf (Fd);
+               Binary_File.Elf.Write (Fd);
                Close (Fd);
             end if;
          end;
diff --git a/src/vhdl/translate/trans-chap3.adb b/src/vhdl/translate/trans-chap3.adb
index 3ecec89f4..cb5848826 100644
--- a/src/vhdl/translate/trans-chap3.adb
+++ b/src/vhdl/translate/trans-chap3.adb
@@ -593,7 +593,7 @@ package body Trans.Chap3 is
             case Kind is
                when Mode_Value =>
                   --  For the values.
-                  Id := Wki_Base;
+                  Id := Create_Identifier ("BASE");
                   Idptr := Create_Identifier ("BASEP");
                when Mode_Signal =>
                   --  For the signals
@@ -1979,10 +1979,9 @@ package body Trans.Chap3 is
 
          when Iir_Kind_Array_Type_Definition =>
             declare
-               El_Type : Iir;
+               El_Type : constant Iir := Get_Element_Subtype (Def);
                Mark    : Id_Mark_Type;
             begin
-               El_Type := Get_Element_Subtype (Def);
                if Get_Info (El_Type) = null then
                   Push_Identifier_Prefix (Mark, "ET");
                   Translate_Type_Definition (El_Type);