Only call XScale_check_memacc if in XScale mode.

diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog
index 03c923e..a3cd7f2 100644 (file)
--- a/sim/arm/ChangeLog
+++ b/sim/arm/ChangeLog
@@ -1,3 +1,9 @@
+2003-04-13  Nick Clifton  <nickc@redhat.com>
+
+       * armvirt.c (GetWord): Only call XScale_check_memacc if in XScale
+       mode.
+       (PutWord): Likewise.
+
 2003-03-30  Nick Clifton  <nickc@redhat.com>
 
        * configure.in (CON_FLAGS): Remove.

diff --git a/sim/arm/armvirt.c b/sim/arm/armvirt.c
index 26fd905..23038a1 100644 (file)
--- a/sim/arm/armvirt.c
+++ b/sim/arm/armvirt.c
@@ -64,7 +64,7 @@ GetWord (ARMul_State * state, ARMword address, int check)
   ARMword **pagetable;
   ARMword *pageptr;
 
-  if (check)
+  if (check && state->is_XScale)
     XScale_check_memacc (state, &address, 0);
 
   page = address >> PAGEBITS;
@@ -100,7 +100,7 @@ PutWord (ARMul_State * state, ARMword address, ARMword data, int check)
   ARMword **pagetable;
   ARMword *pageptr;
 
-  if (check)
+  if (check && state->is_XScale)
     XScale_check_memacc (state, &address, 1);
 
   page = address >> PAGEBITS;