Revert "src: Add -Wpsl-uncovered option to optionally warn about uncovered PSL sequences at the end of simulation."

This reverts commit e20d4477f9b55f897d4f9008d6c94db8d8c3a54f.

4 files changed, 17 insertions, 31 deletions

diff --git a/src/flags.ads b/src/flags.ads
index af99e3fe7..18dbf1e14 100644
--- a/src/flags.ads
+++ b/src/flags.ads
@@ -158,10 +158,6 @@ package Flags is
    --  If True, disp original source line and a caret indicating the column.
    Flag_Caret_Diagnostics : Boolean := False;
 
-   -- If True, warning is printed for each uncovered PSL cover points at the
-   -- end of simulation
-   Flag_Psl_Warn_Uncovered : Boolean := False;
-
    type On_Off_Auto_Type is (On, Off, Auto);
 
    --  -fcolor-diagnostics
diff --git a/src/grt/grt-lib.adb b/src/grt/grt-lib.adb
index 81383d3a7..af3b52567 100644
--- a/src/grt/grt-lib.adb
+++ b/src/grt/grt-lib.adb
@@ -139,7 +139,8 @@ package body Grt.Lib is
    procedure Ghdl_Psl_Cover_Failed
      (Str : Std_String_Ptr; Severity : Integer; Loc : Ghdl_Location_Ptr) is
    begin
-      Do_Report ("psl cover", Str, "sequence not covered", Severity, Loc);
+      Do_Report ("psl cover failure",
+                 Str, "sequence not covered", Severity, Loc);
    end Ghdl_Psl_Cover_Failed;
 
    procedure Ghdl_Report (Str : Std_String_Ptr;
diff --git a/src/options.adb b/src/options.adb
index 7aa31e253..6fa3df36e 100644
--- a/src/options.adb
+++ b/src/options.adb
@@ -100,12 +100,6 @@ package body Options is
          return Option_Ok;
       end if;
 
-      -- Handles -Wpsl-uncovered
-      if Opt = "psl-uncovered" then
-         Flag_Psl_Warn_Uncovered := True;
-         return Option_Ok;
-      end if;
-
       --  Unknown warning.
       Error_Msg_Option ("unknown warning identifier");
       return Option_Err;
@@ -295,20 +289,17 @@ package body Options is
       P ("  -Wspecs            warns if a all/others spec does not apply");
       P ("  -Wunused           warns if a subprogram is never used");
       P ("  -Werror            turns warnings into errors");
-      P ("  -Wpsl-uncovered    Prints warning after simulation for each");
-      P ("                     uncovered PSL cover point.");
-      P ("                     Only valid with '-fpsl'");
 --    P ("Simulation option:");
 --    P ("  --assert-level=LEVEL     set the level which stop the");
 --    P ("           simulation.  LEVEL is note, warning, error,");
 --    P ("           failure or none");
       P ("Extensions:");
-      P ("  -fexplicit        give priority to explicitly declared operator");
-      P ("  -frelaxed-rules   relax some LRM rules");
-      P ("  -C  --mb-comments allow multi-bytes chars in a comment");
-      P ("  --bootstrap       allow --work=std");
-      P ("  --syn-binding     use synthesis default binding rule");
-      P ("  -fpsl             parse psl in comments");
+      P ("  -fexplicit         give priority to explicitly declared operator");
+      P ("  -frelaxed-rules    relax some LRM rules");
+      P ("  -C  --mb-comments  allow multi-bytes chars in a comment");
+      P ("  --bootstrap        allow --work=std");
+      P ("  --syn-binding      use synthesis default binding rule");
+      P ("  -fpsl              parse psl in comments");
       P ("Compilation list:");
       P ("  -l[sca]            after semantics, canon or annotation");
       P ("  --lall             -lX options apply to all files");
diff --git a/src/vhdl/translate/trans-chap9.adb b/src/vhdl/translate/trans-chap9.adb
index 70ee8fa16..60b19d222 100644
--- a/src/vhdl/translate/trans-chap9.adb
+++ b/src/vhdl/translate/trans-chap9.adb
@@ -489,17 +489,15 @@ package body Trans.Chap9 is
                                             Ghdl_Location_Ptr_Node));
       New_Procedure_Call (Assocs);
 
-      if Flags.Flag_Psl_Warn_Uncovered = True then
-         New_Else_Stmt (Blk);
-
-         Start_Association (Assocs, Ghdl_Psl_Cover_Failed);
-         New_Association (Assocs, New_Obj_Value (Msg_Var));
-         New_Association (Assocs, New_Lit (Get_Ortho_Literal
-                                          (Severity_Level_Warning)));
-         New_Association (Assocs, New_Address (New_Obj (Loc),
-                          Ghdl_Location_Ptr_Node));
-         New_Procedure_Call (Assocs);
-      end if;
+      New_Else_Stmt (Blk);
+
+      Start_Association (Assocs, Ghdl_Psl_Cover_Failed);
+      New_Association (Assocs, New_Obj_Value (Msg_Var));
+      New_Association (Assocs, New_Lit (Get_Ortho_Literal
+                                          (Severity_Level_Error)));
+      New_Association (Assocs, New_Address (New_Obj (Loc),
+                                            Ghdl_Location_Ptr_Node));
+      New_Procedure_Call (Assocs);
 
       Finish_If_Stmt (Blk);