sim: mn10300: resolve syscalls dynamically

Avoid use of TARGET_<syscall> defines and rely on the callback layers
to resolve these dynamically so we can support multiple syscall layers
instead of assuming the newlib/libgloss numbers all the time.

diff --git a/sim/mn10300/mn10300.igen b/sim/mn10300/mn10300.igen
index f67468da17ebb58090637e8d9fc397e7ac8c66f1..9431c0b5179094692a9863a7c6dc0a1e402cdd49 100644 (file)
--- a/sim/mn10300/mn10300.igen
+++ b/sim/mn10300/mn10300.igen
@@ -3947,7 +3947,7 @@
 {
   /* OP_F0C0 (); */
   PC = cia;
-  do_syscall ();
+  do_syscall (SD);
 }
 
 

diff --git a/sim/mn10300/mn10300_sim.h b/sim/mn10300/mn10300_sim.h
index f3e43a7c69ad16259267ffa303a9b4caa8c2a63f..82306e667d2f1db02dad88bbc634f010a3062321 100644 (file)
--- a/sim/mn10300/mn10300_sim.h
+++ b/sim/mn10300/mn10300_sim.h
@@ -200,7 +200,7 @@ 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 (void) do_syscall (void);
+INLINE_SIM_MAIN (void) do_syscall (SIM_DESC sd);
 void program_interrupt (SIM_DESC sd, sim_cpu *cpu, sim_cia cia, SIM_SIGNAL sig);
 
 void mn10300_cpu_exception_trigger(SIM_DESC sd, sim_cpu* cpu, address_word pc);

diff --git a/sim/mn10300/op_utils.c b/sim/mn10300/op_utils.c
index df95be3b1ac4e7ea02ab397fc122c7bbfb388239..eb4439f5f09ce48345d8a4a042ad3b5b6a2f1d19 100644 (file)
--- a/sim/mn10300/op_utils.c
+++ b/sim/mn10300/op_utils.c
@@ -4,7 +4,6 @@
 #include "sim-main.h"
 #include "sim-signal.h"
 #include "sim-syscall.h"
-#include "targ-vals.h"
 
 #include <time.h>
 #ifdef HAVE_UNISTD_H
@@ -132,7 +131,7 @@ genericBtst(unsigned32 leftOpnd, unsigned32 rightOpnd)
 
 /* syscall */
 INLINE_SIM_MAIN (void)
-do_syscall (void)
+do_syscall (SIM_DESC sd)
 {
   /* Registers passed to trap 0.  */
 
@@ -150,7 +149,7 @@ do_syscall (void)
   int save_errno = errno;      
   errno = 0;
 
-  if (func == TARGET_SYS_exit)
+  if (cb_target_to_host_syscall (STATE_CALLBACK (sd), func) == CB_SYS_exit)
     {
       /* EXIT - caller can look in parm1 to work out the reason */
       sim_engine_halt (simulator, STATE_CPU (simulator, 0), NULL, PC,