X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=sim%2Fmn10300%2Fmn10300_sim.h;h=f70d486612bce2a2bbd694f748445d2821f5fe3c;hb=05e682e3be7e3d9d63ec358dcf8943fd200545cb;hp=9f0076aab0ad4418f27577beba2d79733651691b;hpb=5d19c36612c6b08627280bb0063ad1222b0a92dd;p=deliverable%2Fbinutils-gdb.git

diff --git a/sim/mn10300/mn10300_sim.h b/sim/mn10300/mn10300_sim.h
index 9f0076aab0..f70d486612 100644
--- a/sim/mn10300/mn10300_sim.h
+++ b/sim/mn10300/mn10300_sim.h
@@ -8,43 +8,14 @@
 #include "bfd.h"
 #include "sim-fpu.h"
 
-extern host_callback *mn10300_callback;
 extern SIM_DESC simulator;
 
-#define DEBUG_TRACE		0x00000001
-#define DEBUG_VALUES		0x00000002
-
-extern int mn10300_debug;
-
-#if UCHAR_MAX == 255
-typedef unsigned char uint8;
-typedef signed char int8;
-#else
-#error "Char is not an 8-bit type"
-#endif
-
-#if SHRT_MAX == 32767
-typedef unsigned short uint16;
-typedef signed short int16;
-#else
-#error "Short is not a 16-bit type"
-#endif
-
-#if INT_MAX == 2147483647
-
-typedef unsigned int uint32;
-typedef signed int int32;
-
-#else
-#  if LONG_MAX == 2147483647
-
-typedef unsigned long uint32;
-typedef signed long int32;
-
-#  else
-#  error "Neither int nor long is a 32-bit type"
-#  endif
-#endif
+typedef unsigned8 uint8;
+typedef signed8 int8;
+typedef unsigned16 uint16;
+typedef signed16 int16;
+typedef unsigned32 uint32;
+typedef signed32 int32;
 
 typedef struct
 {
@@ -75,9 +46,6 @@ struct _state
     reg_t fs[32]; /* FS0-31 */
     dword fd[16]; /* FD0,2,...,30 */
   } fpregs;
-  uint8 *mem;			/* main memory */
-  int exception;
-  int exited;
 
   /* All internal state modified by signal_exception() that may need to be
      rolled back for passing moment-of-exception image back to gdb. */
@@ -91,8 +59,6 @@ struct _state
 };
 
 extern struct _state State;
-extern uint32 OP[4];
-extern struct simops Simops[];
 
 #define PC	(State.regs[REG_PC])
 #define SP	(State.regs[REG_SP])
@@ -171,11 +137,6 @@ extern struct simops Simops[];
 #define FPU2FS(F,FS) sim_fpu_to32 (&(FS), &(F))
 #define FPU2FD(F,FD) sim_fpu_to232 (&((FD).high), &((FD).low), &(F))
 
-#ifdef _WIN32
-#define SIGTRAP 5
-#define SIGQUIT 3
-#endif
-
 #define FETCH32(a,b,c,d) \
  ((a)+((b)<<8)+((c)<<16)+((d)<<24))
 
@@ -232,31 +193,12 @@ dw2u64 (dword data)
 
 /* Function declarations.  */
 
-uint32 get_word (uint8 *);
-uint16 get_half (uint8 *);
-uint8 get_byte (uint8 *);
-void put_word (uint8 *, uint32);
-void put_half (uint8 *, uint16);
-void put_byte (uint8 *, uint8);
-
-extern uint8 *map (SIM_ADDR addr);
-
 INLINE_SIM_MAIN (void) genericAdd (unsigned32 source, unsigned32 destReg);
 INLINE_SIM_MAIN (void) genericSub (unsigned32 source, unsigned32 destReg);
 INLINE_SIM_MAIN (void) genericCmp (unsigned32 leftOpnd, unsigned32 rightOpnd);
 INLINE_SIM_MAIN (void) genericOr (unsigned32 source, unsigned32 destReg);
 INLINE_SIM_MAIN (void) genericXor (unsigned32 source, unsigned32 destReg);
 INLINE_SIM_MAIN (void) genericBtst (unsigned32 leftOpnd, unsigned32 rightOpnd);
-INLINE_SIM_MAIN (int) syscall_read_mem (host_callback *cb,
-					struct cb_syscall *sc,
-					unsigned long taddr,
-					char *buf,
-					int bytes);
-INLINE_SIM_MAIN (int) syscall_write_mem (host_callback *cb,
-					 struct cb_syscall *sc,
-					 unsigned long taddr,
-					 const char *buf,
-					 int bytes); 
 INLINE_SIM_MAIN (void) do_syscall (void);
 void program_interrupt (SIM_DESC sd, sim_cpu *cpu, sim_cia cia, SIM_SIGNAL sig);