From f2b3d9d9ee7a58af207e23480eb1b729658ca888 Mon Sep 17 00:00:00 2001
From: tmeissner <programming@goodcleanfun.de>
Date: Sun, 17 May 2020 22:11:48 +0200
Subject: [PATCH] Add issue code for goto ([->]) operator (ghdl/ghdl#1322)

---
 README.md             |   2 +
 issues/issue_1321.vhd |  12 +++--
 issues/issue_1322.vhd | 102 ++++++++++++++++++++++++++++++++++++++++++
 issues/tests.mk       |   4 +-
 4 files changed, 116 insertions(+), 4 deletions(-)
 create mode 100644 issues/issue_1322.vhd

diff --git a/README.md b/README.md
index ad75e66..b016905 100644
--- a/README.md
+++ b/README.md
@@ -54,6 +54,8 @@ The next lists will grow during further development
 
 * forall statement
 * Synthesis of strong operator versions
+* SERE non consecutive repetition operator ([=n], [=i to j])
+* SERE goto repetition operator ([->], [->n], [->i to j])
 
 ## PSL features supported by GHDL but with wrong behaviour
 
diff --git a/issues/issue_1321.vhd b/issues/issue_1321.vhd
index fba6d95..f17a642 100644
--- a/issues/issue_1321.vhd
+++ b/issues/issue_1321.vhd
@@ -86,11 +86,17 @@ begin
   -- All is sensitive to rising edge of clk
   default clock is rising_edge(clk);
 
-  -- Non consecutive repetition of 2 cycles with possible padding at the end
+  -- Non consecutive repetition of 3 cycles with possible padding
   -- busy has to hold on 3 cycles between req & done
   -- This assertion holds
-  -- Not yet supported in synthesis
-  SERE_1_a : assert always {req} |=> {busy[=3]; done};
+  -- Not yet supported
+  SERE_0_a : assert always {req} |=> {busy[=3]; done};
+
+  -- Non consecutive repetition of 2 to 4 cycles with possible padding
+  -- busy has to hold on 2 to 4 cycles between req & done
+  -- This assertion holds
+  -- Not yet supported
+  SERE_1_a : assert always {req} |=> {busy[=2 to 4]; done};
 
 
 end architecture psl;
diff --git a/issues/issue_1322.vhd b/issues/issue_1322.vhd
new file mode 100644
index 0000000..c39e759
--- /dev/null
+++ b/issues/issue_1322.vhd
@@ -0,0 +1,102 @@
+library ieee;
+  use ieee.std_logic_1164.all;
+
+
+entity sequencer is
+  generic (
+    seq : string
+  );
+  port (
+    clk  : in  std_logic;
+    data : out std_logic
+  );
+end entity sequencer;
+
+
+architecture rtl of sequencer is
+
+  signal index : natural := seq'low;
+
+  function to_bit (a : in character) return std_logic is
+    variable ret : std_logic;
+  begin
+    case a is
+      when '0' | '_' => ret := '0';
+      when '1' | '-' => ret := '1';
+      when others    => ret := 'X';
+    end case;
+    return ret;
+  end function to_bit;
+
+begin
+
+  process (clk) is
+  begin
+    if rising_edge(clk) then
+      if (index < seq'high) then
+        index <= index + 1;
+      end if;
+    end if;
+  end process;
+
+  data <= to_bit(seq(index));
+
+end architecture rtl;
+
+
+library ieee;
+  use ieee.std_logic_1164.all;
+
+
+library ieee;
+  use ieee.std_logic_1164.all;
+  use ieee.numeric_std.all;
+
+
+entity issue is
+  port (
+    clk : in std_logic
+  );
+end entity issue;
+
+
+architecture psl of issue is
+
+  component sequencer is
+    generic (
+      seq : string
+    );
+    port (
+      clk  : in  std_logic;
+      data : out std_logic
+    );
+  end component sequencer;
+
+  signal req, busy, done : std_logic;
+
+begin
+
+
+  --                                 0123456789
+  SEQ_REQ  : sequencer generic map ("_-_______") port map (clk, req);
+  SEQ_BUSY : sequencer generic map ("__-_-_-__") port map (clk, busy);
+  SEQ_DONE : sequencer generic map ("_______-_") port map (clk, done);
+
+
+  -- All is sensitive to rising edge of clk
+  default clock is rising_edge(clk);
+
+  -- Non consecutive repetition of 3 cycles without padding
+  -- busy has to hold on 3 cycles between req & done
+  -- This assertion holds
+  -- Not yet supported
+  SERE_0_a : assert always {req} |=> {busy[->3]; done};
+
+  -- Non consecutive repetition of 2 to 4 cycles without padding
+  -- busy has to hold on 2 to 4 cycles between req & done
+  -- This assertion holds
+  -- Not yet supported
+  SERE_1_a : assert always {req} |=> {busy[->2 to 4]; done};
+
+
+end architecture psl;
diff --git a/issues/tests.mk b/issues/tests.mk
index d64fc56..cc02a6c 100644
--- a/issues/tests.mk
+++ b/issues/tests.mk
@@ -1,4 +1,6 @@
 psl_tests := \
 issue_1288 \
 issue_1292 \
-issue_1314
\ No newline at end of file
+issue_1314 \
+issue_1321 \
+issue_1322
\ No newline at end of file