diff options
| -rw-r--r-- | errorout.adb | 44 | ||||
| -rw-r--r-- | errorout.ads | 25 | ||||
| -rw-r--r-- | translate/ghdldrv/ghdlsimul.adb | 5 |
3 files changed, 5 insertions, 69 deletions
diff --git a/errorout.adb b/errorout.adb index afc3b5a..87e5493 100644 --- a/errorout.adb +++ b/errorout.adb @@ -319,49 +319,6 @@ package body Errorout is Put_Line (Msg); end Error_Msg_Elab; - -- Disp a message during execution. - procedure Error_Msg_Exec (Msg: String; Loc: in Iir) is - begin - Nbr_Errors := Nbr_Errors + 1; - Disp_Iir_Location (Loc); - Put (' '); - Put_Line (Msg); - raise Simulation_Error; - end Error_Msg_Exec; - - procedure Warning_Msg_Exec (Msg: String; Loc: Iir) is - begin - Disp_Iir_Location (Loc); - Put ("warning: "); - Put_Line (Msg); - end Warning_Msg_Exec; - - -- Disp a message for a constraint error. - procedure Error_Msg_Constraint (Expr: in Iir) is - begin - Nbr_Errors := Nbr_Errors + 1; - if Expr /= Null_Iir then - Disp_Iir_Location (Expr); - end if; - Put ("constraint violation"); - if Expr /= Null_Iir then - case Get_Kind (Expr) is - when Iir_Kind_Addition_Operator => - Put_Line (" in the ""+"" operation"); - when Iir_Kind_Substraction_Operator => - Put_Line (" in the ""-"" operation"); - when Iir_Kind_Integer_Literal => - Put_Line (", literal out of range"); - when Iir_Kind_Signal_Interface_Declaration - | Iir_Kind_Signal_Declaration => - Put_Line (" for " & Disp_Node (Expr)); - when others => - Put_Line (""); - end case; - end if; - raise Execution_Constraint_Error; - end Error_Msg_Constraint; - -- Disp a bug message. procedure Error_Internal (Expr: in Iir; Msg: String := "") is @@ -384,7 +341,6 @@ package body Errorout is end if; end Disp_Label; - -- Disp a node. -- Used for output of message. function Disp_Node (Node: Iir) return String is diff --git a/errorout.ads b/errorout.ads index 2a8e489..fddd355 100644 --- a/errorout.ads +++ b/errorout.ads @@ -22,12 +22,6 @@ package Errorout is Option_Error: exception; Parse_Error: exception; Compilation_Error: exception; - Simulation_Error: exception; - Elaboration_Error : exception; - - -- This exception is raised when a constraint error is detected during - -- an evaluation of an expression. - Execution_Constraint_Error: exception; -- This kind can't be handled. --procedure Error_Kind (Msg: String; Kind: Iir_Kind); @@ -36,9 +30,6 @@ package Errorout is procedure Error_Kind (Msg : String; N : PSL_Node); pragma No_Return (Error_Kind); - -- Raise when an assertion of failure severity error fails. - Assertion_Failure: exception; - -- The number of errors (ie, number of calls to error_msg*). Nbr_Errors: Natural := 0; @@ -62,7 +53,6 @@ package Errorout is procedure Warning_Msg (Msg: String); procedure Warning_Msg_Parse (Msg: String); procedure Warning_Msg_Sem (Msg: String; Loc : Iir); - procedure Warning_Msg_Elab (Msg: String; Loc : Iir); procedure Warning_Msg_Sem (Msg: String; Loc : Location_Type); -- Disp a message during scan. @@ -83,19 +73,12 @@ package Errorout is procedure Error_Msg_Sem (Msg: String; Loc: PSL_Node); procedure Error_Msg_Sem (Msg: String; Loc: Location_Type); - -- Disp a message during elaboration. + -- Disp a message during elaboration (or configuration). procedure Error_Msg_Elab (Msg: String); procedure Error_Msg_Elab (Msg: String; Loc: Iir); - -- Disp a message during execution. - procedure Error_Msg_Exec (Msg: String; Loc: Iir); - pragma No_Return (Error_Msg_Exec); - - procedure Warning_Msg_Exec (Msg: String; Loc: Iir); - - -- Disp a message for a constraint error. - -- And raise the exception execution_constraint_error. - procedure Error_Msg_Constraint (Expr: Iir); + -- Disp a warning durig elaboration (or configuration). + procedure Warning_Msg_Elab (Msg: String; Loc : Iir); -- Disp a bug message. procedure Error_Internal (Expr: Iir; Msg: String := ""); @@ -138,6 +121,4 @@ package Errorout is -- Report an error message as type of EXPR does not match A_TYPE. -- Location is LOC. procedure Error_Not_Match (Expr: Iir; A_Type: Iir; Loc : Iir); - - end Errorout; diff --git a/translate/ghdldrv/ghdlsimul.adb b/translate/ghdldrv/ghdlsimul.adb index 107cc67..a50ed46 100644 --- a/translate/ghdldrv/ghdlsimul.adb +++ b/translate/ghdldrv/ghdlsimul.adb @@ -107,6 +107,8 @@ package body Ghdlsimul is Flag_Expect_Failure := True; elsif Arg.all = "--trace-elab" then Elaboration.Trace_Elaboration := True; + elsif Arg.all = "--trace-drivers" then + Elaboration.Trace_Drivers := True; elsif Arg.all = "--trace-annotation" then Annotations.Trace_Annotation := True; elsif Arg.all = "--trace-simu" then @@ -151,9 +153,6 @@ package body Ghdlsimul is Grtlink.Flag_String := Flags.Flag_String; Simulation.Simulation_Entity (Top_Conf); - exception - when Errorout.Execution_Constraint_Error => - null; end Run; function Decode_Option (Option : String) return Boolean |