grt: improve --disp-signals-table output.

4 files changed, 22 insertions, 5 deletions

diff --git a/src/grt/grt-disp_signals.adb b/src/grt/grt-disp_signals.adb
index 424d20dcf..ebb249954 100644
--- a/src/grt/grt-disp_signals.adb
+++ b/src/grt/grt-disp_signals.adb
@@ -425,6 +425,14 @@ package body Grt.Disp_Signals is
          if Sig.S.Mode_Sig in Mode_Signal_User then
             Put (" #drv: ");
             Put_I32 (stdout, Ghdl_I32 (Sig.S.Nbr_Drivers));
+            case Sig.Sig_Kind is
+               when Kind_Signal_No =>
+                  Put ("  ");
+               when Kind_Signal_Register =>
+                  Put (" reg");
+               when Kind_Signal_Bus =>
+                  Put (" bus");
+            end case;
             if Sig.S.Effective /= null then
                Put (" eff: ");
                Put (stdout, Sig.S.Effective.all'Address);
diff --git a/src/ortho/mcode/ortho_code-decls.adb b/src/ortho/mcode/ortho_code-decls.adb
index fcbf0b0de..2557204fe 100644
--- a/src/ortho/mcode/ortho_code-decls.adb
+++ b/src/ortho/mcode/ortho_code-decls.adb
@@ -22,6 +22,7 @@ with Ortho_Code.Debug; use Ortho_Code.Debug;
 with Ortho_Code.Exprs;
 with Ortho_Code.Abi; use Ortho_Code.Abi;
 with Ortho_Code.Flags;
+with Ortho_Code.Types;
 
 package body Ortho_Code.Decls is
    --  Common fields:
@@ -659,6 +660,8 @@ package body Ortho_Code.Decls is
             Disp_Decl_Name (Decl);
             Put (": ");
             Put (Int32 (Get_Decl_Type (Decl)), 0);
+            Put (", ");
+            Disp_Mode (Types.Get_Type_Mode (Get_Decl_Type (Decl)));
             Put (", offset=");
             Put (Get_Inter_Offset (Decl), 0);
          when OD_Const =>
diff --git a/src/ortho/mcode/ortho_code-x86-abi.adb b/src/ortho/mcode/ortho_code-x86-abi.adb
index bb06d51d4..7903c9650 100644
--- a/src/ortho/mcode/ortho_code-x86-abi.adb
+++ b/src/ortho/mcode/ortho_code-x86-abi.adb
@@ -196,6 +196,8 @@ package body Ortho_Code.X86.Abi is
       Put (Get_Local_Offset (Obj), 0);
       Put (" {");
       Disp_Decl_Name (Obj);
+      Put (":");
+      Debug.Disp_Mode (Types.Get_Type_Mode (Get_Decl_Type (Obj)));
       Put ("}");
    end Disp_Local;
 
diff --git a/src/vhdl/std_package.adb b/src/vhdl/std_package.adb
index 54ec4e06e..aad5262d7 100644
--- a/src/vhdl/std_package.adb
+++ b/src/vhdl/std_package.adb
@@ -225,17 +225,19 @@ package body Std_Package is
       procedure Create_Integer_Subtype (Type_Definition : Iir;
                                         Type_Decl : Iir;
                                         Subtype_Definition : out Iir;
-                                        Subtype_Decl : out Iir)
+                                        Subtype_Decl : out Iir;
+                                        Force_64 : Boolean := False)
       is
+         Is_64 : constant Boolean := Force_64 or Flags.Flag_Integer_64;
          Constraint : Iir;
       begin
          Subtype_Definition :=
            Create_Std_Iir (Iir_Kind_Integer_Subtype_Definition);
          Set_Base_Type (Subtype_Definition, Type_Definition);
          Constraint := Create_Std_Range_Expr
-           (Create_Std_Integer (Low_Bound (Flags.Flag_Integer_64),
+           (Create_Std_Integer (Low_Bound (Is_64),
                                 Universal_Integer_Type_Definition),
-            Create_Std_Integer (High_Bound (Flags.Flag_Integer_64),
+            Create_Std_Integer (High_Bound (Is_64),
                                 Universal_Integer_Type_Definition),
             Universal_Integer_Type_Definition);
          Set_Range_Constraint (Subtype_Definition, Constraint);
@@ -538,7 +540,8 @@ package body Std_Package is
          Create_Integer_Subtype (Universal_Integer_Type_Definition,
                                  Universal_Integer_Type_Declaration,
                                  Universal_Integer_Subtype_Definition,
-                                 Universal_Integer_Subtype_Declaration);
+                                 Universal_Integer_Subtype_Declaration,
+                                 False);
 
          Add_Decl (Universal_Integer_Subtype_Declaration);
          Set_Subtype_Definition (Universal_Integer_Type_Declaration,
@@ -610,7 +613,8 @@ package body Std_Package is
          Create_Integer_Subtype (Convertible_Integer_Type_Definition,
                                  Convertible_Integer_Type_Declaration,
                                  Convertible_Integer_Subtype_Definition,
-                                 Convertible_Integer_Subtype_Declaration);
+                                 Convertible_Integer_Subtype_Declaration,
+                                 False);
 
          --  Not added in std.standard.
       end;