summaryrefslogtreecommitdiff
path: root/util/m5/m5op_arm.S
diff options
context:
space:
mode:
authorAli Saidi <Ali.Saidi@ARM.com>2012-05-10 18:04:26 -0500
committerAli Saidi <Ali.Saidi@ARM.com>2012-05-10 18:04:26 -0500
commit798403b6896ba55c55ef3238f61c7bff962dc439 (patch)
treefa292eb85209e6aa263e34c0443e798e88b1974b /util/m5/m5op_arm.S
parent413ba1fdaf666118c9a340d0c23c466f4b7d7fee (diff)
downloadgem5-798403b6896ba55c55ef3238f61c7bff962dc439.tar.xz
ARM: Update m5op assembly for thumb compilation.
Diffstat (limited to 'util/m5/m5op_arm.S')
-rw-r--r--util/m5/m5op_arm.S12
1 files changed, 12 insertions, 0 deletions
diff --git a/util/m5/m5op_arm.S b/util/m5/m5op_arm.S
index 8cdf5c62d..7f43ef508 100644
--- a/util/m5/m5op_arm.S
+++ b/util/m5/m5op_arm.S
@@ -41,14 +41,26 @@
* Ali Saidi
* Chander Sudanthi
*/
+.syntax unified
+#ifdef __thumb__
+.thumb
+#endif
#define m5_op 0xEE
#include "m5ops.h"
+#ifdef __thumb__
+#define INST(op, ra, rb, func) \
+ .short (((op) << 8) | (func)); \
+ .short (((ra) << 12) | (0x1 << 8) | (0x1 << 4) | (rb))
+/* m5ops m5func */
+/* ra coproc 1 op=1 rb */
+#else
#define INST(op, ra, rb, func) \
.long (((op) << 24) | ((func) << 16) | ((ra) << 12) | (0x1 << 8) | (0x1 << 4) | (rb))
/* m5ops m5func ra coproc 1 op=1 rb */
+#endif
#define LEAF(func) \
.globl func; \