diff options
| author | Tristan Gingold <tgingold@free.fr> | 2022-09-19 07:44:55 +0200 |
|---|---|---|
| committer | Tristan Gingold <tgingold@free.fr> | 2022-09-19 07:44:55 +0200 |
| commit | 5914540dae94dbaa9623b086291428f6f3c747a0 (patch) | |
| tree | c2446882c5bf16b89ef2206cdc9fc1a050cf02ae | |
| parent | e9d3ea593a34798d9128393731bbdc543f4a850e (diff) | |
| download | ghdl-5914540dae94dbaa9623b086291428f6f3c747a0.tar.gz ghdl-5914540dae94dbaa9623b086291428f6f3c747a0.tar.bz2 ghdl-5914540dae94dbaa9623b086291428f6f3c747a0.zip | |
synth: simplify elab-vhdl_annotations
| -rw-r--r-- | src/synth/elab-vhdl_annotations.adb | 18 | ||||
| -rw-r--r-- | src/synth/elab-vhdl_annotations.ads | 36 |
2 files changed, 3 insertions, 51 deletions
diff --git a/src/synth/elab-vhdl_annotations.adb b/src/synth/elab-vhdl_annotations.adb index dc6241315..666e24ed4 100644 --- a/src/synth/elab-vhdl_annotations.adb +++ b/src/synth/elab-vhdl_annotations.adb @@ -16,8 +16,10 @@ with Ada.Unchecked_Deallocation; +with Types; use Types; with Tables; with Simple_IO; + with Vhdl.Std_Package; with Vhdl.Errors; use Vhdl.Errors; with Vhdl.Utils; use Vhdl.Utils; @@ -93,8 +95,6 @@ package body Elab.Vhdl_Annotations is | Kind_Frame | Kind_Protected | Kind_Package - | Kind_Scalar_Types - | Kind_File_Type | Kind_Extra => raise Internal_Error; end case; @@ -1308,9 +1308,7 @@ package body Elab.Vhdl_Annotations is | Kind_Quantity | Kind_PSL => Put_Line ("-- slot:" & Object_Slot_Type'Image (Info.Slot)); - when Kind_Scalar_Types - | Kind_File_Type - | Kind_Extra => + when Kind_Extra => null; end case; end Disp_Vhdl_Info; @@ -1346,16 +1344,6 @@ package body Elab.Vhdl_Annotations is Put_Line ("slot:" & Object_Slot_Type'Image (Info.Slot)); when Kind_Extra => Put_Line ("extra:" & Extra_Slot_Type'Image (Info.Extra_Slot)); - when Kind_Scalar_Types => - Put_Line ("scalar type"); - when Kind_File_Type => - Put ("file type: "); - if Info.File_Signature = null then - Put ("(no sig)"); - else - Put (Info.File_Signature.all); - end if; - New_Line; end case; end Disp_Info; diff --git a/src/synth/elab-vhdl_annotations.ads b/src/synth/elab-vhdl_annotations.ads index fa06ff6d3..b8888adf0 100644 --- a/src/synth/elab-vhdl_annotations.ads +++ b/src/synth/elab-vhdl_annotations.ads @@ -14,7 +14,6 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see <gnu.org/licenses>. -with Types; use Types; with Vhdl.Nodes; use Vhdl.Nodes; package Elab.Vhdl_Annotations is @@ -34,9 +33,6 @@ package Elab.Vhdl_Annotations is type Sim_Info_Kind is ( Kind_Block, Kind_Process, Kind_Frame, Kind_Protected, Kind_Package, - Kind_Bit_Type, Kind_Log_Type, - Kind_E8_Type, Kind_E32_Type, Kind_I64_Type, Kind_F64_Type, - Kind_File_Type, Kind_Type, Kind_Object, Kind_Signal, Kind_File, @@ -45,27 +41,6 @@ package Elab.Vhdl_Annotations is Kind_Extra ); - subtype Kind_Scalar_Types is Sim_Info_Kind range - Kind_Bit_Type .. - --Kind_Log_Type - --Kind_E8_Type - --Kind_E32_Type - --Kind_I64_Type - Kind_F64_Type; - - subtype Kind_Discrete_Types is Sim_Info_Kind range - Kind_Bit_Type .. - --Kind_Log_Type - --Kind_E8_Type - --Kind_E32_Type - Kind_I64_Type; - - subtype Kind_Enum_Types is Sim_Info_Kind range - Kind_Bit_Type .. - --Kind_Log_Type - --Kind_E8_Type - Kind_E32_Type; - type Instance_Slot_Type is new Integer; Invalid_Instance_Slot : constant Instance_Slot_Type := -1; @@ -115,17 +90,6 @@ package Elab.Vhdl_Annotations is -- Variable index in the block. Slot: Object_Slot_Type; - when Kind_Bit_Type - | Kind_Log_Type - | Kind_E8_Type - | Kind_E32_Type - | Kind_I64_Type - | Kind_F64_Type => - Width : Uns32; - - when Kind_File_Type => - File_Signature : String_Acc; - when Kind_Extra => Extra_Slot : Extra_Slot_Type; end case; |