2000-07-14 Fernando Nasser <fnasser@cygnus.com>

        * wrapper.c (sim_create_inferior): Reset mode to ARM when creating a
        new inferior.

diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog
index 7a436de0f98024f777c70156653b3d4e44dad38a..c4f5150786fb0e8347a2d768c5e2042237f7681f 100644 (file)
--- a/sim/arm/ChangeLog
+++ b/sim/arm/ChangeLog
@@ -1,3 +1,8 @@
+2000-07-14  Fernando Nasser <fnasser@cygnus.com>
+
+       * wrapper.c (sim_create_inferior): Reset mode to ARM when creating a
+       new inferior.
+
 2000-07-04  Alexandre Oliva  <aoliva@redhat.com>
 
        * armvirt.c (ABORTS): Do not define.

diff --git a/sim/arm/wrapper.c b/sim/arm/wrapper.c
index 5db178c47cace5c781fdafc6eaefe1296f49b876..513c0d06d87442c7b8b032caad9629bc2b85d612 100644 (file)
--- a/sim/arm/wrapper.c
+++ b/sim/arm/wrapper.c
@@ -225,6 +225,10 @@ sim_create_inferior (sd, abfd, argv, env)
   case 7: /* armv5 */
   case 8: /* armv5t */
     ARMul_SelectProcessor (state, STRONGARM);
+    /* Reset mode to ARM.  A gdb user may rerun a program that had entered
+       THUMB mode from the start and cause the ARM-mode startup code to be
+       executed in THUMB mode. */
+    ARMul_SetCPSR (state, THUMB2MODE);
     break;
 
   case 3: /* armv3 */