More instruction decoding fixes:

[openocd.git] / src / target / arm_disassembler.c

diff --git a/src/target/arm_disassembler.c b/src/target/arm_disassembler.c
index d961f96adf595801160496905aacaf3632ca09ad..0478ee9c6797ce35a1f347f8720ce61749c574e5 100644 (file)
--- a/src/target/arm_disassembler.c
+++ b/src/target/arm_disassembler.c
@@ -2853,6 +2853,7 @@ static int t2ev_store_single(uint32_t opcode, uint32_t address,
        sprintf(cp, "STR%s.W\tr%d, [r%d, r%d, LSL #%d]",
                        size, rt, rn, (int) opcode & 0x0f,
                        (int) (opcode >> 4) & 0x03);
+       return ERROR_OK;
 
 imm12:
        immed = opcode & 0x0fff;
@@ -3354,18 +3355,21 @@ static int t2ev_load_byte_hints(uint32_t opcode, uint32_t address,
        int rt = (opcode >> 12) & 0xf;
        int op2 = (opcode >> 6) & 0x3f;
        unsigned immed;
-       char *p1 = "]", *p2 = "";
+       char *p1 = "", *p2 = "]";
        char *mnemonic;
 
        switch ((opcode >> 23) & 0x3) {
        case 0:
                if ((rn & rt) == 0xf) {
-preload_immediate_t2:
+pld_literal:
                        immed = opcode & 0xfff;
-preload_immediate_t1:
-                       p1 = (opcode & (1 << 21)) ? "W" : "";
-                       sprintf(cp, "PLD%s\t[r%d, #%d]\t; %#6.6x",
-                                       p1, rn, immed, immed);
+                       address = thumb_alignpc4(address);
+                       if (opcode & (1 << 23))
+                               address += immed;
+                       else
+                               address -= immed;
+                       sprintf(cp, "PLD\tr%d, %#8.8" PRIx32,
+                                       rt, address);
                        return ERROR_OK;
                }
                if (rn == 0x0f && rt != 0x0f) {
@@ -3391,12 +3395,17 @@ ldrb_literal:
                if ((op2 & 0x3c) == 0x30) {
                        if (rt == 0x0f) {
                                immed = opcode & 0xff;
-                               goto preload_immediate_t1;
+                               immed = -immed;
+preload_immediate:
+                               p1 = (opcode & (1 << 21)) ? "W" : "";
+                               sprintf(cp, "PLD%s\t[r%d, #%d]\t; %#6.6x",
+                                               p1, rn, immed, immed);
+                               return ERROR_OK;
                        }
                        mnemonic = "LDRB";
 ldrxb_immediate_t3:
                        immed = opcode & 0xff;
-                       if (opcode & 0x200)
+                       if (!(opcode & 0x200))
                                immed = -immed;
 
                        /* two indexed modes will write back rn */
@@ -3432,8 +3441,12 @@ ldrxb_immediate_t2:
                }
                break;
        case 1:
-               if (rt == 0xf)
-                       goto preload_immediate_t2;
+               if ((rn & rt) == 0xf)
+                       goto pld_literal;
+               if (rt == 0xf) {
+                       immed = opcode & 0xfff;
+                       goto preload_immediate;
+               }
                if (rn == 0x0f)
                        goto ldrb_literal;
                mnemonic = "LDRB.W";
@@ -3441,7 +3454,6 @@ ldrxb_immediate_t2:
                goto ldrxb_immediate_t2;
        case 2:
                if ((rn & rt) == 0xf) {
-pli_immediate:
                        immed = opcode & 0xfff;
                        address = thumb_alignpc4(address);
                        if (opcode & (1 << 23))
@@ -3466,7 +3478,7 @@ ldrsb_literal:
                        break;
                if ((op2 & 0x3c) == 0x38) {
                        immed = opcode & 0xff;
-                       sprintf(cp, "LDRSBT\tr%d, [r%d, #%d]\t; %2.2x",
+                       sprintf(cp, "LDRSBT\tr%d, [r%d, #%d]\t; %#2.2x",
                                        rt, rn, immed, immed);
                        return ERROR_OK;
                }
@@ -3474,8 +3486,8 @@ ldrsb_literal:
                        if (rt == 0xf) {
                                immed = opcode & 0xff;
                                immed = -immed; // pli
-                               sprintf(cp, "PLI\t[r%d, #-%d]\t; %2.2x",
-                                               rn, immed, immed);
+                               sprintf(cp, "PLI\t[r%d, #%d]\t; -%#2.2x",
+                                               rn, immed, -immed);
                                return ERROR_OK;
                        }
                        mnemonic = "LDRSB";
@@ -3499,8 +3511,12 @@ ldrsb_literal:
                }
                break;
        case 3:
-               if (rt == 0xf)
-                       goto pli_immediate;
+               if (rt == 0xf) {
+                       immed = opcode & 0xfff;
+                       sprintf(cp, "PLI\t[r%d, #%d]\t; %#3.3" PRIx32,
+                                       rn, immed, immed);
+                       return ERROR_OK;
+               }
                if (rn == 0xf)
                        goto ldrsb_literal;
                immed = opcode & 0xfff;
@@ -3517,7 +3533,7 @@ static int t2ev_load_halfword(uint32_t opcode, uint32_t address,
        int rn = (opcode >> 16) & 0xf;
        int rt = (opcode >> 12) & 0xf;
        int op2 = (opcode >> 6) & 0x3f;
-       char *sign = (opcode & (1 < 24)) ? "S" : "";
+       char *sign = "";
        unsigned immed;
 
        if (rt == 0xf) {
@@ -3525,6 +3541,9 @@ static int t2ev_load_halfword(uint32_t opcode, uint32_t address,
                return ERROR_OK;
        }
 
+       if (opcode & (1 << 24))
+               sign = "S";
+
        if ((opcode & (1 << 23)) == 0) {
                if (rn == 0xf) {
 ldrh_literal:
@@ -3547,16 +3566,16 @@ ldrh_literal:
                        return ERROR_OK;
                }
                if ((op2 & 0x3c) == 0x38) {
-                       immed = (opcode >> 4) & 0x3;
+                       immed = opcode & 0xff;
                        sprintf(cp, "LDR%sHT\tr%d, [r%d, #%d]\t; %#2.2x",
                                        sign, rt, rn, immed, immed);
                        return ERROR_OK;
                }
                if ((op2 & 0x3c) == 0x30 || (op2 & 0x24) == 0x24) {
-                       char *p1 = "]", *p2 = "";
+                       char *p1 = "", *p2 = "]";
 
                        immed = opcode & 0xff;
-                       if (opcode & 0x200)
+                       if (!(opcode & 0x200))
                                immed = -immed;
 
                        /* two indexed modes will write back rn */
@@ -3577,8 +3596,9 @@ ldrh_literal:
                        goto ldrh_literal;
 
                immed = opcode & 0xfff;
-               sprintf(cp, "LDR%sH.W\tr%d, [r%d, #%d]\t; %#6.6x",
-                               sign, rt, rn, immed, immed);
+               sprintf(cp, "LDR%sH%s\tr%d, [r%d, #%d]\t; %#6.6x",
+                               sign, *sign ? "" : ".W",
+                               rt, rn, immed, immed);
                return ERROR_OK;
        }
 
@@ -3653,7 +3673,7 @@ int thumb2_opcode(target_t *target, uint32_t address, arm_instruction_t *instruc
                retval = t2ev_load_word(opcode, address, instruction, cp);
 
        /* ARMv7-M: A5.3.8 Load halfword, unallocated memory hints */
-       else if ((opcode & 0x1e700000) == 0x18e00000)
+       else if ((opcode & 0x1e700000) == 0x18300000)
                retval = t2ev_load_halfword(opcode, address, instruction, cp);
 
        /* ARMv7-M: A5.3.9 Load byte, memory hints */