From fe6ff5794545ce9f7d00985b55cf9d5b18725ea0 Mon Sep 17 00:00:00 2001
From: Tristan Gingold
Date: Fri, 5 Sep 2014 06:05:19 +0200
Subject: First run (using mcode) of OSVVM_2014_01.

---
 translate/ghdldrv/Makefile    |  2 +-
 translate/ghdldrv/ghdlrun.adb | 53 ++++++++++++++++++++++++++++---------------
 2 files changed, 36 insertions(+), 19 deletions(-)

(limited to 'translate/ghdldrv')

diff --git a/translate/ghdldrv/Makefile b/translate/ghdldrv/Makefile
index 9dd86b6..fc24312 100644
--- a/translate/ghdldrv/Makefile
+++ b/translate/ghdldrv/Makefile
@@ -155,7 +155,7 @@ grt.links:
 install.all: install.v87 install.v93 install.standard
 
 install.mcode:
-	$(MAKE) GHDL=ghdl_mcode install.v87 install.v93 # install.v08
+	$(MAKE) GHDL=ghdl_mcode install.v87 install.v93 install.v08
 
 install.simul:
 	$(MAKE) GHDL=ghdl_simul install.v87 install.v93 install.v08
diff --git a/translate/ghdldrv/ghdlrun.adb b/translate/ghdldrv/ghdlrun.adb
index cded351..cc01c83 100644
--- a/translate/ghdldrv/ghdlrun.adb
+++ b/translate/ghdldrv/ghdlrun.adb
@@ -59,6 +59,7 @@ with Grt.Types;
 with Grt.Images;
 with Grt.Values;
 with Grt.Names;
+with Grt.Std_Logic_1164;
 
 with Ghdlcomp;
 with Foreigns;
