From 3cf84db9ef43e186bb63c1d2bde43aaeef7d00ed Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Tue, 20 Mar 2001 17:48:02 +0000
Subject: Do not enable alignment checking when loading unaligned thumb
 instructions.

---
 sim/arm/ChangeLog | 5 +++++
 sim/arm/armvirt.c | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'sim')

diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog
index d3d5b1c..9f81f54 100644
--- 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 cca6aa0..15f2cb6 100644
--- 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);
-- 
cgit v1.1