Use remote-e7000.c

diff --git a/gdb/config/sh/sh.mt b/gdb/config/sh/sh.mt
index 744df7c5b32b30ff2f4f7f09ee4d57061c17cdc5..eee9de35323968b2b986c1e3c1060168a2a14ecb 100644 (file)
--- a/gdb/config/sh/sh.mt
+++ b/gdb/config/sh/sh.mt
@@ -1,5 +1,5 @@
 # Target: Hitachi Super-H ICE and simulator
-TDEPFILES= exec.o sh-tdep.o remote-sim.o interp.o table.o
+TDEPFILES= exec.o sh-tdep.o remote-sim.o interp.o table.o remote-e7000.o 
 
 over: all
 interp.o:

diff --git a/gdb/config/sh/tm-sh.h b/gdb/config/sh/tm-sh.h
index 61ce7c9b8555a0e4b5c84abdaaa9b84811b40dde..cff063b5deb6ed2111170526cf80737d471ecd70 100644 (file)
--- a/gdb/config/sh/tm-sh.h
+++ b/gdb/config/sh/tm-sh.h
@@ -63,7 +63,7 @@ extern CORE_ADDR sh_skip_prologue ();
 
 /* If your kernel resets the pc after the trap happens you may need to
    define this before including this file.  */
-#define DECR_PC_AFTER_BREAK 0
+#define DECR_PC_AFTER_BREAK 2
 
 /* Nonzero if instruction at PC is a return instruction.  */
 #define ABOUT_TO_RETURN(pc) (read_memory_integer(pc,2) == 0x000b)
@@ -128,8 +128,8 @@ extern CORE_ADDR sh_skip_prologue ();
 #define VBR_REGNUM     19
 #define MACH_REGNUM    20
 #define MACL_REGNUM    21
-#define CR_REGNUM      22
-
+#define SR_REGNUM      22
+#define NUM_REALREGS     23
 /* Store the address of the place in which to copy the structure the
    subroutine will return.  This is called from call_function. 
 
@@ -208,7 +208,7 @@ extern CORE_ADDR sh_skip_prologue ();
 
 typedef unsigned short INSN_WORD;
 
-#define ADDR_BITS_REMOVE(addr) ((addr) & 0xffffff)
+#define ADDR_BITS_REMOVE(addr) ((addr))
 
 #define CALL_DUMMY_LENGTH 10
 
@@ -217,3 +217,4 @@ typedef unsigned short INSN_WORD;
 
 #define POP_FRAME pop_frame();
 
+