From f865a31d1ed571ccb8d17653b150e3a30f22b30d Mon Sep 17 00:00:00 2001 From: Anthony Green Date: Thu, 11 Jun 2009 11:27:58 +0000 Subject: Add PC-relative branch instructions to moxie port. --- opcodes/moxie-opc.c | 49 +++++++++++++++++++++++++++++++------------------ 1 file changed, 31 insertions(+), 18 deletions(-) (limited to 'opcodes/moxie-opc.c') diff --git a/opcodes/moxie-opc.c b/opcodes/moxie-opc.c index 7275e3aa79d..819476085a7 100644 --- a/opcodes/moxie-opc.c +++ b/opcodes/moxie-opc.c @@ -44,11 +44,11 @@ FORM 3 instructions start with a bits "11"... - 11oovvvvvvvvvvvv + 11oooovvvvvvvvvv 0 F - oo - form 3 opcode number - vvvvvvvvvvvv - 12-bit immediate value. */ + oooo - form 3 opcode number + vvvvvvvvvv - 10-bit immediate value. */ const moxie_opc_info_t moxie_form1_opc_info[64] = { @@ -67,16 +67,16 @@ 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_M, "beq" }, - { 0x10, MOXIE_F1_M, "bne" }, - { 0x11, MOXIE_F1_M, "blt" }, - { 0x12, MOXIE_F1_M, "bgt" }, - { 0x13, MOXIE_F1_M, "bltu" }, - { 0x14, MOXIE_F1_M, "bgtu" }, - { 0x15, MOXIE_F1_M, "bge" }, - { 0x16, MOXIE_F1_M, "ble" }, - { 0x17, MOXIE_F1_M, "bgeu" }, - { 0x18, MOXIE_F1_M, "bleu" }, + { 0x0f, MOXIE_F1_NARG, "bad" }, + { 0x10, MOXIE_F1_NARG, "bad" }, + { 0x11, MOXIE_F1_NARG, "bad" }, + { 0x12, MOXIE_F1_NARG, "bad" }, + { 0x13, MOXIE_F1_NARG, "bad" }, + { 0x14, MOXIE_F1_NARG, "bad" }, + { 0x15, MOXIE_F1_NARG, "bad" }, + { 0x16, MOXIE_F1_NARG, "bad" }, + { 0x17, MOXIE_F1_NARG, "bad" }, + { 0x18, MOXIE_F1_NARG, "bad" }, { 0x19, MOXIE_F1_A, "jsr" }, { 0x1a, MOXIE_F1_M, "jmpa" }, { 0x1b, MOXIE_F1_A4, "ldi.b" }, @@ -126,11 +126,24 @@ const moxie_opc_info_t moxie_form2_opc_info[4] = { 0x03, MOXIE_F2_A8V, "ssr" } }; -const moxie_opc_info_t moxie_form3_opc_info[4] = +const moxie_opc_info_t moxie_form3_opc_info[16] = { - { 0x00, MOXIE_F2_NARG, "bad" }, - { 0x01, MOXIE_F2_NARG, "bad" }, - { 0x02, MOXIE_F2_NARG, "bad" }, - { 0x03, MOXIE_F2_NARG, "bad" } + { 0x00, MOXIE_F3_PCREL,"beq" }, + { 0x01, MOXIE_F3_PCREL,"bne" }, + { 0x02, MOXIE_F3_PCREL,"blt" }, + { 0x03, MOXIE_F3_PCREL,"bgt" }, + { 0x04, MOXIE_F3_PCREL,"bltu" }, + { 0x05, MOXIE_F3_PCREL,"bgtu" }, + { 0x06, MOXIE_F3_PCREL,"bge" }, + { 0x07, MOXIE_F3_PCREL,"ble" }, + { 0x08, MOXIE_F3_PCREL,"bgeu" }, + { 0x09, MOXIE_F3_PCREL,"bleu" }, + { 0x0a, MOXIE_F3_NARG, "bad" }, + { 0x0b, MOXIE_F3_NARG, "bad" }, + { 0x0c, MOXIE_F3_NARG, "bad" }, + { 0x0d, MOXIE_F3_NARG, "bad" }, + { 0x0e, MOXIE_F3_NARG, "bad" }, + { 0x0f, MOXIE_F3_NARG, "bad" } }; + -- cgit v1.2.1