aboutsummaryrefslogtreecommitdiff
path: root/opcodes
diff options
context:
space:
mode:
Diffstat (limited to 'opcodes')
-rw-r--r--opcodes/ChangeLog5
-rw-r--r--opcodes/moxie-opc.c9
2 files changed, 11 insertions, 3 deletions
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 7ab07ef..d20b776 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-03 Anthony Green <green@moxielogic.com>
+
+ * moxie-opc.c (moxie_form1_opc_info): Move "nop" from 0x00 to
+ 0x0f, and make 0x00 an illegal instruction.
+
2010-01-29 Daniel Jacobowitz <dan@codesourcery.com>
* opcodes/arm-dis.c (struct arm_private_data): New.
diff --git a/opcodes/moxie-opc.c b/opcodes/moxie-opc.c
index 8194760..b493d1f 100644
--- a/opcodes/moxie-opc.c
+++ b/opcodes/moxie-opc.c
@@ -50,9 +50,12 @@
oooo - form 3 opcode number
vvvvvvvvvv - 10-bit immediate value. */
+/* Note that currently two opcodes are reserved as bad, so that all
+ instructions starting with 0x00 and 0xff fault. */
+
const moxie_opc_info_t moxie_form1_opc_info[64] =
{
- { 0x00, MOXIE_F1_NARG, "nop" },
+ { 0x00, MOXIE_F1_NARG, "bad" }, // Reserved as bad.
{ 0x01, MOXIE_F1_A4, "ldi.l" },
{ 0x02, MOXIE_F1_AB, "mov" },
{ 0x03, MOXIE_F1_M, "jsra" },
@@ -67,7 +70,7 @@ const moxie_opc_info_t moxie_form1_opc_info[64] =
{ 0x0c, MOXIE_F1_ABi4, "ldo.l" },
{ 0x0d, MOXIE_F1_AiB4, "sto.l" },
{ 0x0e, MOXIE_F1_AB, "cmp" },
- { 0x0f, MOXIE_F1_NARG, "bad" },
+ { 0x0f, MOXIE_F1_NARG, "nop" },
{ 0x10, MOXIE_F1_NARG, "bad" },
{ 0x11, MOXIE_F1_NARG, "bad" },
{ 0x12, MOXIE_F1_NARG, "bad" },
@@ -143,7 +146,7 @@ const moxie_opc_info_t moxie_form3_opc_info[16] =
{ 0x0c, MOXIE_F3_NARG, "bad" },
{ 0x0d, MOXIE_F3_NARG, "bad" },
{ 0x0e, MOXIE_F3_NARG, "bad" },
- { 0x0f, MOXIE_F3_NARG, "bad" }
+ { 0x0f, MOXIE_F3_NARG, "bad" } // Reserved as bad.
};