From 95295b419c04c19af670067a8750bb6bc271d9c4 Mon Sep 17 00:00:00 2001
From: Stu Grossman <grossman@cygnus>
Date: Fri, 15 Sep 1995 02:36:10 +0000
Subject: [PATCH] 	* 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[].

---
 sim/sh/ChangeLog |  8 ++++++++
 sim/sh/interp.c  | 17 +++++++++--------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/sim/sh/ChangeLog b/sim/sh/ChangeLog
index 24ae4f46de..e2488c1ef1 100644
--- 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 3c265261e0..1d22029e61 100644
--- 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