diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2015-11-20 20:41:51 -0800 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-11-22 00:53:23 -0500 |
| commit | d320201dbe5a3677e96008738cb6cc754147e3bd (patch) | |
| tree | 311ff550d40fe28730a9a859144a427c5026ba99 | |
| parent | 3559ed3fa4b4b8496dc304e3eb35ef468f7c3601 (diff) | |
| download | gdb-d320201dbe5a3677e96008738cb6cc754147e3bd.zip gdb-d320201dbe5a3677e96008738cb6cc754147e3bd.tar.gz gdb-d320201dbe5a3677e96008738cb6cc754147e3bd.tar.bz2 | |
sim: mn10300: drop global callback handle
It's used in one place and can easily be replaced by using the sim state.
| -rw-r--r-- | sim/mn10300/ChangeLog | 7 | ||||
| -rw-r--r-- | sim/mn10300/interp.c | 7 | ||||
| -rw-r--r-- | sim/mn10300/mn10300_sim.h | 1 |
3 files changed, 8 insertions, 7 deletions
diff --git a/sim/mn10300/ChangeLog b/sim/mn10300/ChangeLog index 7a9d3b3..920625e 100644 --- a/sim/mn10300/ChangeLog +++ b/sim/mn10300/ChangeLog @@ -1,3 +1,10 @@ +2015-11-21 Mike Frysinger <vapier@gentoo.org> + + * interp.c (mn10300_callback): Delete. + (sim_open): Delete mn10300_callback assignment. + (program_interrupt): Call sim_io_printf. + * mn10300_sim.h (mn10300_callback): Delete. + 2015-11-17 Mike Frysinger <vapier@gentoo.org> * sim-main.h (WITH_CORE): Delete. diff --git a/sim/mn10300/interp.c b/sim/mn10300/interp.c index f3941ae..4940acc 100644 --- a/sim/mn10300/interp.c +++ b/sim/mn10300/interp.c @@ -24,7 +24,6 @@ #include "bfd.h" -host_callback *mn10300_callback; struct _state State; @@ -97,7 +96,6 @@ sim_open (SIM_OPEN_KIND kind, { int i; SIM_DESC sd = sim_state_alloc (kind, cb); - mn10300_callback = cb; SIM_ASSERT (STATE_MAGIC (sd) == SIM_MAGIC_NUMBER); @@ -418,10 +416,7 @@ program_interrupt (SIM_DESC sd, /* avoid infinite recursion */ if (in_interrupt) - { - (*mn10300_callback->printf_filtered) (mn10300_callback, - "ERROR: recursion in program_interrupt during software exception dispatch."); - } + sim_io_printf (sd, "ERROR: recursion in program_interrupt during software exception dispatch."); else { in_interrupt = 1; diff --git a/sim/mn10300/mn10300_sim.h b/sim/mn10300/mn10300_sim.h index 6e8f53a..f70d486 100644 --- a/sim/mn10300/mn10300_sim.h +++ b/sim/mn10300/mn10300_sim.h @@ -8,7 +8,6 @@ #include "bfd.h" #include "sim-fpu.h" -extern host_callback *mn10300_callback; extern SIM_DESC simulator; typedef unsigned8 uint8; |