From 44e23e575b7a78c3c9a6a65f49abbf8f6abf52fb Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Thu, 15 Feb 2001 02:38:15 +0000 Subject: Add code to preserve processor mode when a prefetch abort is signalled after processing a breakpoint. --- sim/arm/ChangeLog | 3 +++ sim/arm/armemu.c | 11 +++++++++++ 2 files changed, 14 insertions(+) diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog index 32e1056..4b1331a 100644 --- a/sim/arm/ChangeLog +++ b/sim/arm/ChangeLog @@ -1,5 +1,8 @@ 2001-02-14 Nick Clifton + * armemu.c: Add code to preserve processor mode when a prefetch + abort is signalled after processing a breakpoint. + * wrapper.c (sim_create_inferior): Reset processor into ARM mode for any machine type except the early ARMs. diff --git a/sim/arm/armemu.c b/sim/arm/armemu.c index 166f3aa..f0a6103 100644 --- a/sim/arm/armemu.c +++ b/sim/arm/armemu.c @@ -1340,6 +1340,7 @@ ARMul_Emulate26 (register ARMul_State * state) { ARMword value; extern int SWI_vector_installed; + int in_thumb_mode; /* Hardware is allowed to optionally override this instruction and treat it as a breakpoint. Since @@ -1377,7 +1378,17 @@ ARMul_Emulate26 (register ARMul_State * state) } } + /* We must signal an abort to mark the next instruction as + invalid and in need of refetching. This is because if this + the instruction was a breakpoint inserted by the debugger, + the instruction could be changed back to its original value. + The abort however, will automatically reset the processor into + ARM mode, so we have to preserve the mode flag and resort it + after singalling the abort. */ + in_thumb_mode = TFLAG; ARMul_Abort (state, ARMul_PrefetchAbortV); + ASSIGNT (in_thumb_mode); + break; } } -- cgit v1.1