@@ -335,8 +336,8 @@ package body Ghdlrun is
 
       Def (Trans_Decls.Ghdl_Signal_Driving,
            Grt.Signals.Ghdl_Signal_Driving'Address);
-      Def (Trans_Decls.Ghdl_Signal_Driving_Value_B2,
-           Grt.Signals.Ghdl_Signal_Driving_Value_B2'Address);
+      Def (Trans_Decls.Ghdl_Signal_Driving_Value_B1,
+           Grt.Signals.Ghdl_Signal_Driving_Value_B1'Address);
       Def (Trans_Decls.Ghdl_Signal_Driving_Value_E8,
            Grt.Signals.Ghdl_Signal_Driving_Value_E8'Address);
       Def (Trans_Decls.Ghdl_Signal_Driving_Value_E32,
@@ -366,18 +367,18 @@ package body Ghdlrun is
       Def (Trans_Decls.Ghdl_Signal_Direct_Assign,
            Grt.Signals.Ghdl_Signal_Direct_Assign'Address);
 
-      Def (Trans_Decls.Ghdl_Create_Signal_B2,
-           Grt.Signals.Ghdl_Create_Signal_B2'Address);
-      Def (Trans_Decls.Ghdl_Signal_Init_B2,
-           Grt.Signals.Ghdl_Signal_Init_B2'Address);
-      Def (Trans_Decls.Ghdl_Signal_Simple_Assign_B2,
-           Grt.Signals.Ghdl_Signal_Simple_Assign_B2'Address);
-      Def (Trans_Decls.Ghdl_Signal_Start_Assign_B2,
-           Grt.Signals.Ghdl_Signal_Start_Assign_B2'Address);
-      Def (Trans_Decls.Ghdl_Signal_Next_Assign_B2,
-           Grt.Signals.Ghdl_Signal_Next_Assign_B2'Address);
-      Def (Trans_Decls.Ghdl_Signal_Associate_B2,
-           Grt.Signals.Ghdl_Signal_Associate_B2'Address);
+      Def (Trans_Decls.Ghdl_Create_Signal_B1,
+           Grt.Signals.Ghdl_Create_Signal_B1'Address);
+      Def (Trans_Decls.Ghdl_Signal_Init_B1,
+           Grt.Signals.Ghdl_Signal_Init_B1'Address);
+      Def (Trans_Decls.Ghdl_Signal_Simple_Assign_B1,
+           Grt.Signals.Ghdl_Signal_Simple_Assign_B1'Address);
+      Def (Trans_Decls.Ghdl_Signal_Start_Assign_B1,
+           Grt.Signals.Ghdl_Signal_Start_Assign_B1'Address);
+      Def (Trans_Decls.Ghdl_Signal_Next_Assign_B1,
+           Grt.Signals.Ghdl_Signal_Next_Assign_B1'Address);
+      Def (Trans_Decls.Ghdl_Signal_Associate_B1,
+           Grt.Signals.Ghdl_Signal_Associate_B1'Address);
 
       Def (Trans_Decls.Ghdl_Create_Signal_E8,
            Grt.Signals.Ghdl_Create_Signal_E8'Address);
@@ -502,8 +503,8 @@ package body Ghdlrun is
       Def (Trans_Decls.Ghdl_File_Endfile,
            Grt.Files.Ghdl_File_Endfile'Address);
 
-      Def (Trans_Decls.Ghdl_Image_B2,
-           Grt.Images.Ghdl_Image_B2'Address);
+      Def (Trans_Decls.Ghdl_Image_B1,
+           Grt.Images.Ghdl_Image_B1'Address);
       Def (Trans_Decls.Ghdl_Image_E8,
            Grt.Images.Ghdl_Image_E8'Address);
       Def (Trans_Decls.Ghdl_Image_E32,
@@ -517,8 +518,8 @@ package body Ghdlrun is
       Def (Trans_Decls.Ghdl_Image_P32,
            Grt.Images.Ghdl_Image_P32'Address);
 
-      Def (Trans_Decls.Ghdl_Value_B2,
-           Grt.Values.Ghdl_Value_B2'Address);
+      Def (Trans_Decls.Ghdl_Value_B1,
+           Grt.Values.Ghdl_Value_B1'Address);
       Def (Trans_Decls.Ghdl_Value_E8,
            Grt.Values.Ghdl_Value_E8'Address);
       Def (Trans_Decls.Ghdl_Value_E32,
@@ -537,6 +538,22 @@ package body Ghdlrun is
       Def (Trans_Decls.Ghdl_Get_Instance_Name,
            Grt.Names.Ghdl_Get_Instance_Name'Address);
 
+      Def (Trans_Decls.Ghdl_Std_Ulogic_Match_Eq,
+           Grt.Std_Logic_1164.Ghdl_Std_Ulogic_Match_Eq'Address);
+      Def (Trans_Decls.Ghdl_Std_Ulogic_Match_Ne,
+           Grt.Std_Logic_1164.Ghdl_Std_Ulogic_Match_Ne'Address);
+      Def (Trans_Decls.Ghdl_Std_Ulogic_Match_Lt,
+           Grt.Std_Logic_1164.Ghdl_Std_Ulogic_Match_Lt'Address);
+      Def (Trans_Decls.Ghdl_Std_Ulogic_Match_Le,
+           Grt.Std_Logic_1164.Ghdl_Std_Ulogic_Match_Le'Address);
+
+      Def (Trans_Decls.Ghdl_To_String_I32,
+           Grt.Images.Ghdl_To_String_I32'Address);
+      Def (Trans_Decls.Ghdl_To_String_F64,
+           Grt.Images.Ghdl_To_String_F64'Address);
+      Def (Trans_Decls.Ghdl_To_String_F64_Digits,
+           Grt.Images.Ghdl_To_String_F64_Digits'Address);
+
       --  Find untruncated_text_read, if any.
       Decl := Find_Untruncated_Text_Read;
       if Decl /= O_Dnode_Null then
-- 
cgit