2007-09-24 Andrew Stubbs <andrew.stubbs@st.com>

	* gencode.c (tab): Add RAISE_EXCEPTION_IF_IN_DELAY_SLOT to the
	definition of PC relative 'mov.l'/'mov.w' and also 'mova'.

diff --git a/sim/sh/ChangeLog b/sim/sh/ChangeLog
index 8207483e99eab75e3a5c5b146ec31fb17cfd5e65..e06e7640e440e2642bc0faaac0b2f9c4406dbc9d 100644 (file)
--- a/sim/sh/ChangeLog
+++ b/sim/sh/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-08  Andrew Stubbs  <andrew.stubbs@st.com>
+
+       * gencode.c (tab): Add RAISE_EXCEPTION_IF_IN_DELAY_SLOT to the
+       definition of PC relative 'mov.l'/'mov.w' and also 'mova'.
+
 2007-03-02  Andrew Stubbs  <andrew.stubbs@st.com>
 
        * gencode.c (tab): Correct pre-decrement instructions when m == n.

diff --git a/sim/sh/gencode.c b/sim/sh/gencode.c
index 15313b0be0a6838afc42317513a7ccd41f6c586c..738b718e23ab86e3a7bda2e665b15d5cf270d177 100644 (file)
--- a/sim/sh/gencode.c
+++ b/sim/sh/gencode.c
@@ -993,6 +993,7 @@ op tab[] =
     "L (0);",
   },
   { "n", "", "mov.l @(<disp>,PC),<REG_N>", "1101nnnni8p4....",
+    "RAISE_EXCEPTION_IF_IN_DELAY_SLOT ();",
     "MA (1);",
     "R[n] = RLAT ((PH2T (PC) & ~3) + 4 + i);",
     "L (n);",
@@ -1059,6 +1060,7 @@ op tab[] =
     "L (0);",
   },
   { "n", "", "mov.w @(<disp>,PC),<REG_N>", "1001nnnni8p2....",
+    "RAISE_EXCEPTION_IF_IN_DELAY_SLOT ();",
     "MA (1);",
     "R[n] = RSWAT (PH2T (PC + 4 + i));",
     "L (n);",
@@ -1120,6 +1122,7 @@ op tab[] =
   },
 
   { "0", "", "mova @(<disp>,PC),R0", "11000111i8p4....",
+    "RAISE_EXCEPTION_IF_IN_DELAY_SLOT ();",
     "R0 = ((i + 4 + PH2T (PC)) & ~0x3);",
   },