aboutsummaryrefslogtreecommitdiff
path: root/sim/arm/armemu.c
diff options
context:
space:
mode:
Diffstat (limited to 'sim/arm/armemu.c')
-rw-r--r--sim/arm/armemu.c14
1 files changed, 3 insertions, 11 deletions
diff --git a/sim/arm/armemu.c b/sim/arm/armemu.c
index 53fc992..d12ad10 100644
--- a/sim/arm/armemu.c
+++ b/sim/arm/armemu.c
@@ -19,9 +19,7 @@
#include "armdefs.h"
#include "armemu.h"
#include "armos.h"
-#ifdef __IWMMXT__
#include "iwmmxt.h"
-#endif
static ARMword GetDPRegRHS (ARMul_State *, ARMword);
static ARMword GetDPSRegRHS (ARMul_State *, ARMword);
@@ -377,14 +375,12 @@ ARMul_Emulate26 (ARMul_State * state)
if (state->EventSet)
ARMul_EnvokeEvent (state);
-#if 0
- /* Enable this for a helpful bit of debugging when tracing is needed. */
+#if 0 /* Enable this for a helpful bit of debugging when tracing is needed. */
fprintf (stderr, "pc: %x, instr: %x\n", pc & ~1, instr);
if (instr == 0)
abort ();
#endif
-#ifdef __IWMMXT__
-#if 0
+#if 0 /* Enable this code to help track down stack alignment bugs. */
{
static ARMword old_sp = -1;
@@ -396,7 +392,6 @@ ARMul_Emulate26 (ARMul_State * state)
}
}
#endif
-#endif
if (state->Exception)
{
@@ -509,12 +504,10 @@ ARMul_Emulate26 (ARMul_State * state)
else if ((instr & 0xFC70F000) == 0xF450F000)
/* The PLD instruction. Ignored. */
goto donext;
-#ifdef __IWMMXT__
else if ( ((instr & 0xfe500f00) == 0xfc100100)
|| ((instr & 0xfe500f00) == 0xfc000100))
/* wldrw and wstrw are unconditional. */
goto mainswitch;
-#endif
else
/* UNDEFINED in v5, UNPREDICTABLE in v3, v4, non executed in v1, v2. */
ARMul_UndefInstr (state, instr);
@@ -712,10 +705,9 @@ check_PMUintr:
goto donext;
}
}
-#ifdef __IWMMXT__
+
if (ARMul_HandleIwmmxt (state, instr))
goto donext;
-#endif
}
switch ((int) BITS (20, 27))