Do not enable alignment checking when loading unaligned thumb instructions.

diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog
index d3d5b1ce3658ed426231036b732e591bd85e16f9..9f81f545bcc3906c5a610f1600a0cfa9fabe50c3 100644 (file)
--- a/sim/arm/ChangeLog
+++ b/sim/arm/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-20  Nick Clifton  <nickc@redhat.com>
+
+       * armvirt.c (ARMul_ReLoadInstr): Do not enable alignment checking
+       when loading unaligned thumb instructions.
+
 2001-03-06  Nick Clifton  <nickc@redhat.com>
 
        * thumbemu.c (ARMul_ThumbDecode): Delete label bo_blx2.

diff --git a/sim/arm/armvirt.c b/sim/arm/armvirt.c
index cca6aa0a415481e60b2bfc4c1b0b6f943f6d045e..15f2cb685060aadde533fed3c1f95a5f77a41381 100644 (file)
--- a/sim/arm/armvirt.c
+++ b/sim/arm/armvirt.c
@@ -192,8 +192,8 @@ ARMul_ReLoadInstr (ARMul_State * state, ARMword address, ARMword isize)
   if ((isize == 2) && (address & 0x2))
     {
       /* We return the next two halfwords: */
-      ARMword lo = GetWord (state, address, TRUE);
-      ARMword hi = GetWord (state, address + 4, TRUE);
+      ARMword lo = GetWord (state, address, FALSE);
+      ARMword hi = GetWord (state, address + 4, FALSE);
 
       if (state->bigendSig == HIGH)
        return (lo << 16) | (hi >> 16);