jtag: linuxgpiod: drop extra parenthesis
[openocd.git] / src / target / arm_disassembler.c
index 59c0537b7deff3280120fb0ab1915890f5bef4ce..749274f3690d4f0edbb8adaab4ef6a8a2e0fdd66 100644 (file)
@@ -1,21 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 /***************************************************************************
  *   Copyright (C) 2006 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
  *   Copyright (C) 2009 by David Brownell                                  *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
 #include "arm_disassembler.h"
 #include <helper/log.h>
 
+#if HAVE_CAPSTONE
+#include <capstone.h>
+#endif
+
 /*
  * This disassembler supports two main functions for OpenOCD:
  *
@@ -119,36 +112,36 @@ static int evaluate_pld(uint32_t opcode,
 {
        /* PLD */
        if ((opcode & 0x0d30f000) == 0x0510f000) {
-               uint8_t Rn;
-               uint8_t U;
+               uint8_t rn;
+               uint8_t u;
                unsigned offset;
 
                instruction->type = ARM_PLD;
-               Rn = (opcode & 0xf0000) >> 16;
-               U = (opcode & 0x00800000) >> 23;
-               if (Rn == 0xf) {
+               rn = (opcode & 0xf0000) >> 16;
+               u = (opcode & 0x00800000) >> 23;
+               if (rn == 0xf) {
                        /* literal */
                        offset = opcode & 0x0fff;
                        snprintf(instruction->text, 128,
                                 "0x%8.8" PRIx32 "\t0x%8.8" PRIx32 "\tPLD %s%d",
-                                address, opcode, U ? "" : "-", offset);
+                                address, opcode, u ? "" : "-", offset);
                } else {
-                       uint8_t I, R;
+                       uint8_t i, r;
 
-                       I = (opcode & 0x02000000) >> 25;
-                       R = (opcode & 0x00400000) >> 22;
+                       i = (opcode & 0x02000000) >> 25;
+                       r = (opcode & 0x00400000) >> 22;
 
-                       if (I) {
+                       if (i) {
                                /* register PLD{W} [<Rn>,+/-<Rm>{, <shift>}] */
                                offset = (opcode & 0x0F80) >> 7;
-                               uint8_t Rm;
-                               Rm = opcode & 0xf;
+                               uint8_t rm;
+                               rm = opcode & 0xf;
 
                                if (offset == 0) {
                                        /* No shift */
                                        snprintf(instruction->text, 128,
                                                 "0x%8.8" PRIx32 "\t0x%8.8" PRIx32 "\tPLD%s [r%d, %sr%d]",
-                                                address, opcode, R ? "" : "W", Rn, U ? "" : "-", Rm);
+                                                address, opcode, r ? "" : "W", rn, u ? "" : "-", rm);
 
                                } else {
                                        uint8_t shift;
@@ -158,22 +151,22 @@ static int evaluate_pld(uint32_t opcode,
                                                /* LSL */
                                                snprintf(instruction->text, 128,
                                                         "0x%8.8" PRIx32 "\t0x%8.8" PRIx32 "\tPLD%s [r%d, %sr%d, LSL #0x%x)",
-                                                        address, opcode, R ? "" : "W", Rn, U ? "" : "-", Rm, offset);
+                                                        address, opcode, r ? "" : "W", rn, u ? "" : "-", rm, offset);
                                        } else if (shift == 0x1) {
                                                /* LSR */
                                                snprintf(instruction->text, 128,
                                                         "0x%8.8" PRIx32 "\t0x%8.8" PRIx32 "\tPLD%s [r%d, %sr%d, LSR #0x%x)",
-                                                        address, opcode, R ? "" : "W", Rn, U ? "" : "-", Rm, offset);
+                                                        address, opcode, r ? "" : "W", rn, u ? "" : "-", rm, offset);
                                        } else if (shift == 0x2) {
                                                /* ASR */
                                                snprintf(instruction->text, 128,
                                                         "0x%8.8" PRIx32 "\t0x%8.8" PRIx32 "\tPLD%s [r%d, %sr%d, ASR #0x%x)",
-                                                        address, opcode, R ? "" : "W", Rn, U ? "" : "-", Rm, offset);
+                                                        address, opcode, r ? "" : "W", rn, u ? "" : "-", rm, offset);
                                        } else if (shift == 0x3) {
                                                /* ROR */
                                                snprintf(instruction->text, 128,
                                                         "0x%8.8" PRIx32 "\t0x%8.8" PRIx32 "\tPLD%s [r%d, %sr%d, ROR #0x%x)",
-                                                        address, opcode, R ? "" : "W", Rn, U ? "" : "-", Rm, offset);
+                                                        address, opcode, r ? "" : "W", rn, u ? "" : "-", rm, offset);
                                        }
                                }
                        } else {
@@ -182,11 +175,11 @@ static int evaluate_pld(uint32_t opcode,
                                if (offset == 0) {
                                        snprintf(instruction->text, 128,
                                                 "0x%8.8" PRIx32 "\t0x%8.8" PRIx32 "\tPLD%s [r%d]",
-                                                address, opcode, R ? "" : "W", Rn);
+                                                address, opcode, r ? "" : "W", rn);
                                } else {
                                        snprintf(instruction->text, 128,
                                                 "0x%8.8" PRIx32 "\t0x%8.8" PRIx32 "\tPLD%s [r%d, #%s%d]",
-                                                address, opcode, R ? "" : "W", Rn, U ? "" : "-", offset);
+                                                address, opcode, r ? "" : "W", rn, u ? "" : "-", offset);
                                }
                        }
                }
@@ -345,13 +338,13 @@ static int evaluate_blx_imm(uint32_t opcode,
 static int evaluate_b_bl(uint32_t opcode,
                         uint32_t address, struct arm_instruction *instruction)
 {
-       uint8_t L;
+       uint8_t l;
        uint32_t immediate;
        int offset;
        uint32_t target_address;
 
        immediate = opcode & 0x00ffffff;
-       L = (opcode & 0x01000000) >> 24;
+       l = (opcode & 0x01000000) >> 24;
 
        /* sign extend 24-bit immediate */
        if (immediate & 0x00800000)
@@ -364,7 +357,7 @@ static int evaluate_b_bl(uint32_t opcode,
 
        target_address = address + 8 + offset;
 
-       if (L)
+       if (l)
                instruction->type = ARM_BL;
        else
                instruction->type = ARM_B;
@@ -374,7 +367,7 @@ static int evaluate_b_bl(uint32_t opcode,
                        "0x%8.8" PRIx32 "\t0x%8.8" PRIx32 "\tB%s%s 0x%8.8" PRIx32,
                        address,
                        opcode,
-                       (L) ? "L" : "",
+                       (l) ? "L" : "",
                        COND(opcode),
                        target_address);
 
@@ -393,13 +386,13 @@ static int evaluate_ldc_stc_mcrr_mrrc(uint32_t opcode,
 
        /* MCRR or MRRC */
        if (((opcode & 0x0ff00000) == 0x0c400000) || ((opcode & 0x0ff00000) == 0x0c500000)) {
-               uint8_t cp_opcode, Rd, Rn, CRm;
+               uint8_t cp_opcode, rd, rn, crm;
                char *mnemonic;
 
                cp_opcode = (opcode & 0xf0) >> 4;
-               Rd = (opcode & 0xf000) >> 12;
-               Rn = (opcode & 0xf0000) >> 16;
-               CRm = (opcode & 0xf);
+               rd = (opcode & 0xf000) >> 12;
+               rn = (opcode & 0xf0000) >> 16;
+               crm = (opcode & 0xf);
 
                /* MCRR */
                if ((opcode & 0x0ff00000) == 0x0c400000) {
@@ -420,15 +413,15 @@ static int evaluate_ldc_stc_mcrr_mrrc(uint32_t opcode,
                                address, opcode, mnemonic,
                                ((opcode & 0xf0000000) == 0xf0000000)
                                ? "2" : COND(opcode),
-                               COND(opcode), cp_num, cp_opcode, Rd, Rn, CRm);
+                               COND(opcode), cp_num, cp_opcode, rd, rn, crm);
        } else {/* LDC or STC */
-               uint8_t CRd, Rn, offset;
-               uint8_t U;
+               uint8_t crd, rn, offset;
+               uint8_t u;
                char *mnemonic;
                char addressing_mode[32];
 
-               CRd = (opcode & 0xf000) >> 12;
-               Rn = (opcode & 0xf0000) >> 16;
+               crd = (opcode & 0xf000) >> 12;
+               rn = (opcode & 0xf0000) >> 16;
                offset = (opcode & 0xff) << 2;
 
                /* load/store */
@@ -440,21 +433,21 @@ static int evaluate_ldc_stc_mcrr_mrrc(uint32_t opcode,
                        mnemonic = "STC";
                }
 
-               U = (opcode & 0x00800000) >> 23;
+               u = (opcode & 0x00800000) >> 23;
 
                /* addressing modes */
                if ((opcode & 0x01200000) == 0x01000000)/* offset */
                        snprintf(addressing_mode, 32, "[r%i, #%s%d]",
-                                       Rn, U ? "" : "-", offset);
+                                       rn, u ? "" : "-", offset);
                else if ((opcode & 0x01200000) == 0x01200000)   /* pre-indexed */
                        snprintf(addressing_mode, 32, "[r%i, #%s%d]!",
-                                       Rn, U ? "" : "-", offset);
+                                       rn, u ? "" : "-", offset);
                else if ((opcode & 0x01200000) == 0x00200000)   /* post-indexed */
                        snprintf(addressing_mode, 32, "[r%i], #%s%d",
-                                       Rn, U ? "" : "-", offset);
+                                       rn, u ? "" : "-", offset);
                else if ((opcode & 0x01200000) == 0x00000000)   /* unindexed */
                        snprintf(addressing_mode, 32, "[r%i], {%d}",
-                                       Rn, offset >> 2);
+                                       rn, offset >> 2);
 
                snprintf(instruction->text, 128, "0x%8.8" PRIx32
                                "\t0x%8.8" PRIx32
@@ -463,7 +456,7 @@ static int evaluate_ldc_stc_mcrr_mrrc(uint32_t opcode,
                                ((opcode & 0xf0000000) == 0xf0000000)
                                ? "2" : COND(opcode),
                                (opcode & (1 << 22)) ? "L" : "",
-                               cp_num, CRd, addressing_mode);
+                               cp_num, crd, addressing_mode);
        }
 
        return ERROR_OK;
