* gencode.c: Back up PC by 2 for breakpoints.

	* interp.c:  Move fp regs beyond pc/pr/etc to avoid confusing GDB,
	which expect pc to immediatly follow regs[].

diff --git a/sim/sh/ChangeLog b/sim/sh/ChangeLog
index 24ae4f46dee31658a296fe2be134ed9ca790709d..e2488c1ef19fc3c4dfefad027d18e0d7122a30f4 100644 (file)
--- a/sim/sh/ChangeLog
+++ b/sim/sh/ChangeLog
@@ -1,3 +1,11 @@
+start-sanitize-sh3e
+Thu Sep 14 19:32:59 1995  Stu Grossman  (grossman@cygnus.com)
+
+       * gencode.c:  Back up PC by 2 for breakpoints.
+       * interp.c:  Move fp regs beyond pc/pr/etc to avoid confusing GDB,
+       which expect pc to immediatly follow regs[].
+
+end-sanitize-sh3e
 Fri Sep  8 14:18:13 1995  Ian Lance Taylor  <ian@cygnus.com>
 
        * configure.in: Define CC_FOR_BUILD.  Don't call AC_PROG_INSTALL.

diff --git a/sim/sh/interp.c b/sim/sh/interp.c
index 3c265261e08bebe1a7fc8faceffda15df4bbcaee..1d22029e61d310e39f988f09b26cf0faa3434282 100644 (file)
--- a/sim/sh/interp.c
+++ b/sim/sh/interp.c
@@ -24,6 +24,10 @@
 #include "remote-sim.h"
 #include <sys/syscall.h>
 
+/* start-sanitize-sh3e */
+#include <math.h>
+/* end-sanitize-sh3e */
+
 #if !defined (SYS_wait) && defined (SYS_wait4)
 #define SYS_wait SYS_wait4     /* SunOS 4.1.3 for example */
 #endif
@@ -120,9 +124,6 @@ typedef union
   {
 
     int regs[16];
-/* start-sanitize-sh3e */
-    float fregs[16];
-/* end-sanitize-sh3e */
     int pc;
     int pr;
 
@@ -131,11 +132,6 @@ typedef union
     int mach;
     int macl;
 
-/* start-sanitize-sh3e */
-    float fpscr;
-    int fpul;
-/* end-sanitize-sh3e */
-
     union
       {
        struct
@@ -160,6 +156,11 @@ typedef union
 
     int prevlock;
     int thislock;
+/* start-sanitize-sh3e */
+    float fregs[16];
+    float fpscr;
+    int fpul;
+/* end-sanitize-sh3e */
     int exception;
     int msize;
 #define PROFILE_FREQ 1