aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/synth/netlists-disp_vhdl.adb11
-rw-r--r--src/synth/netlists-memories.adb2
2 files changed, 9 insertions, 4 deletions
diff --git a/src/synth/netlists-disp_vhdl.adb b/src/synth/netlists-disp_vhdl.adb
index 580eec452..0b2eb9110 100644
--- a/src/synth/netlists-disp_vhdl.adb
+++ b/src/synth/netlists-disp_vhdl.adb
@@ -766,9 +766,14 @@ package body Netlists.Disp_Vhdl is
begin
Val := Get_Input_Net (Mem, 1);
Val_Inst := Get_Net_Parent (Val);
- if Get_Id (Val_Inst) = Id_Isignal then
- Val := Get_Input_Net (Val_Inst, 1);
- end if;
+ case Get_Id (Val_Inst) is
+ when Id_Isignal =>
+ Val := Get_Input_Net (Val_Inst, 1);
+ when Id_Signal =>
+ Val := Get_Input_Net (Val_Inst, 0);
+ when others =>
+ null;
+ end case;
Put (" :=");
Disp_Memory_Init (Val, Data_W, Depth);
end;
diff --git a/src/synth/netlists-memories.adb b/src/synth/netlists-memories.adb
index 9f89adaa0..062a73a94 100644
--- a/src/synth/netlists-memories.adb
+++ b/src/synth/netlists-memories.adb
@@ -2341,7 +2341,7 @@ package body Netlists.Memories is
function Is_Const_Input (Inst : Instance) return Boolean is
begin
case Get_Id (Inst) is
- when Id_Const_Bit =>
+ when Constant_Module_Id =>
return True;
when Id_Signal
| Id_Isignal =>