@@ -477,13 +470,13 @@ static int evaluate_cdp_mcr_mrc(uint32_t opcode,
 {
        const char *cond;
        char *mnemonic;
-       uint8_t cp_num, opcode_1, CRd_Rd, CRn, CRm, opcode_2;
+       uint8_t cp_num, opcode_1, crd_rd, crn, crm, opcode_2;
 
        cond = ((opcode & 0xf0000000) == 0xf0000000) ? "2" : COND(opcode);
        cp_num = (opcode & 0xf00) >> 8;
-       CRd_Rd = (opcode & 0xf000) >> 12;
-       CRn = (opcode & 0xf0000) >> 16;
-       CRm = (opcode & 0xf);
+       crd_rd = (opcode & 0xf000) >> 12;
+       crn = (opcode & 0xf0000) >> 16;
+       crm = (opcode & 0xf);
        opcode_2 = (opcode & 0xe0) >> 5;
 
        /* CDP or MRC/MCR */
@@ -507,9 +500,9 @@ static int evaluate_cdp_mcr_mrc(uint32_t opcode,
                                cond,
                                cp_num,
                                opcode_1,
-                               CRd_Rd,
-                               CRn,
-                               CRm,
+                               crd_rd,
+                               crn,
+                               crm,
                                opcode_2);
        } else {/* bit 4 not set -> CDP */
                instruction->type = ARM_CDP;
@@ -526,9 +519,9 @@ static int evaluate_cdp_mcr_mrc(uint32_t opcode,
                                cond,
                                cp_num,
                                opcode_1,
-                               CRd_Rd,
-                               CRn,
-                               CRm,
+                               crd_rd,
+                               crn,
+                               crm,
                                opcode_2);
        }
 
@@ -539,60 +532,60 @@ static int evaluate_cdp_mcr_mrc(uint32_t opcode,
 static int evaluate_load_store(uint32_t opcode,
                               uint32_t address, struct arm_instruction *instruction)
 {
-       uint8_t I, P, U, B, W, L;
-       uint8_t Rn, Rd;
+       uint8_t i, p, u, b, w, l;
+       uint8_t rn, rd;
        char *operation;/* "LDR" or "STR" */
        char *suffix;   /* "", "B", "T", "BT" */
        char offset[32];
 
        /* examine flags */
-       I = (opcode & 0x02000000) >> 25;
-       P = (opcode & 0x01000000) >> 24;
-       U = (opcode & 0x00800000) >> 23;
-       B = (opcode & 0x00400000) >> 22;
-       W = (opcode & 0x00200000) >> 21;
-       L = (opcode & 0x00100000) >> 20;
+       i = (opcode & 0x02000000) >> 25;
+       p = (opcode & 0x01000000) >> 24;
+       u = (opcode & 0x00800000) >> 23;
+       b = (opcode & 0x00400000) >> 22;
+       w = (opcode & 0x00200000) >> 21;
+       l = (opcode & 0x00100000) >> 20;
 
        /* target register */
-       Rd = (opcode & 0xf000) >> 12;
+       rd = (opcode & 0xf000) >> 12;
 
        /* base register */
-       Rn = (opcode & 0xf0000) >> 16;
+       rn = (opcode & 0xf0000) >> 16;
 
-       instruction->info.load_store.Rd = Rd;
-       instruction->info.load_store.Rn = Rn;
-       instruction->info.load_store.U = U;
+       instruction->info.load_store.rd = rd;
+       instruction->info.load_store.rn = rn;
+       instruction->info.load_store.u = u;
 
        /* determine operation */
-       if (L)
+       if (l)
                operation = "LDR";
        else
                operation = "STR";
 
        /* determine instruction type and suffix */
-       if (B) {
-               if ((P == 0) && (W == 1)) {
-                       if (L)
+       if (b) {
+               if ((p == 0) && (w == 1)) {
+                       if (l)
                                instruction->type = ARM_LDRBT;
                        else
                                instruction->type = ARM_STRBT;
                        suffix = "BT";
                } else {
-                       if (L)
+                       if (l)
                                instruction->type = ARM_LDRB;
                        else
                                instruction->type = ARM_STRB;
                        suffix = "B";
                }
        } else {
-               if ((P == 0) && (W == 1)) {
-                       if (L)
+               if ((p == 0) && (w == 1)) {
+                       if (l)
                                instruction->type = ARM_LDRT;
                        else
                                instruction->type = ARM_STRT;
                        suffix = "T";
                } else {
-                       if (L)
+                       if (l)
                                instruction->type = ARM_LDR;
                        else
                                instruction->type = ARM_STR;
@@ -600,10 +593,10 @@ static int evaluate_load_store(uint32_t opcode,
                }
        }
 
-       if (!I) {       /* #+-<offset_12> */
+       if (!i) {       /* #+-<offset_12> */
                uint32_t offset_12 = (opcode & 0xfff);
                if (offset_12)
-                       snprintf(offset, 32, ", #%s0x%" PRIx32 "", (U) ? "" : "-", offset_12);
+                       snprintf(offset, 32, ", #%s0x%" PRIx32 "", (u) ? "" : "-", offset_12);
                else
                        snprintf(offset, 32, "%s", "");
 
@@ -611,11 +604,11 @@ static int evaluate_load_store(uint32_t opcode,
                instruction->info.load_store.offset.offset = offset_12;
        } else {/* either +-<Rm> or +-<Rm>, <shift>, #<shift_imm> */
                uint8_t shift_imm, shift;
-               uint8_t Rm;
+               uint8_t rm;
 
                shift_imm = (opcode & 0xf80) >> 7;
                shift = (opcode & 0x60) >> 5;
-               Rm = (opcode & 0xf);
+               rm = (opcode & 0xf);
 
                /* LSR encodes a shift by 32 bit as 0x0 */
                if ((shift == 0x1) && (shift_imm == 0x0))
@@ -630,35 +623,35 @@ static int evaluate_load_store(uint32_t opcode,
                        shift = 0x4;
 
                instruction->info.load_store.offset_mode = 1;
-               instruction->info.load_store.offset.reg.Rm = Rm;
+               instruction->info.load_store.offset.reg.rm = rm;
                instruction->info.load_store.offset.reg.shift = shift;
                instruction->info.load_store.offset.reg.shift_imm = shift_imm;
 
                if ((shift_imm == 0x0) && (shift == 0x0))       /* +-<Rm> */
-                       snprintf(offset, 32, ", %sr%i", (U) ? "" : "-", Rm);
+                       snprintf(offset, 32, ", %sr%i", (u) ? "" : "-", rm);
                else {  /* +-<Rm>, <Shift>, #<shift_imm> */
                        switch (shift) {
                                case 0x0:               /* LSL */
-                                       snprintf(offset, 32, ", %sr%i, LSL #0x%x", (U) ? "" : "-", Rm, shift_imm);
+                                       snprintf(offset, 32, ", %sr%i, LSL #0x%x", (u) ? "" : "-", rm, shift_imm);
                                        break;
                                case 0x1:               /* LSR */
-                                       snprintf(offset, 32, ", %sr%i, LSR #0x%x", (U) ? "" : "-", Rm, shift_imm);
+                                       snprintf(offset, 32, ", %sr%i, LSR #0x%x", (u) ? "" : "-", rm, shift_imm);
                                        break;
                                case 0x2:               /* ASR */
-                                       snprintf(offset, 32, ", %sr%i, ASR #0x%x", (U) ? "" : "-", Rm, shift_imm);
+                                       snprintf(offset, 32, ", %sr%i, ASR #0x%x", (u) ? "" : "-", rm, shift_imm);
                                        break;
                                case 0x3:               /* ROR */
-                                       snprintf(offset, 32, ", %sr%i, ROR #0x%x", (U) ? "" : "-", Rm, shift_imm);
+                                       snprintf(offset, 32, ", %sr%i, ROR #0x%x", (u) ? "" : "-", rm, shift_imm);
                                        break;
                                case 0x4:               /* RRX */
-                                       snprintf(offset, 32, ", %sr%i, RRX", (U) ? "" : "-", Rm);
+                                       snprintf(offset, 32, ", %sr%i, RRX", (u) ? "" : "-", rm);
                                        break;
                        }
                }
        }
 
-       if (P == 1) {
-               if (W == 0) {   /* offset */
+       if (p == 1) {
+               if (w == 0) {   /* offset */
                        snprintf(instruction->text,
                                        128,
                                        "0x%8.8" PRIx32 "\t0x%8.8" PRIx32 "\t%s%s%s r%i, [r%i%s]",
@@ -667,8 +660,8 @@ static int evaluate_load_store(uint32_t opcode,
                                        operation,
                                        COND(opcode),
                                        suffix,
-                                       Rd,
-                                       Rn,
+                                       rd,
+                                       rn,
                                        offset);
 
                        instruction->info.load_store.index_mode = 0;
@@ -681,8 +674,8 @@ static int evaluate_load_store(uint32_t opcode,
                                        operation,
                                        COND(opcode),
                                        suffix,
-                                       Rd,
-                                       Rn,
+                                       rd,
+                                       rn,
                                        offset);
 
                        instruction->info.load_store.index_mode = 1;
@@ -696,8 +689,8 @@ static int evaluate_load_store(uint32_t opcode,
                                operation,
                                COND(opcode),
                                suffix,
-                               Rd,
-                               Rn,
+                               rd,
+                               rn,
                                offset);
 
                instruction->info.load_store.index_mode = 2;
@@ -1025,35 +1018,35 @@ undef:
 static int evaluate_misc_load_store(uint32_t opcode,
                                    uint32_t address, struct arm_instruction *instruction)
 {
-       uint8_t P, U, I, W, L, S, H;
-       uint8_t Rn, Rd;
+       uint8_t p, u, i, w, l, s, h;
+       uint8_t rn, rd;
        char *operation;/* "LDR" or "STR" */
        char *suffix;   /* "H", "SB", "SH", "D" */
        char offset[32];
 
        /* examine flags */
-       P = (opcode & 0x01000000) >> 24;
-       U = (opcode & 0x00800000) >> 23;
-       I = (opcode & 0x00400000) >> 22;
-       W = (opcode & 0x00200000) >> 21;
-       L = (opcode & 0x00100000) >> 20;
-       S = (opcode & 0x00000040) >> 6;
-       H = (opcode & 0x00000020) >> 5;
+       p = (opcode & 0x01000000) >> 24;
+       u = (opcode & 0x00800000) >> 23;
+       i = (opcode & 0x00400000) >> 22;
+       w = (opcode & 0x00200000) >> 21;
+       l = (opcode & 0x00100000) >> 20;
+       s = (opcode & 0x00000040) >> 6;
+       h = (opcode & 0x00000020) >> 5;
 
        /* target register */
-       Rd = (opcode & 0xf000) >> 12;
+       rd = (opcode & 0xf000) >> 12;
 
        /* base register */
-       Rn = (opcode & 0xf0000) >> 16;
+       rn = (opcode & 0xf0000) >> 16;
 
-       instruction->info.load_store.Rd = Rd;
-       instruction->info.load_store.Rn = Rn;
-       instruction->info.load_store.U = U;
+       instruction->info.load_store.rd = rd;
+       instruction->info.load_store.rn = rn;
+       instruction->info.load_store.u = u;
 
        /* determine instruction type and suffix */
-       if (S) {/* signed */
-               if (L) {/* load */
-                       if (H) {
+       if (s) {/* signed */
+               if (l) {/* load */
+                       if (h) {
                                operation = "LDR";
                                instruction->type = ARM_LDRSH;
                                suffix = "SH";
@@ -1065,7 +1058,7 @@ static int evaluate_misc_load_store(uint32_t opcode,
                } else {/* there are no signed stores, so this is used to encode double-register
                         *load/stores */
                        suffix = "D";
-                       if (H) {
+                       if (h) {
                                operation = "STR";
                                instruction->type = ARM_STRD;
                        } else {
@@ -1075,7 +1068,7 @@ static int evaluate_misc_load_store(uint32_t opcode,
                }
        } else {/* unsigned */
                suffix = "H";
-               if (L) {/* load */
+               if (l) {/* load */
                        operation = "LDR";
                        instruction->type = ARM_LDRH;
                } else {/* store */
@@ -1084,25 +1077,25 @@ static int evaluate_misc_load_store(uint32_t opcode,
                }
        }
 
-       if (I) {/* Immediate offset/index (#+-<offset_8>)*/
+       if (i) {/* Immediate offset/index (#+-<offset_8>)*/
                uint32_t offset_8 = ((opcode & 0xf00) >> 4) | (opcode & 0xf);
-               snprintf(offset, 32, "#%s0x%" PRIx32 "", (U) ? "" : "-", offset_8);
+               snprintf(offset, 32, "#%s0x%" PRIx32 "", (u) ? "" : "-", offset_8);
 
                instruction->info.load_store.offset_mode = 0;
                instruction->info.load_store.offset.offset = offset_8;
        } else {/* Register offset/index (+-<Rm>) */
-               uint8_t Rm;
-               Rm = (opcode & 0xf);
-               snprintf(offset, 32, "%sr%i", (U) ? "" : "-", Rm);
+               uint8_t rm;
+               rm = (opcode & 0xf);
+               snprintf(offset, 32, "%sr%i", (u) ? "" : "-", rm);
 
                instruction->info.load_store.offset_mode = 1;
-               instruction->info.load_store.offset.reg.Rm = Rm;
+               instruction->info.load_store.offset.reg.rm = rm;
                instruction->info.load_store.offset.reg.shift = 0x0;
                instruction->info.load_store.offset.reg.shift_imm = 0x0;
        }
 
-       if (P == 1) {
-               if (W == 0) {   /* offset */
+       if (p == 1) {
+               if (w == 0) {   /* offset */
                        snprintf(instruction->text,
                                        128,
                                        "0x%8.8" PRIx32 "\t0x%8.8" PRIx32 "\t%s%s%s r%i, [r%i, %s]",
@@ -1111,8 +1104,8 @@ static int evaluate_misc_load_store(uint32_t opcode,
                                        operation,
                                        COND(opcode),
                                        suffix,
-                                       Rd,
-                                       Rn,
+                                       rd,
+                                       rn,
                                        offset);
 
                        instruction->info.load_store.index_mode = 0;
@@ -1125,8 +1118,8 @@ static int evaluate_misc_load_store(uint32_t opcode,
                                        operation,
                                        COND(opcode),
                                        suffix,
-                                       Rd,
-                                       Rn,
+                                       rd,
+                                       rn,
                                        offset);
 
                        instruction->info.load_store.index_mode = 1;
@@ -1140,8 +1133,8 @@ static int evaluate_misc_load_store(uint32_t opcode,
                                operation,
                                COND(opcode),
                                suffix,
-                               Rd,
-                               Rn,
+                               rd,
+                               rn,
                                offset);
 
                instruction->info.load_store.index_mode = 2;
@@ -1154,7 +1147,7 @@ static int evaluate_misc_load_store(uint32_t opcode,
 static int evaluate_ldm_stm(uint32_t opcode,
                            uint32_t address, struct arm_instruction *instruction)
 {
-       uint8_t P, U, S, W, L, Rn;
+       uint8_t p, u, s, w, l, rn;
        uint32_t register_list;
        char *addressing_mode;
        char *mnemonic;
@@ -1163,20 +1156,20 @@ static int evaluate_ldm_stm(uint32_t opcode,
        int i;
        int first_reg = 1;
 
-       P = (opcode & 0x01000000) >> 24;
-       U = (opcode & 0x00800000) >> 23;
-       S = (opcode & 0x00400000) >> 22;
-       W = (opcode & 0x00200000) >> 21;
-       L = (opcode & 0x00100000) >> 20;
+       p = (opcode & 0x01000000) >> 24;
+       u = (opcode & 0x00800000) >> 23;
+       s = (opcode & 0x00400000) >> 22;
+       w = (opcode & 0x00200000) >> 21;
+       l = (opcode & 0x00100000) >> 20;
        register_list = (opcode & 0xffff);
-       Rn = (opcode & 0xf0000) >> 16;
+       rn = (opcode & 0xf0000) >> 16;
 
-       instruction->info.load_store_multiple.Rn = Rn;
+       instruction->info.load_store_multiple.rn = rn;
        instruction->info.load_store_multiple.register_list = register_list;
-       instruction->info.load_store_multiple.S = S;
-       instruction->info.load_store_multiple.W = W;
+       instruction->info.load_store_multiple.s = s;
+       instruction->info.load_store_multiple.w = w;
 
-       if (L) {
+       if (l) {
                instruction->type = ARM_LDM;
                mnemonic = "LDM";
        } else {
@@ -1184,8 +1177,8 @@ static int evaluate_ldm_stm(uint32_t opcode,
                mnemonic = "STM";
        }
 
-       if (P) {
-               if (U) {
+       if (p) {
+               if (u) {
                        instruction->info.load_store_multiple.addressing_mode = 1;
                        addressing_mode = "IB";
                } else {
@@ -1193,7 +1186,7 @@ static int evaluate_ldm_stm(uint32_t opcode,
                        addressing_mode = "DB";
                }
        } else {
-               if (U) {
+               if (u) {
                        instruction->info.load_store_multiple.addressing_mode = 0;
                        /* "IA" is the default in UAL syntax */
                        addressing_mode = "";
@@ -1225,7 +1218,7 @@ static int evaluate_ldm_stm(uint32_t opcode,
                        "\t%s%s%s r%i%s, {%s}%s",
                        address, opcode,
                        mnemonic, addressing_mode, COND(opcode),
-                       Rn, (W) ? "!" : "", reg_list, (S) ? "^" : "");
+                       rn, (w) ? "!" : "", reg_list, (s) ? "^" : "");
 
        return ERROR_OK;
 }
@@ -1238,12 +1231,12 @@ static int evaluate_mul_and_extra_ld_st(uint32_t opcode,
        if ((opcode & 0x000000f0) == 0x00000090) {
                /* Multiply (accumulate) */
                if ((opcode & 0x0f800000) == 0x00000000) {
-                       uint8_t Rm, Rs, Rn, Rd, S;
-                       Rm = opcode & 0xf;
-                       Rs = (opcode & 0xf00) >> 8;
-                       Rn = (opcode & 0xf000) >> 12;
-                       Rd = (opcode & 0xf0000) >> 16;
-                       S = (opcode & 0x00100000) >> 20;
+                       uint8_t rm, rs, rn, rd, s;
+                       rm = opcode & 0xf;
+                       rs = (opcode & 0xf00) >> 8;
+                       rn = (opcode & 0xf000) >> 12;
+                       rd = (opcode & 0xf0000) >> 16;
+                       s = (opcode & 0x00100000) >> 20;
 
                        /* examine A bit (accumulate) */
                        if (opcode & 0x00200000) {
@@ -1254,11 +1247,11 @@ static int evaluate_mul_and_extra_ld_st(uint32_t opcode,
                                                address,
                                                opcode,
                                                COND(opcode),
-                                               (S) ? "S" : "",
-                                               Rd,
-                                               Rm,
-                                               Rs,
-                                               Rn);
+                                               (s) ? "S" : "",
+                                               rd,
+                                               rm,
+                                               rs,
+                                               rn);
                        } else {
                                instruction->type = ARM_MUL;
                                snprintf(instruction->text,
@@ -1267,10 +1260,10 @@ static int evaluate_mul_and_extra_ld_st(uint32_t opcode,
                                                address,
                                                opcode,
                                                COND(opcode),
-                                               (S) ? "S" : "",
-                                               Rd,
-                                               Rm,
-                                               Rs);
+                                               (s) ? "S" : "",
+                                               rd,
+                                               rm,
+                                               rs);
                        }
 
                        return ERROR_OK;
@@ -1279,12 +1272,12 @@ static int evaluate_mul_and_extra_ld_st(uint32_t opcode,
                /* Multiply (accumulate) long */
                if ((opcode & 0x0f800000) == 0x00800000) {
                        char *mnemonic = NULL;
-                       uint8_t Rm, Rs, RdHi, RdLow, S;
-                       Rm = opcode & 0xf;
-                       Rs = (opcode & 0xf00) >> 8;
-                       RdHi = (opcode & 0xf000) >> 12;
-                       RdLow = (opcode & 0xf0000) >> 16;
-                       S = (opcode & 0x00100000) >> 20;
+                       uint8_t rm, rs, rd_hi, rd_low, s;
+                       rm = opcode & 0xf;
+                       rs = (opcode & 0xf00) >> 8;
+                       rd_hi = (opcode & 0xf000) >> 12;
+                       rd_low = (opcode & 0xf0000) >> 16;
+                       s = (opcode & 0x00100000) >> 20;
 
                        switch ((opcode & 0x00600000) >> 21) {
                                case 0x0:
@@ -1312,21 +1305,21 @@ static int evaluate_mul_and_extra_ld_st(uint32_t opcode,
                                        opcode,
                                        mnemonic,
                                        COND(opcode),
-                                       (S) ? "S" : "",
-                                       RdLow,
-                                       RdHi,
-                                       Rm,
-                                       Rs);
+                                       (s) ? "S" : "",
+                                       rd_low,
+                                       rd_hi,
+                                       rm,
+                                       rs);
 
                        return ERROR_OK;
                }
 
                /* Swap/swap byte */
                if ((opcode & 0x0f800000) == 0x01000000) {
-                       uint8_t Rm, Rd, Rn;
-                       Rm = opcode & 0xf;
-                       Rd = (opcode & 0xf000) >> 12;
-                       Rn = (opcode & 0xf0000) >> 16;
+                       uint8_t rm, rd, rn;
+                       rm = opcode & 0xf;
+                       rd = (opcode & 0xf000) >> 12;
+                       rn = (opcode & 0xf0000) >> 16;
 
                        /* examine B flag */
                        instruction->type = (opcode & 0x00400000) ? ARM_SWPB : ARM_SWP;
@@ -1338,9 +1331,9 @@ static int evaluate_mul_and_extra_ld_st(uint32_t opcode,
                                        opcode,
                                        (opcode & 0x00400000) ? "SWPB" : "SWP",
                                        COND(opcode),
-                                       Rd,
-                                       Rm,
-                                       Rn);
+                                       rd,
+                                       rm,
+                                       rn);
                        return ERROR_OK;
                }
 
@@ -1352,8 +1345,8 @@ static int evaluate_mul_and_extra_ld_st(uint32_t opcode,
 static int evaluate_mrs_msr(uint32_t opcode,
                            uint32_t address, struct arm_instruction *instruction)
 {
-       int R = (opcode & 0x00400000) >> 22;
-       char *PSR = (R) ? "SPSR" : "CPSR";
+       int r = (opcode & 0x00400000) >> 22;
+       char *PSR = (r) ? "SPSR" : "CPSR";
 
        /* Move register to status register (MSR) */
        if (opcode & 0x00200000) {
@@ -1378,7 +1371,7 @@ static int evaluate_mrs_msr(uint32_t opcode,
                                        ror(immediate, (rotate * 2))
                                        );
                } else {/* register variant */
-                       uint8_t Rm = opcode & 0xf;
+                       uint8_t rm = opcode & 0xf;
                        snprintf(instruction->text,
                                        128,
                                        "0x%8.8" PRIx32 "\t0x%8.8" PRIx32 "\tMSR%s %s_%s%s%s%s, r%i",
@@ -1390,15 +1383,15 @@ static int evaluate_mrs_msr(uint32_t opcode,
                                        (opcode & 0x20000) ? "x" : "",
                                        (opcode & 0x40000) ? "s" : "",
                                        (opcode & 0x80000) ? "f" : "",
-                                       Rm
+                                       rm
                                        );
                }
 
        } else {/* Move status register to register (MRS) */
-               uint8_t Rd;
+               uint8_t rd;
 
                instruction->type = ARM_MRS;
-               Rd = (opcode & 0x0000f000) >> 12;
+               rd = (opcode & 0x0000f000) >> 12;
 
                snprintf(instruction->text,
                                128,
@@ -1406,7 +1399,7 @@ static int evaluate_mrs_msr(uint32_t opcode,
                                address,
                                opcode,
                                COND(opcode),
-                               Rd,
+                               rd,
                                PSR);
        }
 
@@ -1423,37 +1416,37 @@ static int evaluate_misc_instr(uint32_t opcode,
 
        /* BX */
        if ((opcode & 0x006000f0) == 0x00200010) {
-               uint8_t Rm;
+               uint8_t rm;
                instruction->type = ARM_BX;
-               Rm = opcode & 0xf;
+               rm = opcode & 0xf;
 
                snprintf(instruction->text, 128, "0x%8.8" PRIx32 "\t0x%8.8" PRIx32 "\tBX%s r%i",
-                               address, opcode, COND(opcode), Rm);
+                               address, opcode, COND(opcode), rm);
 
-               instruction->info.b_bl_bx_blx.reg_operand = Rm;
+               instruction->info.b_bl_bx_blx.reg_operand = rm;
                instruction->info.b_bl_bx_blx.target_address = -1;
        }
 
        /* BXJ - "Jazelle" support (ARMv5-J) */
        if ((opcode & 0x006000f0) == 0x00200020) {
-               uint8_t Rm;
+               uint8_t rm;
                instruction->type = ARM_BX;
-               Rm = opcode & 0xf;
+               rm = opcode & 0xf;
 
                snprintf(instruction->text, 128,
                                "0x%8.8" PRIx32 "\t0x%8.8" PRIx32 "\tBXJ%s r%i",
-                               address, opcode, COND(opcode), Rm);
+                               address, opcode, COND(opcode), rm);
 
-               instruction->info.b_bl_bx_blx.reg_operand = Rm;
+               instruction->info.b_bl_bx_blx.reg_operand = rm;
                instruction->info.b_bl_bx_blx.target_address = -1;
        }
 
        /* CLZ */
        if ((opcode & 0x006000f0) == 0x00600010) {
-               uint8_t Rm, Rd;
+               uint8_t rm, rd;
                instruction->type = ARM_CLZ;
-               Rm = opcode & 0xf;
-               Rd = (opcode & 0xf000) >> 12;
+               rm = opcode & 0xf;
+               rd = (opcode & 0xf000) >> 12;
 
                snprintf(instruction->text,
                                128,
@@ -1461,30 +1454,30 @@ static int evaluate_misc_instr(uint32_t opcode,
                                address,
                                opcode,
                                COND(opcode),
-                               Rd,
-                               Rm);
+                               rd,
+                               rm);
        }
 
        /* BLX(2) */
        if ((opcode & 0x006000f0) == 0x00200030) {
-               uint8_t Rm;
+               uint8_t rm;
                instruction->type = ARM_BLX;
-               Rm = opcode & 0xf;
+               rm = opcode & 0xf;
 
                snprintf(instruction->text, 128, "0x%8.8" PRIx32 "\t0x%8.8" PRIx32 "\tBLX%s r%i",
-                               address, opcode, COND(opcode), Rm);
+                               address, opcode, COND(opcode), rm);
 
-               instruction->info.b_bl_bx_blx.reg_operand = Rm;
+               instruction->info.b_bl_bx_blx.reg_operand = rm;
                instruction->info.b_bl_bx_blx.target_address = -1;
        }
 
        /* Enhanced DSP add/subtracts */
        if ((opcode & 0x0000000f0) == 0x00000050) {
-               uint8_t Rm, Rd, Rn;
+               uint8_t rm, rd, rn;
                char *mnemonic = NULL;
-               Rm = opcode & 0xf;
-               Rd = (opcode & 0xf000) >> 12;
-               Rn = (opcode & 0xf0000) >> 16;
+               rm = opcode & 0xf;
+               rd = (opcode & 0xf000) >> 12;
+               rn = (opcode & 0xf0000) >> 16;
 
                switch ((opcode & 0x00600000) >> 21) {
                        case 0x0:
@@ -1512,9 +1505,9 @@ static int evaluate_misc_instr(uint32_t opcode,
                                opcode,
                                mnemonic,
                                COND(opcode),
-                               Rd,
-                               Rm,
-                               Rn);
+                               rd,
+                               rm,
+                               rn);
        }
 
        /* exception return */
@@ -1567,12 +1560,12 @@ static int evaluate_misc_instr(uint32_t opcode,
 
                /* SMLA < x><y> */
                if ((opcode & 0x00600000) == 0x00000000) {
-                       uint8_t Rd, Rm, Rs, Rn;
-                       instruction->type = ARM_SMLAxy;
-                       Rd = (opcode & 0xf0000) >> 16;
-                       Rm = (opcode & 0xf);
-                       Rs = (opcode & 0xf00) >> 8;
-                       Rn = (opcode & 0xf000) >> 12;
+                       uint8_t rd, rm, rs, rn;
+                       instruction->type = ARM_SMLAXY;
+                       rd = (opcode & 0xf0000) >> 16;
+                       rm = (opcode & 0xf);
+                       rs = (opcode & 0xf00) >> 8;
+                       rn = (opcode & 0xf000) >> 12;
 
                        snprintf(instruction->text,
                                        128,
@@ -1582,20 +1575,20 @@ static int evaluate_misc_instr(uint32_t opcode,
                                        (x) ? "T" : "B",
                                        (y) ? "T" : "B",
                                        COND(opcode),
-                                       Rd,
-                                       Rm,
-                                       Rs,
-                                       Rn);
+                                       rd,
+                                       rm,
+                                       rs,
+                                       rn);
                }
 
                /* SMLAL < x><y> */
                if ((opcode & 0x00600000) == 0x00400000) {
-                       uint8_t RdLow, RdHi, Rm, Rs;
-                       instruction->type = ARM_SMLAxy;
-                       RdHi = (opcode & 0xf0000) >> 16;
-                       RdLow = (opcode & 0xf000) >> 12;
-                       Rm = (opcode & 0xf);
-                       Rs = (opcode & 0xf00) >> 8;
+                       uint8_t rd_low, rd_hi, rm, rs;
+                       instruction->type = ARM_SMLAXY;
+                       rd_hi = (opcode & 0xf0000) >> 16;
+                       rd_low = (opcode & 0xf000) >> 12;
+                       rm = (opcode & 0xf);
+                       rs = (opcode & 0xf00) >> 8;
 
                        snprintf(instruction->text,
                                        128,
@@ -1605,20 +1598,20 @@ static int evaluate_misc_instr(uint32_t opcode,
                                        (x) ? "T" : "B",
                                        (y) ? "T" : "B",
                                        COND(opcode),
-                                       RdLow,
-                                       RdHi,
-                                       Rm,
-                                       Rs);
+                                       rd_low,
+                                       rd_hi,
+                                       rm,
+                                       rs);
                }
 
                /* SMLAW < y> */
                if (((opcode & 0x00600000) == 0x00200000) && (x == 0)) {
-                       uint8_t Rd, Rm, Rs, Rn;
-                       instruction->type = ARM_SMLAWy;
-                       Rd = (opcode & 0xf0000) >> 16;
-                       Rm = (opcode & 0xf);
-                       Rs = (opcode & 0xf00) >> 8;
-                       Rn = (opcode & 0xf000) >> 12;
+                       uint8_t rd, rm, rs, rn;
+                       instruction->type = ARM_SMLAWY;
+                       rd = (opcode & 0xf0000) >> 16;
+                       rm = (opcode & 0xf);
+                       rs = (opcode & 0xf00) >> 8;
+                       rn = (opcode & 0xf000) >> 12;
 
                        snprintf(instruction->text,
                                        128,
@@ -1627,19 +1620,19 @@ static int evaluate_misc_instr(uint32_t opcode,
                                        opcode,
                                        (y) ? "T" : "B",
                                        COND(opcode),
-                                       Rd,
-                                       Rm,
-                                       Rs,
-                                       Rn);
+                                       rd,
+                                       rm,
+                                       rs,
+                                       rn);
                }
 
                /* SMUL < x><y> */
                if ((opcode & 0x00600000) == 0x00600000) {
-                       uint8_t Rd, Rm, Rs;
-                       instruction->type = ARM_SMULxy;
-                       Rd = (opcode & 0xf0000) >> 16;
-                       Rm = (opcode & 0xf);
-                       Rs = (opcode & 0xf00) >> 8;
+                       uint8_t rd, rm, rs;
+                       instruction->type = ARM_SMULXY;
+                       rd = (opcode & 0xf0000) >> 16;
+                       rm = (opcode & 0xf);
+                       rs = (opcode & 0xf00) >> 8;
 
                        snprintf(instruction->text,
                                        128,
@@ -1649,18 +1642,18 @@ static int evaluate_misc_instr(uint32_t opcode,
                                        (x) ? "T" : "B",
                                        (y) ? "T" : "B",
                                        COND(opcode),
-                                       Rd,
-                                       Rm,
-                                       Rs);
+                                       rd,
+                                       rm,
+                                       rs);
                }
 
                /* SMULW < y> */
                if (((opcode & 0x00600000) == 0x00200000) && (x == 1)) {
-                       uint8_t Rd, Rm, Rs;
-                       instruction->type = ARM_SMULWy;
-                       Rd = (opcode & 0xf0000) >> 16;
-                       Rm = (opcode & 0xf);
-                       Rs = (opcode & 0xf00) >> 8;
+                       uint8_t rd, rm, rs;
+                       instruction->type = ARM_SMULWY;
+                       rd = (opcode & 0xf0000) >> 16;
+                       rm = (opcode & 0xf);
+                       rs = (opcode & 0xf00) >> 8;
 
                        snprintf(instruction->text,
                                        128,
@@ -1669,9 +1662,9 @@ static int evaluate_misc_instr(uint32_t opcode,
                                        opcode,
                                        (y) ? "T" : "B",
                                        COND(opcode),
-                                       Rd,
-                                       Rm,
-                                       Rs);
+                                       rd,
+                                       rm,
+                                       rs);
                }
        }
 
@@ -1682,24 +1675,24 @@ static int evaluate_mov_imm(uint32_t opcode,
                              uint32_t address, struct arm_instruction *instruction)
 {
        uint16_t immediate;
-       uint8_t Rd;
-       bool T;
+       uint8_t rd;
+       bool t;
 
-       Rd = (opcode & 0xf000) >> 12;
-       T = opcode & 0x00400000;
+       rd = (opcode & 0xf000) >> 12;
+       t = opcode & 0x00400000;
        immediate = (opcode & 0xf0000) >> 4 | (opcode & 0xfff);
 
        instruction->type = ARM_MOV;
-       instruction->info.data_proc.Rd = Rd;
+       instruction->info.data_proc.rd = rd;
 
        snprintf(instruction->text,
                 128,
                 "0x%8.8" PRIx32 "\t0x%8.8" PRIx32 "\tMOV%s%s r%i, #0x%" PRIx16,
                 address,
                 opcode,
-                T ? "T" : "W",
+                t ? "T" : "W",
                 COND(opcode),
-                Rd,
+                rd,
                 immediate);
 
        return ERROR_OK;
@@ -1708,20 +1701,20 @@ static int evaluate_mov_imm(uint32_t opcode,
 static int evaluate_data_proc(uint32_t opcode,
                              uint32_t address, struct arm_instruction *instruction)
 {
-       uint8_t I, op, S, Rn, Rd;
+       uint8_t i, op, s, rn, rd;
        char *mnemonic = NULL;
        char shifter_operand[32];
 
-       I = (opcode & 0x02000000) >> 25;
+       i = (opcode & 0x02000000) >> 25;
        op = (opcode & 0x01e00000) >> 21;
-       S = (opcode & 0x00100000) >> 20;
+       s = (opcode & 0x00100000) >> 20;
 
-       Rd = (opcode & 0xf000) >> 12;
-       Rn = (opcode & 0xf0000) >> 16;
+       rd = (opcode & 0xf000) >> 12;
+       rn = (opcode & 0xf0000) >> 16;
 
-       instruction->info.data_proc.Rd = Rd;
-       instruction->info.data_proc.Rn = Rn;
-       instruction->info.data_proc.S = S;
+       instruction->info.data_proc.rd = rd;
+       instruction->info.data_proc.rn = rn;
+       instruction->info.data_proc.s = s;
 
        switch (op) {
                case 0x0:
@@ -1790,7 +1783,7 @@ static int evaluate_data_proc(uint32_t opcode,
                        break;
        }
 
-       if (I) {/* immediate shifter operand (#<immediate>)*/
+       if (i) {/* immediate shifter operand (#<immediate>)*/
                uint8_t immed_8 = opcode & 0xff;
                uint8_t rotate_imm = (opcode & 0xf00) >> 8;
                uint32_t immediate;
@@ -1802,9 +1795,9 @@ static int evaluate_data_proc(uint32_t opcode,
                instruction->info.data_proc.variant = 0;
                instruction->info.data_proc.shifter_operand.immediate.immediate = immediate;
        } else {/* register-based shifter operand */
-               uint8_t shift, Rm;
+               uint8_t shift, rm;
                shift = (opcode & 0x60) >> 5;
-               Rm = (opcode & 0xf);
+               rm = (opcode & 0xf);
 
                if ((opcode & 0x10) != 0x10) {  /* Immediate shifts ("<Rm>" or "<Rm>, <shift>
                                                 *#<shift_immediate>") */
@@ -1812,7 +1805,7 @@ static int evaluate_data_proc(uint32_t opcode,
                        shift_imm = (opcode & 0xf80) >> 7;
 
                        instruction->info.data_proc.variant = 1;
-                       instruction->info.data_proc.shifter_operand.immediate_shift.Rm = Rm;
+                       instruction->info.data_proc.shifter_operand.immediate_shift.rm = rm;
                        instruction->info.data_proc.shifter_operand.immediate_shift.shift_imm =
                                shift_imm;
                        instruction->info.data_proc.shifter_operand.immediate_shift.shift = shift;
@@ -1830,51 +1823,51 @@ static int evaluate_data_proc(uint32_t opcode,
                                shift = 0x4;
 
                        if ((shift_imm == 0x0) && (shift == 0x0))
-                               snprintf(shifter_operand, 32, "r%i", Rm);
+                               snprintf(shifter_operand, 32, "r%i", rm);
                        else {
                                if (shift == 0x0)       /* LSL */
                                        snprintf(shifter_operand,
                                                        32,
                                                        "r%i, LSL #0x%x",
-                                                       Rm,
+                                                       rm,
                                                        shift_imm);
                                else if (shift == 0x1)  /* LSR */
                                        snprintf(shifter_operand,
                                                        32,
                                                        "r%i, LSR #0x%x",
-                                                       Rm,
+                                                       rm,
                                                        shift_imm);
                                else if (shift == 0x2)  /* ASR */
                                        snprintf(shifter_operand,
                                                        32,
                                                        "r%i, ASR #0x%x",
-                                                       Rm,
+                                                       rm,
                                                        shift_imm);
                                else if (shift == 0x3)  /* ROR */
                                        snprintf(shifter_operand,
                                                        32,
                                                        "r%i, ROR #0x%x",
-                                                       Rm,
+                                                       rm,
                                                        shift_imm);
                                else if (shift == 0x4)  /* RRX */
-                                       snprintf(shifter_operand, 32, "r%i, RRX", Rm);
+                                       snprintf(shifter_operand, 32, "r%i, RRX", rm);
                        }
                } else {/* Register shifts ("<Rm>, <shift> <Rs>") */
-                       uint8_t Rs = (opcode & 0xf00) >> 8;
+                       uint8_t rs = (opcode & 0xf00) >> 8;
 
                        instruction->info.data_proc.variant = 2;
-                       instruction->info.data_proc.shifter_operand.register_shift.Rm = Rm;
-                       instruction->info.data_proc.shifter_operand.register_shift.Rs = Rs;
+                       instruction->info.data_proc.shifter_operand.register_shift.rm = rm;
+                       instruction->info.data_proc.shifter_operand.register_shift.rs = rs;
                        instruction->info.data_proc.shifter_operand.register_shift.shift = shift;
 
                        if (shift == 0x0)       /* LSL */
-                               snprintf(shifter_operand, 32, "r%i, LSL r%i", Rm, Rs);
+                               snprintf(shifter_operand, 32, "r%i, LSL r%i", rm, rs);
                        else if (shift == 0x1)  /* LSR */
-                               snprintf(shifter_operand, 32, "r%i, LSR r%i", Rm, Rs);
+                               snprintf(shifter_operand, 32, "r%i, LSR r%i", rm, rs);
                        else if (shift == 0x2)  /* ASR */
-                               snprintf(shifter_operand, 32, "r%i, ASR r%i", Rm, Rs);
+                               snprintf(shifter_operand, 32, "r%i, ASR r%i", rm, rs);
                        else if (shift == 0x3)  /* ROR */
-                               snprintf(shifter_operand, 32, "r%i, ROR r%i", Rm, Rs);
+                               snprintf(shifter_operand, 32, "r%i, ROR r%i", rm, rs);
                }
        }
 
@@ -1887,9 +1880,9 @@ static int evaluate_data_proc(uint32_t opcode,
                                opcode,
                                mnemonic,
                                COND(opcode),
-                               (S) ? "S" : "",
-                               Rd,
-                               Rn,
+                               (s) ? "S" : "",
+                               rd,
+                               rn,
                                shifter_operand);
        } else if ((op == 0xd) || (op == 0xf)) {        /* <opcode1>{<cond>}{S} <Rd>,
                                                         *<shifter_operand> */
@@ -1907,13 +1900,13 @@ static int evaluate_data_proc(uint32_t opcode,
                                        opcode,
                                        mnemonic,
                                        COND(opcode),
-                                       (S) ? "S" : "",
-                                       Rd,
+                                       (s) ? "S" : "",
+                                       rd,
                                        shifter_operand);
        } else {/* <opcode2>{<cond>} <Rn>, <shifter_operand> */
                snprintf(instruction->text, 128, "0x%8.8" PRIx32 "\t0x%8.8" PRIx32 "\t%s%s r%i, %s",
                                address, opcode, mnemonic, COND(opcode),
-                               Rn, shifter_operand);
+                               rn, shifter_operand);
        }
 
        return ERROR_OK;
@@ -2119,9 +2112,9 @@ static int evaluate_b_bl_blx_thumb(uint16_t opcode,
 static int evaluate_add_sub_thumb(uint16_t opcode,
                                  uint32_t address, struct arm_instruction *instruction)
 {
-       uint8_t Rd = (opcode >> 0) & 0x7;
-       uint8_t Rn = (opcode >> 3) & 0x7;
-       uint8_t Rm_imm = (opcode >> 6) & 0x7;
+       uint8_t rd = (opcode >> 0) & 0x7;
+       uint8_t rn = (opcode >> 3) & 0x7;
+       uint8_t rm_imm = (opcode >> 6) & 0x7;
        uint32_t opc = opcode & (1 << 9);
        uint32_t reg_imm  = opcode & (1 << 10);
        char *mnemonic;
@@ -2135,22 +2128,22 @@ static int evaluate_add_sub_thumb(uint16_t opcode,
                mnemonic = "ADDS";
        }
 
-       instruction->info.data_proc.Rd = Rd;
-       instruction->info.data_proc.Rn = Rn;
-       instruction->info.data_proc.S = 1;
+       instruction->info.data_proc.rd = rd;
+       instruction->info.data_proc.rn = rn;
+       instruction->info.data_proc.s = 1;
 
        if (reg_imm) {
                instruction->info.data_proc.variant = 0;/*immediate*/
-               instruction->info.data_proc.shifter_operand.immediate.immediate = Rm_imm;
+               instruction->info.data_proc.shifter_operand.immediate.immediate = rm_imm;
                snprintf(instruction->text, 128,
                                "0x%8.8" PRIx32 "  0x%4.4x    \t%s\tr%i, r%i, #%d",
-                               address, opcode, mnemonic, Rd, Rn, Rm_imm);
+                               address, opcode, mnemonic, rd, rn, rm_imm);
        } else {
                instruction->info.data_proc.variant = 1;/*immediate shift*/
-               instruction->info.data_proc.shifter_operand.immediate_shift.Rm = Rm_imm;
+               instruction->info.data_proc.shifter_operand.immediate_shift.rm = rm_imm;
                snprintf(instruction->text, 128,
                                "0x%8.8" PRIx32 "  0x%4.4x    \t%s\tr%i, r%i, r%i",
-                               address, opcode, mnemonic, Rd, Rn, Rm_imm);
+                               address, opcode, mnemonic, rd, rn, rm_imm);
        }
 
        return ERROR_OK;
@@ -2159,8 +2152,8 @@ static int evaluate_add_sub_thumb(uint16_t opcode,
 static int evaluate_shift_imm_thumb(uint16_t opcode,
                                    uint32_t address, struct arm_instruction *instruction)
 {
-       uint8_t Rd = (opcode >> 0) & 0x7;
-       uint8_t Rm = (opcode >> 3) & 0x7;
+       uint8_t rd = (opcode >> 0) & 0x7;
+       uint8_t rm = (opcode >> 3) & 0x7;
        uint8_t imm = (opcode >> 6) & 0x1f;
        uint8_t opc = (opcode >> 11) & 0x3;
        char *mnemonic = NULL;
@@ -2186,17 +2179,17 @@ static int evaluate_shift_imm_thumb(uint16_t opcode,
        if ((imm == 0) && (opc != 0))
                imm = 32;
 
-       instruction->info.data_proc.Rd = Rd;
-       instruction->info.data_proc.Rn = -1;
-       instruction->info.data_proc.S = 1;
+       instruction->info.data_proc.rd = rd;
+       instruction->info.data_proc.rn = -1;
+       instruction->info.data_proc.s = 1;
 
        instruction->info.data_proc.variant = 1;/*immediate_shift*/
-       instruction->info.data_proc.shifter_operand.immediate_shift.Rm = Rm;
+       instruction->info.data_proc.shifter_operand.immediate_shift.rm = rm;
        instruction->info.data_proc.shifter_operand.immediate_shift.shift_imm = imm;
 
        snprintf(instruction->text, 128,
                        "0x%8.8" PRIx32 "  0x%4.4x    \t%s\tr%i, r%i, #%#2.2x",
-                       address, opcode, mnemonic, Rd, Rm, imm);
+                       address, opcode, mnemonic, rd, rm, imm);
 
        return ERROR_OK;
 }
@@ -2205,13 +2198,13 @@ static int evaluate_data_proc_imm_thumb(uint16_t opcode,
                                        uint32_t address, struct arm_instruction *instruction)
 {
        uint8_t imm = opcode & 0xff;
-       uint8_t Rd = (opcode >> 8) & 0x7;
+       uint8_t rd = (opcode >> 8) & 0x7;
        uint32_t opc = (opcode >> 11) & 0x3;
        char *mnemonic = NULL;
 
-       instruction->info.data_proc.Rd = Rd;
-       instruction->info.data_proc.Rn = Rd;
-       instruction->info.data_proc.S = 1;
+       instruction->info.data_proc.rd = rd;
+       instruction->info.data_proc.rn = rd;
+       instruction->info.data_proc.s = 1;
        instruction->info.data_proc.variant = 0;/*immediate*/
        instruction->info.data_proc.shifter_operand.immediate.immediate = imm;
 
@@ -2219,12 +2212,12 @@ static int evaluate_data_proc_imm_thumb(uint16_t opcode,
                case 0:
                        instruction->type = ARM_MOV;
                        mnemonic = "MOVS";
-                       instruction->info.data_proc.Rn = -1;
+                       instruction->info.data_proc.rn = -1;
                        break;
                case 1:
                        instruction->type = ARM_CMP;
                        mnemonic = "CMP";
-                       instruction->info.data_proc.Rd = -1;
+                       instruction->info.data_proc.rd = -1;
                        break;
                case 2:
                        instruction->type = ARM_ADD;
@@ -2238,7 +2231,7 @@ static int evaluate_data_proc_imm_thumb(uint16_t opcode,
 
        snprintf(instruction->text, 128,
                        "0x%8.8" PRIx32 "  0x%4.4x    \t%s\tr%i, #%#2.2x",
-                       address, opcode, mnemonic, Rd, imm);
+                       address, opcode, mnemonic, rd, imm);
 
        return ERROR_OK;
 }
@@ -2246,27 +2239,27 @@ static int evaluate_data_proc_imm_thumb(uint16_t opcode,
 static int evaluate_data_proc_thumb(uint16_t opcode,
                                    uint32_t address, struct arm_instruction *instruction)
 {
-       uint8_t high_reg, op, Rm, Rd, H1, H2;
+       uint8_t high_reg, op, rm, rd, h1, h2;
        char *mnemonic = NULL;
        bool nop = false;
 
        high_reg = (opcode & 0x0400) >> 10;
        op = (opcode & 0x03C0) >> 6;
 
-       Rd = (opcode & 0x0007);
-       Rm = (opcode & 0x0038) >> 3;
-       H1 = (opcode & 0x0080) >> 7;
-       H2 = (opcode & 0x0040) >> 6;
+       rd = (opcode & 0x0007);
+       rm = (opcode & 0x0038) >> 3;
+       h1 = (opcode & 0x0080) >> 7;
+       h2 = (opcode & 0x0040) >> 6;
 
-       instruction->info.data_proc.Rd = Rd;
-       instruction->info.data_proc.Rn = Rd;
-       instruction->info.data_proc.S = (!high_reg || (instruction->type == ARM_CMP));
+       instruction->info.data_proc.rd = rd;
+       instruction->info.data_proc.rn = rd;
+       instruction->info.data_proc.s = (!high_reg || (instruction->type == ARM_CMP));
        instruction->info.data_proc.variant = 1 /*immediate shift*/;
-       instruction->info.data_proc.shifter_operand.immediate_shift.Rm = Rm;
+       instruction->info.data_proc.shifter_operand.immediate_shift.rm = rm;
 
        if (high_reg) {
-               Rd |= H1 << 3;
-               Rm |= H2 << 3;
+               rd |= h1 << 3;
+               rm |= h2 << 3;
                op >>= 2;
 
                switch (op) {
@@ -2281,24 +2274,24 @@ static int evaluate_data_proc_thumb(uint16_t opcode,
                        case 0x2:
                                instruction->type = ARM_MOV;
                                mnemonic = "MOV";
-                               if (Rd == Rm)
+                               if (rd == rm)
                                        nop = true;
                                break;
                        case 0x3:
                                if ((opcode & 0x7) == 0x0) {
-                                       instruction->info.b_bl_bx_blx.reg_operand = Rm;
-                                       if (H1) {
+                                       instruction->info.b_bl_bx_blx.reg_operand = rm;
+                                       if (h1) {
                                                instruction->type = ARM_BLX;
                                                snprintf(instruction->text, 128,
                                                                "0x%8.8" PRIx32
                                                                "  0x%4.4x    \tBLX\tr%i",
-                                                               address, opcode, Rm);
+                                                               address, opcode, rm);
                                        } else {
                                                instruction->type = ARM_BX;
                                                snprintf(instruction->text, 128,
                                                                "0x%8.8" PRIx32
                                                                "  0x%4.4x    \tBX\tr%i",
-                                                               address, opcode, Rm);
+                                                               address, opcode, rm);
                                        }
                                } else {
                                        instruction->type = ARM_UNDEFINED_INSTRUCTION;
@@ -2325,24 +2318,24 @@ static int evaluate_data_proc_thumb(uint16_t opcode,
                                mnemonic = "LSLS";
                                instruction->info.data_proc.variant = 2 /*register shift*/;
                                instruction->info.data_proc.shifter_operand.register_shift.shift = 0;
-                               instruction->info.data_proc.shifter_operand.register_shift.Rm = Rd;
-                               instruction->info.data_proc.shifter_operand.register_shift.Rs = Rm;
+                               instruction->info.data_proc.shifter_operand.register_shift.rm = rd;
+                               instruction->info.data_proc.shifter_operand.register_shift.rs = rm;
                                break;
                        case 0x3:
                                instruction->type = ARM_MOV;
                                mnemonic = "LSRS";
                                instruction->info.data_proc.variant = 2 /*register shift*/;
                                instruction->info.data_proc.shifter_operand.register_shift.shift = 1;
-                               instruction->info.data_proc.shifter_operand.register_shift.Rm = Rd;
-                               instruction->info.data_proc.shifter_operand.register_shift.Rs = Rm;
+                               instruction->info.data_proc.shifter_operand.register_shift.rm = rd;
+                               instruction->info.data_proc.shifter_operand.register_shift.rs = rm;
                                break;
                        case 0x4:
                                instruction->type = ARM_MOV;
                                mnemonic = "ASRS";
                                instruction->info.data_proc.variant = 2 /*register shift*/;
                                instruction->info.data_proc.shifter_operand.register_shift.shift = 2;
-                               instruction->info.data_proc.shifter_operand.register_shift.Rm = Rd;
-                               instruction->info.data_proc.shifter_operand.register_shift.Rs = Rm;
+                               instruction->info.data_proc.shifter_operand.register_shift.rm = rd;
+                               instruction->info.data_proc.shifter_operand.register_shift.rs = rm;
                                break;
                        case 0x5:
                                instruction->type = ARM_ADC;
@@ -2357,8 +2350,8 @@ static int evaluate_data_proc_thumb(uint16_t opcode,
                                mnemonic = "RORS";
                                instruction->info.data_proc.variant = 2 /*register shift*/;
                                instruction->info.data_proc.shifter_operand.register_shift.shift = 3;
-                               instruction->info.data_proc.shifter_operand.register_shift.Rm = Rd;
-                               instruction->info.data_proc.shifter_operand.register_shift.Rs = Rm;
+                               instruction->info.data_proc.shifter_operand.register_shift.rm = rd;
+                               instruction->info.data_proc.shifter_operand.register_shift.rs = rm;
                                break;
                        case 0x8:
                                instruction->type = ARM_TST;
@@ -2369,7 +2362,7 @@ static int evaluate_data_proc_thumb(uint16_t opcode,
                                mnemonic = "RSBS";
                                instruction->info.data_proc.variant = 0 /*immediate*/;
                                instruction->info.data_proc.shifter_operand.immediate.immediate = 0;
-                               instruction->info.data_proc.Rn = Rm;
+                               instruction->info.data_proc.rn = rm;
                                break;
                        case 0xA:
                                instruction->type = ARM_CMP;
@@ -2402,11 +2395,11 @@ static int evaluate_data_proc_thumb(uint16_t opcode,
                snprintf(instruction->text, 128,
                                "0x%8.8" PRIx32 "  0x%4.4x    \tNOP\t\t\t"
                                "; (%s r%i, r%i)",
-                               address, opcode, mnemonic, Rd, Rm);
+                               address, opcode, mnemonic, rd, rm);
        else
                snprintf(instruction->text, 128,
                                "0x%8.8" PRIx32 "  0x%4.4x    \t%s\tr%i, r%i",
-                               address, opcode, mnemonic, Rd, Rm);
+                               address, opcode, mnemonic, rd, rm);
 
        return ERROR_OK;
 }
@@ -2421,14 +2414,14 @@ static int evaluate_load_literal_thumb(uint16_t opcode,
                                       uint32_t address, struct arm_instruction *instruction)
 {
        uint32_t immediate;
-       uint8_t Rd = (opcode >> 8) & 0x7;
+       uint8_t rd = (opcode >> 8) & 0x7;
 
        instruction->type = ARM_LDR;
        immediate = opcode & 0x000000ff;
        immediate *= 4;
 
-       instruction->info.load_store.Rd = Rd;
-       instruction->info.load_store.Rn = 15 /*PC*/;
+       instruction->info.load_store.rd = rd;
+       instruction->info.load_store.rn = 15 /*PC*/;
        instruction->info.load_store.index_mode = 0;    /*offset*/
        instruction->info.load_store.offset_mode = 0;   /*immediate*/
        instruction->info.load_store.offset.offset = immediate;
@@ -2436,7 +2429,7 @@ static int evaluate_load_literal_thumb(uint16_t opcode,
        snprintf(instruction->text, 128,
                        "0x%8.8" PRIx32 "  0x%4.4x    \t"
                        "LDR\tr%i, [pc, #%#" PRIx32 "]\t; %#8.8" PRIx32,
-                       address, opcode, Rd, immediate,
+                       address, opcode, rd, immediate,
                        thumb_alignpc4(address) + immediate);
 
        return ERROR_OK;
@@ -2445,9 +2438,9 @@ static int evaluate_load_literal_thumb(uint16_t opcode,
 static int evaluate_load_store_reg_thumb(uint16_t opcode,
                                         uint32_t address, struct arm_instruction *instruction)
 {
-       uint8_t Rd = (opcode >> 0) & 0x7;
-       uint8_t Rn = (opcode >> 3) & 0x7;
-       uint8_t Rm = (opcode >> 6) & 0x7;
+       uint8_t rd = (opcode >> 0) & 0x7;
+       uint8_t rn = (opcode >> 3) & 0x7;
+       uint8_t rm = (opcode >> 6) & 0x7;
        uint8_t opc = (opcode >> 9) & 0x7;
        char *mnemonic = NULL;
 
@@ -2488,13 +2481,13 @@ static int evaluate_load_store_reg_thumb(uint16_t opcode,
 
        snprintf(instruction->text, 128,
                        "0x%8.8" PRIx32 "  0x%4.4x    \t%s\tr%i, [r%i, r%i]",
-                       address, opcode, mnemonic, Rd, Rn, Rm);
+                       address, opcode, mnemonic, rd, rn, rm);
 
-       instruction->info.load_store.Rd = Rd;
-       instruction->info.load_store.Rn = Rn;
+       instruction->info.load_store.rd = rd;
+       instruction->info.load_store.rn = rn;
        instruction->info.load_store.index_mode = 0;    /*offset*/
        instruction->info.load_store.offset_mode = 1;   /*register*/
-       instruction->info.load_store.offset.reg.Rm = Rm;
+       instruction->info.load_store.offset.reg.rm = rm;
 
        return ERROR_OK;
 }
@@ -2503,15 +2496,15 @@ static int evaluate_load_store_imm_thumb(uint16_t opcode,
                                         uint32_t address, struct arm_instruction *instruction)
 {
        uint32_t offset = (opcode >> 6) & 0x1f;
-       uint8_t Rd = (opcode >> 0) & 0x7;
-       uint8_t Rn = (opcode >> 3) & 0x7;
-       uint32_t L = opcode & (1 << 11);
-       uint32_t B = opcode & (1 << 12);
+       uint8_t rd = (opcode >> 0) & 0x7;
+       uint8_t rn = (opcode >> 3) & 0x7;
+       uint32_t l = opcode & (1 << 11);
+       uint32_t b = opcode & (1 << 12);
        char *mnemonic;
        char suffix = ' ';
        uint32_t shift = 2;
 
-       if (L) {
+       if (l) {
                instruction->type = ARM_LDR;
                mnemonic = "LDR";
        } else {
@@ -2522,17 +2515,17 @@ static int evaluate_load_store_imm_thumb(uint16_t opcode,
        if ((opcode&0xF000) == 0x8000) {
                suffix = 'H';
                shift = 1;
-       } else if (B) {
+       } else if (b) {
                suffix = 'B';
                shift = 0;
        }
 
        snprintf(instruction->text, 128,
                        "0x%8.8" PRIx32 "  0x%4.4x    \t%s%c\tr%i, [r%i, #%#" PRIx32 "]",
-                       address, opcode, mnemonic, suffix, Rd, Rn, offset << shift);
+                       address, opcode, mnemonic, suffix, rd, rn, offset << shift);
 
-       instruction->info.load_store.Rd = Rd;
-       instruction->info.load_store.Rn = Rn;
+       instruction->info.load_store.rd = rd;
+       instruction->info.load_store.rn = rn;
        instruction->info.load_store.index_mode = 0;    /*offset*/
        instruction->info.load_store.offset_mode = 0;   /*immediate*/
        instruction->info.load_store.offset.offset = offset << shift;
@@ -2544,11 +2537,11 @@ static int evaluate_load_store_stack_thumb(uint16_t opcode,
                                           uint32_t address, struct arm_instruction *instruction)
 {
        uint32_t offset = opcode  & 0xff;
-       uint8_t Rd = (opcode >> 8) & 0x7;
-       uint32_t L = opcode & (1 << 11);
+       uint8_t rd = (opcode >> 8) & 0x7;
+       uint32_t l = opcode & (1 << 11);
        char *mnemonic;
 
-       if (L) {
+       if (l) {
                instruction->type = ARM_LDR;
                mnemonic = "LDR";
        } else {
@@ -2558,10 +2551,10 @@ static int evaluate_load_store_stack_thumb(uint16_t opcode,
 
        snprintf(instruction->text, 128,
                        "0x%8.8" PRIx32 "  0x%4.4x    \t%s\tr%i, [SP, #%#" PRIx32 "]",
-                       address, opcode, mnemonic, Rd, offset*4);
+                       address, opcode, mnemonic, rd, offset*4);
 
-       instruction->info.load_store.Rd = Rd;
-       instruction->info.load_store.Rn = 13 /*SP*/;
+       instruction->info.load_store.rd = rd;
+       instruction->info.load_store.rn = 13 /*SP*/;
        instruction->info.load_store.index_mode = 0;    /*offset*/
        instruction->info.load_store.offset_mode = 0;   /*immediate*/
        instruction->info.load_store.offset.offset = offset*4;
@@ -2573,28 +2566,28 @@ static int evaluate_add_sp_pc_thumb(uint16_t opcode,
                                    uint32_t address, struct arm_instruction *instruction)
 {
        uint32_t imm = opcode  & 0xff;
-       uint8_t Rd = (opcode >> 8) & 0x7;
-       uint8_t Rn;
-       uint32_t SP = opcode & (1 << 11);
+       uint8_t rd = (opcode >> 8) & 0x7;
+       uint8_t rn;
+       uint32_t sp = opcode & (1 << 11);
        const char *reg_name;
 
        instruction->type = ARM_ADD;
 
-       if (SP) {
+       if (sp) {
                reg_name = "SP";
-               Rn = 13;
+               rn = 13;
        } else {
                reg_name = "PC";
-               Rn = 15;
+               rn = 15;
        }
 
        snprintf(instruction->text, 128,
                        "0x%8.8" PRIx32 "  0x%4.4x  \tADD\tr%i, %s, #%#" PRIx32,
-                       address, opcode, Rd, reg_name, imm * 4);
+                       address, opcode, rd, reg_name, imm * 4);
 
        instruction->info.data_proc.variant = 0 /* immediate */;
-       instruction->info.data_proc.Rd = Rd;
-       instruction->info.data_proc.Rn = Rn;
+       instruction->info.data_proc.rd = rd;
+       instruction->info.data_proc.rn = rn;
        instruction->info.data_proc.shifter_operand.immediate.immediate = imm*4;
 
        return ERROR_OK;
@@ -2621,8 +2614,8 @@ static int evaluate_adjust_stack_thumb(uint16_t opcode,
                        address, opcode, mnemonic, imm*4);
 
        instruction->info.data_proc.variant = 0 /* immediate */;
-       instruction->info.data_proc.Rd = 13 /*SP*/;
-       instruction->info.data_proc.Rn = 13 /*SP*/;
+       instruction->info.data_proc.rd = 13 /*SP*/;
+       instruction->info.data_proc.rn = 13 /*SP*/;
        instruction->info.data_proc.shifter_operand.immediate.immediate = imm*4;
 
        return ERROR_OK;
@@ -2646,9 +2639,9 @@ static int evaluate_load_store_multiple_thumb(uint16_t opcode,
                                              uint32_t address, struct arm_instruction *instruction)
 {
        uint32_t reg_list = opcode  & 0xff;
-       uint32_t L = opcode & (1 << 11);
-       uint32_t R = opcode & (1 << 8);
-       uint8_t Rn = (opcode >> 8) & 7;
+       uint32_t l = opcode & (1 << 11);
+       uint32_t r = opcode & (1 << 8);
+       uint8_t rn = (opcode >> 8) & 7;
        uint8_t addr_mode = 0 /* IA */;
        char reg_names[40];
        char *reg_names_p;
@@ -2663,28 +2656,28 @@ static int evaluate_load_store_multiple_thumb(uint16_t opcode,
        if ((opcode & 0xf000) == 0xc000) {      /* generic load/store multiple */
                char *wback = "!";
 
-               if (L) {
+               if (l) {
                        instruction->type = ARM_LDM;
                        mnemonic = "LDM";
-                       if (opcode & (1 << Rn))
+                       if (opcode & (1 << rn))
                                wback = "";
                } else {
                        instruction->type = ARM_STM;
                        mnemonic = "STM";
                }
-               snprintf(ptr_name, sizeof(ptr_name), "r%i%s, ", Rn, wback);
+               snprintf(ptr_name, sizeof(ptr_name), "r%i%s, ", rn, wback);
        } else {/* push/pop */
-               Rn = 13;/* SP */
-               if (L) {
+               rn = 13;/* SP */
+               if (l) {
                        instruction->type = ARM_LDM;
                        mnemonic = "POP";
-                       if (R)
+                       if (r)
                                reg_list |= (1 << 15) /*PC*/;
                } else {
                        instruction->type = ARM_STM;
                        mnemonic = "PUSH";
                        addr_mode = 3;  /*DB*/
-                       if (R)
+                       if (r)
                                reg_list |= (1 << 14) /*LR*/;
                }
        }
@@ -2707,7 +2700,7 @@ static int evaluate_load_store_multiple_thumb(uint16_t opcode,
                        address, opcode, mnemonic, ptr_name, reg_names);
 
        instruction->info.load_store_multiple.register_list = reg_list;
-       instruction->info.load_store_multiple.Rn = Rn;
+       instruction->info.load_store_multiple.rn = rn;
        instruction->info.load_store_multiple.addressing_mode = addr_mode;
 
        return ERROR_OK;
@@ -3000,1616 +2993,126 @@ int thumb_evaluate_opcode(uint16_t opcode, uint32_t address, struct arm_instruct
        return -1;
 }
 
-static int t2ev_b_bl(uint32_t opcode, uint32_t address,
-                    struct arm_instruction *instruction, char *cp)
-{
-       unsigned offset;
-       unsigned b21 = 1 << 21;
-       unsigned b22 = 1 << 22;
-
-       /* instead of combining two smaller 16-bit branch instructions,
-        * Thumb2 uses only one larger 32-bit instruction.
-        */
-       offset = opcode & 0x7ff;
-       offset |= (opcode & 0x03ff0000) >> 5;
-       if (opcode & (1 << 26)) {
-               offset |= 0xff << 23;
-               if ((opcode & (1 << 11)) == 0)
-                       b21 = 0;
-               if ((opcode & (1 << 13)) == 0)
-                       b22 = 0;
-       } else {
-               if (opcode & (1 << 11))
-                       b21 = 0;
-               if (opcode & (1 << 13))
-                       b22 = 0;
-       }
-       offset |= b21;
-       offset |= b22;
-
-
-       address += 4;
-       address += offset << 1;
-
-       char *inst;
-       switch ((opcode >> 12) & 0x5) {
-       case 0x1:
-               inst = "B.W";
-               instruction->type = ARM_B;
-               break;
-       case 0x4:
-               inst = "BLX";
-               instruction->type = ARM_BLX;
-               address &= 0xfffffffc;
-               break;
-       case 0x5:
-               inst = "BL";
-               instruction->type = ARM_BL;
-               break;
-       default:
-               return ERROR_COMMAND_SYNTAX_ERROR;
-       }
-       instruction->info.b_bl_bx_blx.reg_operand = -1;
-       instruction->info.b_bl_bx_blx.target_address = address;
-       sprintf(cp, "%s\t%#8.8" PRIx32, inst, address);
-
-       return ERROR_OK;
-}
-
-static int t2ev_cond_b(uint32_t opcode, uint32_t address,
-                      struct arm_instruction *instruction, char *cp)
-{
-       unsigned offset;
-       unsigned b17 = 1 << 17;
-       unsigned b18 = 1 << 18;
-       unsigned cond = (opcode >> 22) & 0x0f;
-
-       offset = opcode & 0x7ff;
-       offset |= (opcode & 0x003f0000) >> 5;
-       if (opcode & (1 << 26)) {
-               offset |= 0x1fff << 19;
-               if ((opcode & (1 << 11)) == 0)
-                       b17 = 0;
-               if ((opcode & (1 << 13)) == 0)
-                       b18 = 0;
-       } else {
-               if (opcode & (1 << 11))
-                       b17 = 0;
-               if (opcode & (1 << 13))
-                       b18 = 0;
-       }
-       offset |= b17;
-       offset |= b18;
-
-       address += 4;
-       address += offset << 1;
-
-       instruction->type = ARM_B;
-       instruction->info.b_bl_bx_blx.reg_operand = -1;
-       instruction->info.b_bl_bx_blx.target_address = address;
-       sprintf(cp, "B%s.W\t%#8.8" PRIx32,
-                       arm_condition_strings[cond],
-                       address);
-
-       return ERROR_OK;
-}
-
-static const char *special_name(int number)
+int arm_access_size(struct arm_instruction *instruction)
 {
-       char *special = "(RESERVED)";
-
-       switch (number) {
-               case 0:
-                       special = "apsr";
-                       break;
-               case 1:
-                       special = "iapsr";
-                       break;
-               case 2:
-                       special = "eapsr";
-                       break;
-               case 3:
-                       special = "xpsr";
-                       break;
-               case 5:
-                       special = "ipsr";
-                       break;
-               case 6:
-                       special = "epsr";
-                       break;
-               case 7:
-                       special = "iepsr";
-                       break;
-               case 8:
-                       special = "msp";
-                       break;
-               case 9:
-                       special = "psp";
-                       break;
-               case 16:
-                       special = "primask";
-                       break;
-               case 17:
-                       special = "basepri";
-                       break;
-               case 18:
-                       special = "basepri_max";
-                       break;
-               case 19:
-                       special = "faultmask";
-                       break;
-               case 20:
-                       special = "control";
-                       break;
+       if ((instruction->type == ARM_LDRB)
+           || (instruction->type == ARM_LDRBT)
+           || (instruction->type == ARM_LDRSB)
+           || (instruction->type == ARM_STRB)
+           || (instruction->type == ARM_STRBT))
+               return 1;
+       else if ((instruction->type == ARM_LDRH)
+                || (instruction->type == ARM_LDRSH)
+                || (instruction->type == ARM_STRH))
+               return 2;
+       else if ((instruction->type == ARM_LDR)
+                || (instruction->type == ARM_LDRT)
+                || (instruction->type == ARM_STR)
+                || (instruction->type == ARM_STRT))
+               return 4;
+       else if ((instruction->type == ARM_LDRD)
+                || (instruction->type == ARM_STRD))
+               return 8;
+       else {
+               LOG_ERROR("BUG: instruction type %i isn't a load/store instruction",
+                               instruction->type);
+               return 0;
        }
-       return special;
 }
 
-static int t2ev_hint(uint32_t opcode, uint32_t address,
-                    struct arm_instruction *instruction, char *cp)
+#if HAVE_CAPSTONE
+static void print_opcode(struct command_invocation *cmd, const cs_insn *insn)
 {
-       const char *mnemonic;
+       uint32_t opcode = 0;
 
-       if (opcode & 0x0700) {
-               instruction->type = ARM_UNDEFINED_INSTRUCTION;
-               strcpy(cp, "UNDEFINED");
-               return ERROR_OK;
-       }
+       memcpy(&opcode, insn->bytes, insn->size);
 
-       if (opcode & 0x00f0) {
-               sprintf(cp, "DBG\t#%d", (int) opcode & 0xf);
-               return ERROR_OK;
-       }
+       if (insn->size == 4) {
+               uint16_t opcode_high = opcode >> 16;
+               opcode = opcode & 0xffff;
 
-       switch (opcode & 0x0f) {
-               case 0:
-                       mnemonic = "NOP.W";
-                       break;
-               case 1:
-                       mnemonic = "YIELD.W";
-                       break;
-               case 2:
-                       mnemonic = "WFE.W";
-                       break;
-               case 3:
-                       mnemonic = "WFI.W";
-                       break;
-               case 4:
-                       mnemonic = "SEV.W";
-                       break;
-               default:
-                       mnemonic = "HINT.W (UNRECOGNIZED)";
-                       break;
+               command_print(cmd, "0x%08" PRIx64"  %04x %04x\t%s%s%s",
+                       insn->address, opcode, opcode_high, insn->mnemonic,
+                       insn->op_str[0] ? "\t" : "", insn->op_str);
+       } else {
+               command_print(cmd, "0x%08" PRIx64"  %04x\t%s%s%s",
+                       insn->address, opcode, insn->mnemonic,
+                       insn->op_str[0] ? "\t" : "", insn->op_str);
        }
-       strcpy(cp, mnemonic);
-       return ERROR_OK;
 }
 
-static int t2ev_misc(uint32_t opcode, uint32_t address,
-                    struct arm_instruction *instruction, char *cp)
+int arm_disassemble(struct command_invocation *cmd, struct target *target,
+               target_addr_t address, size_t count, bool thumb_mode)
 {
-       const char *mnemonic;
-
-       switch ((opcode >> 4) & 0x0f) {
-               case 0:
-                       mnemonic = "LEAVEX";
-                       break;
-               case 1:
-                       mnemonic = "ENTERX";
-                       break;
-               case 2:
-                       mnemonic = "CLREX";
-                       break;
-               case 4:
-                       mnemonic = "DSB";
-                       break;
-               case 5:
-                       mnemonic = "DMB";
-                       break;
-               case 6:
-                       mnemonic = "ISB";
-                       break;
-               default:
-                       return ERROR_COMMAND_SYNTAX_ERROR;
-       }
-       strcpy(cp, mnemonic);
-       return ERROR_OK;
-}
+       csh handle;
+       int ret;
+       cs_insn *insn;
+       cs_mode mode;
 
-static int t2ev_b_misc(uint32_t opcode, uint32_t address,
-                      struct arm_instruction *instruction, char *cp)
-{
-       /* permanently undefined */
-       if ((opcode & 0x07f07000) == 0x07f02000) {
-               instruction->type = ARM_UNDEFINED_INSTRUCTION;
-               strcpy(cp, "UNDEFINED");
-               return ERROR_OK;
+       if (!cs_support(CS_ARCH_ARM)) {
+               LOG_ERROR("ARM architecture not supported by capstone");
+               return ERROR_FAIL;
        }
 
-       switch ((opcode >> 12) & 0x5) {
-               case 0x1:
-               case 0x4:
-               case 0x5:
-                       return t2ev_b_bl(opcode, address, instruction, cp);
-               case 0:
-                       if (((opcode >> 23) & 0x07) != 0x07)
-                               return t2ev_cond_b(opcode, address, instruction, cp);
-                       if (opcode & (1 << 26))
-                               goto undef;
-                       break;
-       }
+       mode = CS_MODE_LITTLE_ENDIAN;
 
-       switch ((opcode >> 20) & 0x7f) {
-               case 0x38:
-               case 0x39:
-                       sprintf(cp, "MSR\t%s, r%d", special_name(opcode & 0xff),
-                               (int) (opcode >> 16) & 0x0f);
-                       return ERROR_OK;
-               case 0x3a:
-                       return t2ev_hint(opcode, address, instruction, cp);
-               case 0x3b:
-                       return t2ev_misc(opcode, address, instruction, cp);
-               case 0x3c:
-                       sprintf(cp, "BXJ\tr%d", (int) (opcode >> 16) & 0x0f);
-                       return ERROR_OK;
-               case 0x3e:
-               case 0x3f:
-                       sprintf(cp, "MRS\tr%d, %s", (int) (opcode >> 8) & 0x0f,
-                               special_name(opcode & 0xff));
-                       return ERROR_OK;
-       }
+       if (thumb_mode)
+               mode |= CS_MODE_THUMB;
 
-undef:
-       return ERROR_COMMAND_SYNTAX_ERROR;
-}
+       ret = cs_open(CS_ARCH_ARM, mode, &handle);
 
-static int t2ev_data_mod_immed(uint32_t opcode, uint32_t address,
-                              struct arm_instruction *instruction, char *cp)
-{
-       char *mnemonic = NULL;
-       int rn = (opcode >> 16) & 0xf;
-       int rd = (opcode >> 8) & 0xf;
-       unsigned immed = opcode & 0xff;
-       unsigned func;
-       bool one = false;
-       char *suffix = "";
-       char *suffix2 = "";
-
-       /* ARMv7-M: A5.3.2 Modified immediate constants */
-       func = (opcode >> 11) & 0x0e;
-       if (immed & 0x80)
-               func |= 1;
-       if (opcode & (1 << 26))
-               func |= 0x10;
-
-       /* "Modified" immediates */
-       switch (func >> 1) {
-               case 0:
-                       break;
-               case 2:
-                       immed <<= 8;
-               /* FALLTHROUGH */
-               case 1:
-                       immed += immed << 16;
-                       break;
-               case 3:
-                       immed += immed << 8;
-                       immed += immed << 16;
-                       break;
-               default:
-                       immed |= 0x80;
-                       immed = ror(immed, func);
+       if (ret != CS_ERR_OK) {
+               LOG_ERROR("cs_open() failed: %s", cs_strerror(ret));
+               return ERROR_FAIL;
        }
 
-       if (opcode & (1 << 20))
-               suffix = "S";
+       ret = cs_option(handle, CS_OPT_SKIPDATA, CS_OPT_ON);
 
-       switch ((opcode >> 21) & 0xf) {
-               case 0:
-                       if (rd == 0xf) {
-                               instruction->type = ARM_TST;
-                               mnemonic = "TST";
-                               one = true;
-                               suffix = "";
-                               rd = rn;
-                       } else {
-                               instruction->type = ARM_AND;
-                               mnemonic = "AND";
-                       }
-                       break;
-               case 1:
-                       instruction->type = ARM_BIC;
-                       mnemonic = "BIC";
-                       break;
-               case 2:
-                       if (rn == 0xf) {
-                               instruction->type = ARM_MOV;
-                               mnemonic = "MOV";
-                               one = true;
-                               suffix2 = ".W";
-                       } else {
-                               instruction->type = ARM_ORR;
-                               mnemonic = "ORR";
-                       }
-                       break;
-               case 3:
-                       if (rn == 0xf) {
-                               instruction->type = ARM_MVN;
-                               mnemonic = "MVN";
-                               one = true;
-                       } else {
-                               /* instruction->type = ARM_ORN; */
-                               mnemonic = "ORN";
-                       }
-                       break;
-               case 4:
-                       if (rd == 0xf) {
-                               instruction->type = ARM_TEQ;
-                               mnemonic = "TEQ";
-                               one = true;
-                               suffix = "";
-                               rd = rn;
-                       } else {
-                               instruction->type = ARM_EOR;
-                               mnemonic = "EOR";
-                       }
-                       break;
-               case 8:
-                       if (rd == 0xf) {
-                               instruction->type = ARM_CMN;
-                               mnemonic = "CMN";
-                               one = true;
-                               suffix = "";
-                               rd = rn;
-                       } else {
-                               instruction->type = ARM_ADD;
-                               mnemonic = "ADD";
-                               suffix2 = ".W";
-                       }
-                       break;
-               case 10:
-                       instruction->type = ARM_ADC;
-                       mnemonic = "ADC";
-                       suffix2 = ".W";
-                       break;
-               case 11:
-                       instruction->type = ARM_SBC;
-                       mnemonic = "SBC";
-                       break;
-               case 13:
-                       if (rd == 0xf) {
-                               instruction->type = ARM_CMP;
-                               mnemonic = "CMP";
-                               one = true;
-                               suffix = "";
-                               rd = rn;
-                       } else {
-                               instruction->type = ARM_SUB;
-                               mnemonic = "SUB";
-                       }
-                       suffix2 = ".W";
-                       break;
-               case 14:
-                       instruction->type = ARM_RSB;
-                       mnemonic = "RSB";
-                       suffix2 = ".W";
-                       break;
-               default:
-                       return ERROR_COMMAND_SYNTAX_ERROR;
+       if (ret != CS_ERR_OK) {
+               LOG_ERROR("cs_option() failed: %s", cs_strerror(ret));
+               cs_close(&handle);
+               return ERROR_FAIL;
        }
 
-       if (one)
-               sprintf(cp, "%s%s\tr%d, #%d\t; %#8.8x",
-                               mnemonic, suffix2, rd, immed, immed);
-       else
-               sprintf(cp, "%s%s%s\tr%d, r%d, #%d\t; %#8.8x",
-                               mnemonic, suffix, suffix2,
-                               rd, rn, immed, immed);
-
-       return ERROR_OK;
-}
-
-static int t2ev_data_immed(uint32_t opcode, uint32_t address,
-                          struct arm_instruction *instruction, char *cp)
-{
-       char *mnemonic = NULL;
-       int rn = (opcode >> 16) & 0xf;
-       int rd = (opcode >> 8) & 0xf;
-       unsigned immed;
-       bool add = false;
-       bool is_signed = false;
-
-       immed = (opcode & 0x0ff) | ((opcode & 0x7000) >> 4);
-       if (opcode & (1 << 26))
-               immed |= (1 << 11);
+       insn = cs_malloc(handle);
 
-       switch ((opcode >> 20) & 0x1f) {
-               case 0:
-                       if (rn == 0xf) {
-                               add = true;
-                               goto do_adr;
-                       }
-                       mnemonic = "ADDW";
-                       break;
-               case 4:
-                       immed |= (opcode >> 4) & 0xf000;
-                       sprintf(cp, "MOVW\tr%d, #%d\t; %#3.3x", rd, immed, immed);
-                       return ERROR_OK;
-               case 0x0a:
-                       if (rn == 0xf)
-                               goto do_adr;
-                       mnemonic = "SUBW";
-                       break;
-               case 0x0c:
-                       /* move constant to top 16 bits of register */
-                       immed |= (opcode >> 4) & 0xf000;
-                       sprintf(cp, "MOVT\tr%d, #%d\t; %#4.4x", rd, immed, immed);
-                       return ERROR_OK;
-               case 0x10:
-               case 0x12:
-                       is_signed = true;
-                       /* fallthrough */
-               case 0x18:
-               case 0x1a:
-                       /* signed/unsigned saturated add */
-                       immed = (opcode >> 6) & 0x03;
-                       immed |= (opcode >> 10) & 0x1c;
-                       sprintf(cp, "%sSAT\tr%d, #%d, r%d, %s #%d\t",
-                               is_signed ? "S" : "U",
-                               rd, (int) (opcode & 0x1f) + is_signed, rn,
-                               (opcode & (1 << 21)) ? "ASR" : "LSL",
-                               immed ? immed : 32);
-                       return ERROR_OK;
-               case 0x14:
-                       is_signed = true;
-               /* FALLTHROUGH */
-               case 0x1c:
-                       /* signed/unsigned bitfield extract */
-                       immed = (opcode >> 6) & 0x03;
-                       immed |= (opcode >> 10) & 0x1c;
-                       sprintf(cp, "%sBFX\tr%d, r%d, #%d, #%d\t",
-                               is_signed ? "S" : "U",
-                               rd, rn, immed,
-                               (int) (opcode & 0x1f) + 1);
-                       return ERROR_OK;
-               case 0x16:
-                       immed = (opcode >> 6) & 0x03;
-                       immed |= (opcode >> 10) & 0x1c;
-                       if (rn == 0xf)  /* bitfield clear */
-                               sprintf(cp, "BFC\tr%d, #%d, #%d\t",
-                                               rd, immed,
-                                               (int) (opcode & 0x1f) + 1 - immed);
-                       else            /* bitfield insert */
-                               sprintf(cp, "BFI\tr%d, r%d, #%d, #%d\t",
-                                               rd, rn, immed,
-                                               (int) (opcode & 0x1f) + 1 - immed);
-                       return ERROR_OK;
-               default:
-                       return ERROR_COMMAND_SYNTAX_ERROR;
+       if (!insn) {
+               LOG_ERROR("cs_malloc() failed\n");
+               cs_close(&handle);
+               return ERROR_FAIL;
        }
 
-       sprintf(cp, "%s\tr%d, r%d, #%d\t; %#3.3x", mnemonic,
-                       rd, rn, immed, immed);
-       return ERROR_OK;
+       while (count > 0) {
+           uint8_t buffer[4];
 
-do_adr:
-       address = thumb_alignpc4(address);
-       if (add)
-               address += immed;
-       else
-               address -= immed;
-       /* REVISIT "ADD/SUB Rd, PC, #const ; 0x..." might be better;
-        * not hiding the pc-relative stuff will sometimes be useful.
-        */
-       sprintf(cp, "ADR.W\tr%d, %#8.8" PRIx32, rd, address);
-       return ERROR_OK;
-}
+               ret = target_read_buffer(target, address, sizeof(buffer), buffer);
 
-static int t2ev_store_single(uint32_t opcode, uint32_t address,
-                            struct arm_instruction *instruction, char *cp)
-{
-       unsigned op = (opcode >> 20) & 0xf;
-       char *size = "";
-       char *suffix = "";
-       char *p1 = "";
-       char *p2 = "]";
-       unsigned immed;
-       unsigned rn = (opcode >> 16) & 0x0f;
-       unsigned rt = (opcode >> 12) & 0x0f;
-
-       if (rn == 0xf)
-               return ERROR_COMMAND_SYNTAX_ERROR;
-
-       if (opcode & 0x0800)
-               op |= 1;
-       switch (op) {
-               /* byte */
-               case 0x8:
-               case 0x9:
-                       size = "B";
-                       goto imm12;
-               case 0x1:
-                       size = "B";
-                       goto imm8;
-               case 0x0:
-                       size = "B";
-                       break;
-               /* halfword */
-               case 0xa:
-               case 0xb:
-                       size = "H";
-                       goto imm12;
-               case 0x3:
-                       size = "H";
-                       goto imm8;
-               case 0x2:
-                       size = "H";
-                       break;
-               /* word */
-               case 0xc:
-               case 0xd:
-                       goto imm12;
-               case 0x5:
-                       goto imm8;
-               case 0x4:
-                       break;
-               /* error */
-               default:
-                       return ERROR_COMMAND_SYNTAX_ERROR;
-       }
+               if (ret != ERROR_OK) {
+                       cs_free(insn, 1);
+                       cs_close(&handle);
+                       return ret;
+               }
 
-       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;
+               size_t size = sizeof(buffer);
+               const uint8_t *tmp = buffer;
 
-imm12:
-       immed = opcode & 0x0fff;
-       sprintf(cp, "STR%s.W\tr%d, [r%d, #%u]\t; %#3.3x",
-                       size, rt, rn, immed, immed);
-       return ERROR_OK;
+               ret = cs_disasm_iter(handle, &tmp, &size, &address, insn);
 
-imm8:
-       immed = opcode & 0x00ff;
+               if (!ret) {
+                       LOG_ERROR("cs_disasm_iter() failed: %s",
+                               cs_strerror(cs_errno(handle)));
+                       cs_free(insn, 1);
+                       cs_close(&handle);
+                       return ERROR_FAIL;
+               }
 
-       switch (opcode & 0x700) {
-               case 0x600:
-                       suffix = "T";
-                       break;
-               case 0x000:
-               case 0x200:
-                       return ERROR_COMMAND_SYNTAX_ERROR;
+               print_opcode(cmd, insn);
+               count--;
        }
 
-       /* two indexed modes will write back rn */
-       if (opcode & 0x100) {
-               if (opcode & 0x400)     /* pre-indexed */
-                       p2 = "]!";
-               else {                  /* post-indexed */
-                       p1 = "]";
-                       p2 = "";
-               }
-       }
+       cs_free(insn, 1);
+       cs_close(&handle);
 
-       sprintf(cp, "STR%s%s\tr%d, [r%d%s, #%s%u%s\t; %#2.2x",
-                       size, suffix, rt, rn, p1,
-                       (opcode & 0x200) ? "" : "-",
-                       immed, p2, immed);
        return ERROR_OK;
 }
-
-static int t2ev_mul32(uint32_t opcode, uint32_t address,
-                     struct arm_instruction *instruction, char *cp)
-{
-       int ra = (opcode >> 12) & 0xf;
-
-       switch (opcode & 0x007000f0) {
-               case 0:
-                       if (ra == 0xf)
-                               sprintf(cp, "MUL\tr%d, r%d, r%d",
-                                               (int) (opcode >> 8) & 0xf,
-                                               (int) (opcode >> 16) & 0xf,
-                                               (int) (opcode >> 0) & 0xf);
-                       else
-                               sprintf(cp, "MLA\tr%d, r%d, r%d, r%d",
-                                               (int) (opcode >> 8) & 0xf,
-                                               (int) (opcode >> 16) & 0xf,
-                                               (int) (opcode >> 0) & 0xf, ra);
-                       break;
-               case 0x10:
-                       sprintf(cp, "MLS\tr%d, r%d, r%d, r%d",
-                               (int) (opcode >> 8) & 0xf,
-                               (int) (opcode >> 16) & 0xf,
-                               (int) (opcode >> 0) & 0xf, ra);
-                       break;
-               default:
-                       return ERROR_COMMAND_SYNTAX_ERROR;
-       }
-       return ERROR_OK;
-}
-
-static int t2ev_mul64_div(uint32_t opcode, uint32_t address,
-                         struct arm_instruction *instruction, char *cp)
-{
-       int op = (opcode >> 4) & 0xf;
-       char *infix = "MUL";
-
-       op += (opcode >> 16) & 0x70;
-       switch (op) {
-               case 0x40:
-               case 0x60:
-                       infix = "MLA";
-               /* FALLTHROUGH */
-               case 0:
-               case 0x20:
-                       sprintf(cp, "%c%sL\tr%d, r%d, r%d, r%d",
-                               (op & 0x20) ? 'U' : 'S',
-                               infix,
-                               (int) (opcode >> 12) & 0xf,
-                               (int) (opcode >> 8) & 0xf,
-                               (int) (opcode >> 16) & 0xf,
-                               (int) (opcode >> 0) & 0xf);
-                       break;
-               case 0x1f:
-               case 0x3f:
-                       sprintf(cp, "%cDIV\tr%d, r%d, r%d",
-                               (op & 0x20) ? 'U' : 'S',
-                               (int) (opcode >> 8) & 0xf,
-                               (int) (opcode >> 16) & 0xf,
-                               (int) (opcode >> 0) & 0xf);
-                       break;
-               default:
-                       return ERROR_COMMAND_SYNTAX_ERROR;
-       }
-
-       return ERROR_OK;
-}
-
-static int t2ev_ldm_stm(uint32_t opcode, uint32_t address,
-                       struct arm_instruction *instruction, char *cp)
-{
-       int rn = (opcode >> 16) & 0xf;
-       int op = (opcode >> 22) & 0x6;
-       int t = (opcode >> 21) & 1;
-       unsigned registers = opcode & 0xffff;
-       char *mode = "";
-
-       if (opcode & (1 << 20))
-               op |= 1;
-
-       switch (op) {
-               case 0:
-                       mode = "DB";
-               /* FALL THROUGH */
-               case 6:
-                       sprintf(cp, "SRS%s\tsp%s, #%d", mode,
-                               t ? "!" : "",
-                               (unsigned) (opcode & 0x1f));
-                       return ERROR_OK;
-               case 1:
-                       mode = "DB";
-               /* FALL THROUGH */
-               case 7:
-                       sprintf(cp, "RFE%s\tr%d%s", mode,
-                               (unsigned) ((opcode >> 16) & 0xf),
-                               t ? "!" : "");
-                       return ERROR_OK;
-               case 2:
-                       sprintf(cp, "STM.W\tr%d%s, ", rn, t ? "!" : "");
-                       break;
-               case 3:
-                       if (rn == 13 && t)
-                               sprintf(cp, "POP.W\t");
-                       else
-                               sprintf(cp, "LDM.W\tr%d%s, ", rn, t ? "!" : "");
-                       break;
-               case 4:
-                       if (rn == 13 && t)
-                               sprintf(cp, "PUSH.W\t");
-                       else
-                               sprintf(cp, "STMDB\tr%d%s, ", rn, t ? "!" : "");
-                       break;
-               case 5:
-                       sprintf(cp, "LDMDB.W\tr%d%s, ", rn, t ? "!" : "");
-                       break;
-               default:
-                       return ERROR_COMMAND_SYNTAX_ERROR;
-       }
-
-       cp = strchr(cp, 0);
-       *cp++ = '{';
-       for (t = 0; registers; t++, registers >>= 1) {
-               if ((registers & 1) == 0)
-                       continue;
-               registers &= ~1;
-               sprintf(cp, "r%d%s", t, registers ? ", " : "");
-               cp = strchr(cp, 0);
-       }
-       *cp++ = '}';
-       *cp++ = 0;
-
-       return ERROR_OK;
-}
-
-/* load/store dual or exclusive, table branch */
-static int t2ev_ldrex_strex(uint32_t opcode, uint32_t address,
-                           struct arm_instruction *instruction, char *cp)
-{
-       unsigned op1op2 = (opcode >> 20) & 0x3;
-       unsigned op3 = (opcode >> 4) & 0xf;
-       char *mnemonic;
-       unsigned rn = (opcode >> 16) & 0xf;
-       unsigned rt = (opcode >> 12) & 0xf;
-       unsigned rd = (opcode >> 8) & 0xf;
-       unsigned imm = opcode & 0xff;
-       char *p1 = "";
-       char *p2 = "]";
-
-       op1op2 |= (opcode >> 21) & 0xc;
-       switch (op1op2) {
-               case 0:
-                       mnemonic = "STREX";
-                       goto strex;
-               case 1:
-                       mnemonic = "LDREX";
-                       goto ldrex;
-               case 2:
-               case 6:
-               case 8:
-               case 10:
-               case 12:
-               case 14:
-                       mnemonic = "STRD";
-                       goto immediate;
-               case 3:
-               case 7:
-               case 9:
-               case 11:
-               case 13:
-               case 15:
-                       mnemonic = "LDRD";
-                       if (rn == 15)
-                               goto literal;
-                       else
-                               goto immediate;
-               case 4:
-                       switch (op3) {
-                               case 4:
-                                       mnemonic = "STREXB";
-                                       break;
-                               case 5:
-                                       mnemonic = "STREXH";
-                                       break;
-                               default:
-                                       return ERROR_COMMAND_SYNTAX_ERROR;
-                       }
-                       rd = opcode & 0xf;
-                       imm = 0;
-                       goto strex;
-               case 5:
-                       switch (op3) {
-                               case 0:
-                                       sprintf(cp, "TBB\t[r%u, r%u]", rn, imm & 0xf);
-                                       return ERROR_OK;
-                               case 1:
-                                       sprintf(cp, "TBH\t[r%u, r%u, LSL #1]", rn, imm & 0xf);
-                                       return ERROR_OK;
-                               case 4:
-                                       mnemonic = "LDREXB";
-                                       break;
-                               case 5:
-                                       mnemonic = "LDREXH";
-                                       break;
-                               default:
-                                       return ERROR_COMMAND_SYNTAX_ERROR;
-                       }
-                       imm = 0;
-                       goto ldrex;
-       }
-       return ERROR_COMMAND_SYNTAX_ERROR;
-
-strex:
-       imm <<= 2;
-       if (imm)
-               sprintf(cp, "%s\tr%u, r%u, [r%u, #%u]\t; %#2.2x",
-                               mnemonic, rd, rt, rn, imm, imm);
-       else
-               sprintf(cp, "%s\tr%u, r%u, [r%u]",
-                               mnemonic, rd, rt, rn);
-       return ERROR_OK;
-
-ldrex:
-       imm <<= 2;
-       if (imm)
-               sprintf(cp, "%s\tr%u, [r%u, #%u]\t; %#2.2x",
-                               mnemonic, rt, rn, imm, imm);
-       else
-               sprintf(cp, "%s\tr%u, [r%u]",
-                               mnemonic, rt, rn);
-       return ERROR_OK;
-
-immediate:
-       /* two indexed modes will write back rn */
-       if (opcode & (1 << 21)) {
-               if (opcode & (1 << 24)) /* pre-indexed */
-                       p2 = "]!";
-               else {                  /* post-indexed */
-                       p1 = "]";
-                       p2 = "";
-               }
-       }
-
-       imm <<= 2;
-       sprintf(cp, "%s\tr%u, r%u, [r%u%s, #%s%u%s\t; %#2.2x",
-                       mnemonic, rt, rd, rn, p1,
-                       (opcode & (1 << 23)) ? "" : "-",
-                       imm, p2, imm);
-       return ERROR_OK;
-
-literal:
-       address = thumb_alignpc4(address);
-       imm <<= 2;
-       if (opcode & (1 << 23))
-               address += imm;
-       else
-               address -= imm;
-       sprintf(cp, "%s\tr%u, r%u, %#8.8" PRIx32,
-                       mnemonic, rt, rd, address);
-       return ERROR_OK;
-}
-
-static int t2ev_data_shift(uint32_t opcode, uint32_t address,
-                          struct arm_instruction *instruction, char *cp)
-{
-       int op = (opcode >> 21) & 0xf;
-       int rd = (opcode >> 8) & 0xf;
-       int rn = (opcode >> 16) & 0xf;
-       int type = (opcode >> 4) & 0x3;
-       int immed = (opcode >> 6) & 0x3;
-       char *mnemonic;
-       char *suffix = "";
-
-       immed |= (opcode >> 10) & 0x1c;
-       if (opcode & (1 << 20))
-               suffix = "S";
-
-       switch (op) {
-               case 0:
-                       if (rd == 0xf) {
-                               if (!(opcode & (1 << 20)))
-                                       return ERROR_COMMAND_SYNTAX_ERROR;
-                               instruction->type = ARM_TST;
-                               mnemonic = "TST";
-                               suffix = "";
-                               goto two;
-                       }
-                       instruction->type = ARM_AND;
-                       mnemonic = "AND";
-                       break;
-               case 1:
-                       instruction->type = ARM_BIC;
-                       mnemonic = "BIC";
-                       break;
-               case 2:
-                       if (rn == 0xf) {
-                               instruction->type = ARM_MOV;
-                               switch (type) {
-                                       case 0:
-                                               if (immed == 0) {
-                                                       sprintf(cp, "MOV%s.W\tr%d, r%d",
-                                                                       suffix, rd,
-                                                                       (int) (opcode & 0xf));
-                                                       return ERROR_OK;
-                                               }
-                                               mnemonic = "LSL";
-                                               break;
-                                       case 1:
-                                               mnemonic = "LSR";
-                                               break;
-                                       case 2:
-                                               mnemonic = "ASR";
-                                               break;
-                                       default:
-                                               if (immed == 0) {
-                                                       sprintf(cp, "RRX%s\tr%d, r%d",
-                                                                       suffix, rd,
-                                                                       (int) (opcode & 0xf));
-                                                       return ERROR_OK;
-                                               }
-                                               mnemonic = "ROR";
-                                               break;
-                               }
-                               goto immediate;
-                       } else {
-                               instruction->type = ARM_ORR;
-                               mnemonic = "ORR";
-                       }
-                       break;
-               case 3:
-                       if (rn == 0xf) {
-                               instruction->type = ARM_MVN;
-                               mnemonic = "MVN";
-                               rn = rd;
-                               goto two;
-                       } else {
-                               /* instruction->type = ARM_ORN; */
-                               mnemonic = "ORN";
-                       }
-                       break;
-               case 4:
-                       if (rd == 0xf) {
-                               if (!(opcode & (1 << 20)))
-                                       return ERROR_COMMAND_SYNTAX_ERROR;
-                               instruction->type = ARM_TEQ;
-                               mnemonic = "TEQ";
-                               suffix = "";
-                               goto two;
-                       }
-                       instruction->type = ARM_EOR;
-                       mnemonic = "EOR";
-                       break;
-               case 8:
-                       if (rd == 0xf) {
-                               if (!(opcode & (1 << 20)))
-                                       return ERROR_COMMAND_SYNTAX_ERROR;
-                               instruction->type = ARM_CMN;
-                               mnemonic = "CMN";
-                               suffix = "";
-                               goto two;
-                       }
-                       instruction->type = ARM_ADD;
-                       mnemonic = "ADD";
-                       break;
-               case 0xa:
-                       instruction->type = ARM_ADC;
-                       mnemonic = "ADC";
-                       break;
-               case 0xb:
-                       instruction->type = ARM_SBC;
-                       mnemonic = "SBC";
-                       break;
-               case 0xd:
-                       if (rd == 0xf) {
-                               if (!(opcode & (1 << 21)))
-                                       return ERROR_COMMAND_SYNTAX_ERROR;
-                               instruction->type = ARM_CMP;
-                               mnemonic = "CMP";
-                               suffix = "";
-                               goto two;
-                       }
-                       instruction->type = ARM_SUB;
-                       mnemonic = "SUB";
-                       break;
-               case 0xe:
-                       instruction->type = ARM_RSB;
-                       mnemonic = "RSB";
-                       break;
-               default:
-                       return ERROR_COMMAND_SYNTAX_ERROR;
-       }
-
-       sprintf(cp, "%s%s.W\tr%d, r%d, r%d",
-                       mnemonic, suffix, rd, rn, (int) (opcode & 0xf));
-
-shift:
-       cp = strchr(cp, 0);
-
-       switch (type) {
-               case 0:
-                       if (immed == 0)
-                               return ERROR_OK;
-                       suffix = "LSL";
-                       break;
-               case 1:
-                       suffix = "LSR";
-                       if (immed == 32)
-                               immed = 0;
-                       break;
-               case 2:
-                       suffix = "ASR";
-                       if (immed == 32)
-                               immed = 0;
-                       break;
-               case 3:
-                       if (immed == 0) {
-                               strcpy(cp, ", RRX");
-                               return ERROR_OK;
-                       }
-                       suffix = "ROR";
-                       break;
-       }
-       sprintf(cp, ", %s #%d", suffix, immed ? immed : 32);
-       return ERROR_OK;
-
-two:
-       sprintf(cp, "%s%s.W\tr%d, r%d",
-                       mnemonic, suffix, rn, (int) (opcode & 0xf));
-       goto shift;
-
-immediate:
-       sprintf(cp, "%s%s.W\tr%d, r%d, #%d",
-                       mnemonic, suffix, rd,
-                       (int) (opcode & 0xf), immed ? immed : 32);
-       return ERROR_OK;
-}
-
-static int t2ev_data_reg(uint32_t opcode, uint32_t address,
-                        struct arm_instruction *instruction, char *cp)
-{
-       char *mnemonic;
-       char *suffix = "";
-
-       if (((opcode >> 4) & 0xf) == 0) {
-               switch ((opcode >> 21) & 0x7) {
-                       case 0:
-                               mnemonic = "LSL";
-                               break;
-                       case 1:
-                               mnemonic = "LSR";
-                               break;
-                       case 2:
-                               mnemonic = "ASR";
-                               break;
-                       case 3:
-                               mnemonic = "ROR";
-                               break;
-                       default:
-                               return ERROR_COMMAND_SYNTAX_ERROR;
-               }
-
-               instruction->type = ARM_MOV;
-               if (opcode & (1 << 20))
-                       suffix = "S";
-               sprintf(cp, "%s%s.W\tr%d, r%d, r%d",
-                               mnemonic, suffix,
-                               (int) (opcode >> 8) & 0xf,
-                               (int) (opcode >> 16) & 0xf,
-                               (int) (opcode >> 0) & 0xf);
-
-       } else if (opcode & (1 << 7)) {
-               switch ((opcode >> 20) & 0xf) {
-                       case 0:
-                       case 1:
-                       case 4:
-                       case 5:
-                               switch ((opcode >> 4) & 0x3) {
-                                       case 1:
-                                               suffix = ", ROR #8";
-                                               break;
-                                       case 2:
-                                               suffix = ", ROR #16";
-                                               break;
-                                       case 3:
-                                               suffix = ", ROR #24";
-                                               break;
-                               }
-                               sprintf(cp, "%cXT%c.W\tr%d, r%d%s",
-                                       (opcode & (1 << 24)) ? 'U' : 'S',
-                                       (opcode & (1 << 26)) ? 'B' : 'H',
-                                       (int) (opcode >> 8) & 0xf,
-                                       (int) (opcode >> 0) & 0xf,
-                                       suffix);
-                               break;
-                       case 8:
-                       case 9:
-                       case 0xa:
-                       case 0xb:
-                               if (opcode & (1 << 6))
-                                       return ERROR_COMMAND_SYNTAX_ERROR;
-                               if (((opcode >> 12) & 0xf) != 0xf)
-                                       return ERROR_COMMAND_SYNTAX_ERROR;
-                               if (!(opcode & (1 << 20)))
-                                       return ERROR_COMMAND_SYNTAX_ERROR;
-
-                               switch (((opcode >> 19) & 0x04)
-                                       | ((opcode >> 4) & 0x3)) {
-                                       case 0:
-                                               mnemonic = "REV.W";
-                                               break;
-                                       case 1:
-                                               mnemonic = "REV16.W";
-                                               break;
-                                       case 2:
-                                               mnemonic = "RBIT";
-                                               break;
-                                       case 3:
-                                               mnemonic = "REVSH.W";
-                                               break;
-                                       case 4:
-                                               mnemonic = "CLZ";
-                                               break;
-                                       default:
-                                               return ERROR_COMMAND_SYNTAX_ERROR;
-                               }
-                               sprintf(cp, "%s\tr%d, r%d",
-                                       mnemonic,
-                                       (int) (opcode >> 8) & 0xf,
-                                       (int) (opcode >> 0) & 0xf);
-                               break;
-                       default:
-                               return ERROR_COMMAND_SYNTAX_ERROR;
-               }
-       }
-
-       return ERROR_OK;
-}
-
-static int t2ev_load_word(uint32_t opcode, uint32_t address,
-                         struct arm_instruction *instruction, char *cp)
-{
-       int rn = (opcode >> 16) & 0xf;
-       int immed;
-
-       instruction->type = ARM_LDR;
-
-       if (rn == 0xf) {
-               immed = opcode & 0x0fff;
-               if ((opcode & (1 << 23)) == 0)
-                       immed = -immed;
-               sprintf(cp, "LDR\tr%d, %#8.8" PRIx32,
-                               (int) (opcode >> 12) & 0xf,
-                               thumb_alignpc4(address) + immed);
-               return ERROR_OK;
-       }
-
-       if (opcode & (1 << 23)) {
-               immed = opcode & 0x0fff;
-               sprintf(cp, "LDR.W\tr%d, [r%d, #%d]\t; %#3.3x",
-                               (int) (opcode >> 12) & 0xf,
-                               rn, immed, immed);
-               return ERROR_OK;
-       }
-
-       if (!(opcode & (0x3f << 6))) {
-               sprintf(cp, "LDR.W\tr%d, [r%d, r%d, LSL #%d]",
-                               (int) (opcode >> 12) & 0xf,
-                               rn,
-                               (int) (opcode >> 0) & 0xf,
-                               (int) (opcode >> 4) & 0x3);
-               return ERROR_OK;
-       }
-
-
-       if (((opcode >> 8) & 0xf) == 0xe) {
-               immed = opcode & 0x00ff;
-
-               sprintf(cp, "LDRT\tr%d, [r%d, #%d]\t; %#2.2x",
-                               (int) (opcode >> 12) & 0xf,
-                               rn, immed, immed);
-               return ERROR_OK;
-       }
-
-       if (((opcode >> 8) & 0xf) == 0xc || (opcode & 0x0900) == 0x0900) {
-               char *p1 = "]", *p2 = "";
-
-               if (!(opcode & 0x0500))
-                       return ERROR_COMMAND_SYNTAX_ERROR;
-
-               immed = opcode & 0x00ff;
-
-               /* two indexed modes will write back rn */
-               if (opcode & 0x100) {
-                       if (opcode & 0x400)     /* pre-indexed */
-                               p2 = "]!";
-                       else {                  /* post-indexed */
-                               p1 = "]";
-                               p2 = "";
-                       }
-               }
-
-               sprintf(cp, "LDR\tr%d, [r%d%s, #%s%u%s\t; %#2.2x",
-                               (int) (opcode >> 12) & 0xf,
-                               rn, p1,
-                               (opcode & 0x200) ? "" : "-",
-                               immed, p2, immed);
-               return ERROR_OK;
-       }
-
-       return ERROR_COMMAND_SYNTAX_ERROR;
-}
-
-static int t2ev_load_byte_hints(uint32_t opcode, uint32_t address,
-                               struct arm_instruction *instruction, char *cp)
-{
-       int rn = (opcode >> 16) & 0xf;
-       int rt = (opcode >> 12) & 0xf;
-       int op2 = (opcode >> 6) & 0x3f;
-       unsigned immed;
-       char *p1 = "", *p2 = "]";
-       char *mnemonic;
-
-       switch ((opcode >> 23) & 0x3) {
-               case 0:
-                       if ((rn & rt) == 0xf) {
-pld_literal:
-                               immed = opcode & 0xfff;
-                               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) {
-ldrb_literal:
-                               immed = opcode & 0xfff;
-                               address = thumb_alignpc4(address);
-                               if (opcode & (1 << 23))
-                                       address += immed;
-                               else
-                                       address -= immed;
-                               sprintf(cp, "LDRB\tr%d, %#8.8" PRIx32,
-                                               rt, address);
-                               return ERROR_OK;
-                       }
-                       if (rn == 0x0f)
-                               break;
-                       if ((op2 & 0x3c) == 0x38) {
-                               immed = opcode & 0xff;
-                               sprintf(cp, "LDRBT\tr%d, [r%d, #%d]\t; %#2.2x",
-                                               rt, rn, immed, immed);
-                               return ERROR_OK;
-                       }
-                       if ((op2 & 0x3c) == 0x30) {
-                               if (rt == 0x0f) {
-                                       immed = opcode & 0xff;
-                                       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))
-                                       immed = -immed;
-
-                               /* two indexed modes will write back rn */
-                               if (opcode & 0x100) {
-                                       if (opcode & 0x400)     /* pre-indexed */
-                                               p2 = "]!";
-                                       else {          /* post-indexed */
-                                               p1 = "]";
-                                               p2 = "";
-                                       }
-                               }
-ldrxb_immediate_t2:
-                               sprintf(cp, "%s\tr%d, [r%d%s, #%d%s\t; %#8.8x",
-                                               mnemonic, rt, rn, p1,
-                                               immed, p2, immed);
-                               return ERROR_OK;
-                       }
-                       if ((op2 & 0x24) == 0x24) {
-                               mnemonic = "LDRB";
-                               goto ldrxb_immediate_t3;
-                       }
-                       if (op2 == 0) {
-                               int rm = opcode & 0xf;
-
-                               if (rt == 0x0f)
-                                       sprintf(cp, "PLD\t");
-                               else
-                                       sprintf(cp, "LDRB.W\tr%d, ", rt);
-                               immed = (opcode >> 4) & 0x3;
-                               cp = strchr(cp, 0);
-                               sprintf(cp, "[r%d, r%d, LSL #%d]", rn, rm, immed);
-                               return ERROR_OK;
-                       }
-                       break;
-               case 1:
-                       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";
-                       immed = opcode & 0xfff;
-                       goto ldrxb_immediate_t2;
-               case 2:
-                       if ((rn & rt) == 0xf) {
-                               immed = opcode & 0xfff;
-                               address = thumb_alignpc4(address);
-                               if (opcode & (1 << 23))
-                                       address += immed;
-                               else
-                                       address -= immed;
-                               sprintf(cp, "PLI\t%#8.8" PRIx32, address);
-                               return ERROR_OK;
-                       }
-                       if (rn == 0xf && rt != 0xf) {
-ldrsb_literal:
-                               immed = opcode & 0xfff;
-                               address = thumb_alignpc4(address);
-                               if (opcode & (1 << 23))
-                                       address += immed;
-                               else
-                                       address -= immed;
-                               sprintf(cp, "LDRSB\t%#8.8" PRIx32, address);
-                               return ERROR_OK;
-                       }
-                       if (rn == 0xf)
-                               break;
-                       if ((op2 & 0x3c) == 0x38) {
-                               immed = opcode & 0xff;
-                               sprintf(cp, "LDRSBT\tr%d, [r%d, #%d]\t; %#2.2x",
-                                               rt, rn, immed, immed);
-                               return ERROR_OK;
-                       }
-                       if ((op2 & 0x3c) == 0x30) {
-                               if (rt == 0xf) {
-                                       immed = opcode & 0xff;
-                                       immed = -immed; /* pli */
-                                       sprintf(cp, "PLI\t[r%d, #%d]\t; -%#2.2x",
-                                                       rn, immed, -immed);
-                                       return ERROR_OK;
-                               }
-                               mnemonic = "LDRSB";
-                               goto ldrxb_immediate_t3;
-                       }
-                       if ((op2 & 0x24) == 0x24) {
-                               mnemonic = "LDRSB";
-                               goto ldrxb_immediate_t3;
-                       }
-                       if (op2 == 0) {
-                               int rm = opcode & 0xf;
-
-                               if (rt == 0x0f)
-                                       sprintf(cp, "PLI\t");
-                               else
-                                       sprintf(cp, "LDRSB.W\tr%d, ", rt);
-                               immed = (opcode >> 4) & 0x3;
-                               cp = strchr(cp, 0);
-                               sprintf(cp, "[r%d, r%d, LSL #%d]", rn, rm, immed);
-                               return ERROR_OK;
-                       }
-                       break;
-               case 3:
-                       if (rt == 0xf) {
-                               immed = opcode & 0xfff;
-                               sprintf(cp, "PLI\t[r%d, #%d]\t; %#3.3x",
-                                               rn, immed, immed);
-                               return ERROR_OK;
-                       }
-                       if (rn == 0xf)
-                               goto ldrsb_literal;
-                       immed = opcode & 0xfff;
-                       mnemonic = "LDRSB";
-                       goto ldrxb_immediate_t2;
-       }
-
-       return ERROR_COMMAND_SYNTAX_ERROR;
-}
-
-static int t2ev_load_halfword(uint32_t opcode, uint32_t address,
-                             struct arm_instruction *instruction, char *cp)
-{
-       int rn = (opcode >> 16) & 0xf;
-       int rt = (opcode >> 12) & 0xf;
-       int op2 = (opcode >> 6) & 0x3f;
-       char *sign = "";
-       unsigned immed;
-
-       if (rt == 0xf) {
-               sprintf(cp, "HINT (UNALLOCATED)");
-               return ERROR_OK;
-       }
-
-       if (opcode & (1 << 24))
-               sign = "S";
-
-       if ((opcode & (1 << 23)) == 0) {
-               if (rn == 0xf) {
-ldrh_literal:
-                       immed = opcode & 0xfff;
-                       address = thumb_alignpc4(address);
-                       if (opcode & (1 << 23))
-                               address += immed;
-                       else
-                               address -= immed;
-                       sprintf(cp, "LDR%sH\tr%d, %#8.8" PRIx32,
-                                       sign, rt, address);
-                       return ERROR_OK;
-               }
-               if (op2 == 0) {
-                       int rm = opcode & 0xf;
-
-                       immed = (opcode >> 4) & 0x3;
-                       sprintf(cp, "LDR%sH.W\tr%d, [r%d, r%d, LSL #%d]",
-                                       sign, rt, rn, rm, immed);
-                       return ERROR_OK;
-               }
-               if ((op2 & 0x3c) == 0x38) {
-                       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 = "]";
-
-                       immed = opcode & 0xff;
-                       if (!(opcode & 0x200))
-                               immed = -immed;
-
-                       /* two indexed modes will write back rn */
-                       if (opcode & 0x100) {
-                               if (opcode & 0x400)     /* pre-indexed */
-                                       p2 = "]!";
-                               else {                  /* post-indexed */
-                                       p1 = "]";
-                                       p2 = "";
-                               }
-                       }
-                       sprintf(cp, "LDR%sH\tr%d, [r%d%s, #%d%s\t; %#8.8x",
-                                       sign, rt, rn, p1, immed, p2, immed);
-                       return ERROR_OK;
-               }
-       } else {
-               if (rn == 0xf)
-                       goto ldrh_literal;
-
-               immed = opcode & 0xfff;
-               sprintf(cp, "LDR%sH%s\tr%d, [r%d, #%d]\t; %#6.6x",
-                               sign, *sign ? "" : ".W",
-                               rt, rn, immed, immed);
-               return ERROR_OK;
-       }
-
-       return ERROR_COMMAND_SYNTAX_ERROR;
-}
-
-/*
- * REVISIT for Thumb2 instructions, instruction->type and friends aren't
- * always set.  That means eventual arm_simulate_step() support for Thumb2
- * will need work in this area.
- */
-int thumb2_opcode(struct target *target, uint32_t address, struct arm_instruction *instruction)
-{
-       int retval;
-       uint16_t op;
-       uint32_t opcode;
-       char *cp;
-
-       /* clear low bit ... it's set on function pointers */
-       address &= ~1;
-
-       /* clear fields, to avoid confusion */
-       memset(instruction, 0, sizeof(struct arm_instruction));
-
-       /* read first halfword, see if this is the only one */
-       retval = target_read_u16(target, address, &op);
-       if (retval != ERROR_OK)
-               return retval;
-
-       switch (op & 0xf800) {
-               case 0xf800:
-               case 0xf000:
-               case 0xe800:
-                       /* 32-bit instructions */
-                       instruction->instruction_size = 4;
-                       opcode = op << 16;
-                       retval = target_read_u16(target, address + 2, &op);
-                       if (retval != ERROR_OK)
-                               return retval;
-                       opcode |= op;
-                       instruction->opcode = opcode;
-                       break;
-               default:
-                       /* 16-bit:  Thumb1 + IT + CBZ/CBNZ + ... */
-                       return thumb_evaluate_opcode(op, address, instruction);
-       }
-
-       snprintf(instruction->text, 128,
-                       "0x%8.8" PRIx32 "  0x%8.8" PRIx32 "\t",
-                       address, opcode);
-       cp = strchr(instruction->text, 0);
-       retval = ERROR_FAIL;
-
-       /* ARMv7-M: A5.3.1 Data processing (modified immediate) */
-       if ((opcode & 0x1a008000) == 0x10000000)
-               retval = t2ev_data_mod_immed(opcode, address, instruction, cp);
-
-       /* ARMv7-M: A5.3.3 Data processing (plain binary immediate) */
-       else if ((opcode & 0x1a008000) == 0x12000000)
-               retval = t2ev_data_immed(opcode, address, instruction, cp);
-
-       /* ARMv7-M: A5.3.4 Branches and miscellaneous control */
-       else if ((opcode & 0x18008000) == 0x10008000)
-               retval = t2ev_b_misc(opcode, address, instruction, cp);
-
-       /* ARMv7-M: A5.3.5 Load/store multiple */
-       else if ((opcode & 0x1e400000) == 0x08000000)
-               retval = t2ev_ldm_stm(opcode, address, instruction, cp);
-
-       /* ARMv7-M: A5.3.6 Load/store dual or exclusive, table branch */
-       else if ((opcode & 0x1e400000) == 0x08400000)
-               retval = t2ev_ldrex_strex(opcode, address, instruction, cp);
-
-       /* ARMv7-M: A5.3.7 Load word */
-       else if ((opcode & 0x1f700000) == 0x18500000)
-               retval = t2ev_load_word(opcode, address, instruction, cp);
-
-       /* ARMv7-M: A5.3.8 Load halfword, unallocated memory hints */
-       else if ((opcode & 0x1e700000) == 0x18300000)
-               retval = t2ev_load_halfword(opcode, address, instruction, cp);
-
-       /* ARMv7-M: A5.3.9 Load byte, memory hints */
-       else if ((opcode & 0x1e700000) == 0x18100000)
-               retval = t2ev_load_byte_hints(opcode, address, instruction, cp);
-
-       /* ARMv7-M: A5.3.10 Store single data item */
-       else if ((opcode & 0x1f100000) == 0x18000000)
-               retval = t2ev_store_single(opcode, address, instruction, cp);
-
-       /* ARMv7-M: A5.3.11 Data processing (shifted register) */
-       else if ((opcode & 0x1e000000) == 0x0a000000)
-               retval = t2ev_data_shift(opcode, address, instruction, cp);
-
-       /* ARMv7-M: A5.3.12 Data processing (register)
-        * and A5.3.13 Miscellaneous operations
-        */
-       else if ((opcode & 0x1f000000) == 0x1a000000)
-               retval = t2ev_data_reg(opcode, address, instruction, cp);
-
-       /* ARMv7-M: A5.3.14 Multiply, and multiply accumulate */
-       else if ((opcode & 0x1f800000) == 0x1b000000)
-               retval = t2ev_mul32(opcode, address, instruction, cp);
-
-       /* ARMv7-M: A5.3.15 Long multiply, long multiply accumulate, divide */
-       else if ((opcode & 0x1f800000) == 0x1b800000)
-               retval = t2ev_mul64_div(opcode, address, instruction, cp);
-
-       if (retval == ERROR_OK)
-               return retval;
-
-       /*
-        * Thumb2 also supports coprocessor, ThumbEE, and DSP/Media (SIMD)
-        * instructions; not yet handled here.
-        */
-
-       if (retval == ERROR_COMMAND_SYNTAX_ERROR) {
-               instruction->type = ARM_UNDEFINED_INSTRUCTION;
-               strcpy(cp, "UNDEFINED OPCODE");
-               return ERROR_OK;
-       }
-
-       LOG_DEBUG("Can't decode 32-bit Thumb2 yet (opcode=%08" PRIx32 ")",
-                       opcode);
-
-       strcpy(cp, "(32-bit Thumb2 ...)");
-       return ERROR_OK;
-}
-
-int arm_access_size(struct arm_instruction *instruction)
-{
-       if ((instruction->type == ARM_LDRB)
-           || (instruction->type == ARM_LDRBT)
-           || (instruction->type == ARM_LDRSB)
-           || (instruction->type == ARM_STRB)
-           || (instruction->type == ARM_STRBT))
-               return 1;
-       else if ((instruction->type == ARM_LDRH)
-                || (instruction->type == ARM_LDRSH)
-                || (instruction->type == ARM_STRH))
-               return 2;
-       else if ((instruction->type == ARM_LDR)
-                || (instruction->type == ARM_LDRT)
-                || (instruction->type == ARM_STR)
-                || (instruction->type == ARM_STRT))
-               return 4;
-       else if ((instruction->type == ARM_LDRD)
-                || (instruction->type == ARM_STRD))
-               return 8;
-       else {
-               LOG_ERROR("BUG: instruction type %i isn't a load/store instruction",
-                               instruction->type);
-               return 0;
-       }
-}
+#endif /* HAVE_CAPSTONE */

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)