Move lowercase conversion to output_util.c
This commit is contained in:
Tadashi G. Takaoka
parent
5b9bdbc2aa
commit
5549f35977
214
util/dis.c
214
util/dis.c
|
|
@ -24,7 +24,6 @@
|
|||
|
||||
#include "dis.h"
|
||||
#include "util.h"
|
||||
#include "opdb.h"
|
||||
|
||||
#define ALL_ONES 0xfffff
|
||||
#define EXTENSION_BIT 0x20000
|
||||
|
|
@ -846,128 +845,127 @@ int dis_decode(const uint8_t *code, address_t offset, address_t len,
|
|||
|
||||
static const struct {
|
||||
msp430_op_t op;
|
||||
const char *const mnemonic;
|
||||
const char *const lowercase;
|
||||
const char *mnemonic;
|
||||
} opcode_names[] = {
|
||||
/* Single operand */
|
||||
{MSP430_OP_RRC, "RRC", "rrc"},
|
||||
{MSP430_OP_SWPB, "SWPB", "swpb"},
|
||||
{MSP430_OP_RRA, "RRA", "rra"},
|
||||
{MSP430_OP_SXT, "SXT", "sxt"},
|
||||
{MSP430_OP_PUSH, "PUSH", "push"},
|
||||
{MSP430_OP_CALL, "CALL", "call"},
|
||||
{MSP430_OP_RETI, "RETI", "reti"},
|
||||
{MSP430_OP_RRC, "RRC"},
|
||||
{MSP430_OP_SWPB, "SWPB"},
|
||||
{MSP430_OP_RRA, "RRA"},
|
||||
{MSP430_OP_SXT, "SXT"},
|
||||
{MSP430_OP_PUSH, "PUSH"},
|
||||
{MSP430_OP_CALL, "CALL"},
|
||||
{MSP430_OP_RETI, "RETI"},
|
||||
|
||||
/* Jump */
|
||||
{MSP430_OP_JNZ, "JNZ", "jnz"},
|
||||
{MSP430_OP_JZ, "JZ", "jz"},
|
||||
{MSP430_OP_JNC, "JNC", "jnc"},
|
||||
{MSP430_OP_JC, "JC", "jc"},
|
||||
{MSP430_OP_JN, "JN", "jn"},
|
||||
{MSP430_OP_JL, "JL", "jl"},
|
||||
{MSP430_OP_JGE, "JGE", "jge"},
|
||||
{MSP430_OP_JMP, "JMP", "jmp"},
|
||||
{MSP430_OP_JNZ, "JNZ"},
|
||||
{MSP430_OP_JZ, "JZ"},
|
||||
{MSP430_OP_JNC, "JNC"},
|
||||
{MSP430_OP_JC, "JC"},
|
||||
{MSP430_OP_JN, "JN"},
|
||||
{MSP430_OP_JL, "JL"},
|
||||
{MSP430_OP_JGE, "JGE"},
|
||||
{MSP430_OP_JMP, "JMP"},
|
||||
|
||||
/* Double operand */
|
||||
{MSP430_OP_MOV, "MOV", "mov"},
|
||||
{MSP430_OP_ADD, "ADD", "add"},
|
||||
{MSP430_OP_ADDC, "ADDC", "addc"},
|
||||
{MSP430_OP_SUBC, "SUBC", "subc"},
|
||||
{MSP430_OP_SUB, "SUB", "sub"},
|
||||
{MSP430_OP_CMP, "CMP", "cmp"},
|
||||
{MSP430_OP_DADD, "DADD", "dadd"},
|
||||
{MSP430_OP_BIT, "BIT", "bit"},
|
||||
{MSP430_OP_BIC, "BIC", "bic"},
|
||||
{MSP430_OP_BIS, "BIS", "bis"},
|
||||
{MSP430_OP_XOR, "XOR", "xor"},
|
||||
{MSP430_OP_AND, "AND", "and"},
|
||||
{MSP430_OP_MOV, "MOV"},
|
||||
{MSP430_OP_ADD, "ADD"},
|
||||
{MSP430_OP_ADDC, "ADDC"},
|
||||
{MSP430_OP_SUBC, "SUBC"},
|
||||
{MSP430_OP_SUB, "SUB"},
|
||||
{MSP430_OP_CMP, "CMP"},
|
||||
{MSP430_OP_DADD, "DADD"},
|
||||
{MSP430_OP_BIT, "BIT"},
|
||||
{MSP430_OP_BIC, "BIC"},
|
||||
{MSP430_OP_BIS, "BIS"},
|
||||
{MSP430_OP_XOR, "XOR"},
|
||||
{MSP430_OP_AND, "AND"},
|
||||
|
||||
/* Emulated instructions */
|
||||
{MSP430_OP_ADC, "ADC", "adc"},
|
||||
{MSP430_OP_BR, "BR", "br"},
|
||||
{MSP430_OP_CLR, "CLR", "clr"},
|
||||
{MSP430_OP_CLRC, "CLRC", "clrc"},
|
||||
{MSP430_OP_CLRN, "CLRN", "clrn"},
|
||||
{MSP430_OP_CLRZ, "CLRZ", "clrz"},
|
||||
{MSP430_OP_DADC, "DADC", "dadc"},
|
||||
{MSP430_OP_DEC, "DEC", "dec"},
|
||||
{MSP430_OP_DECD, "DECD", "decd"},
|
||||
{MSP430_OP_DINT, "DINT", "dint"},
|
||||
{MSP430_OP_EINT, "EINT", "eint"},
|
||||
{MSP430_OP_INC, "INC", "inc"},
|
||||
{MSP430_OP_INCD, "INCD", "incd"},
|
||||
{MSP430_OP_INV, "INV", "inv"},
|
||||
{MSP430_OP_NOP, "NOP", "nop"},
|
||||
{MSP430_OP_POP, "POP", "pop"},
|
||||
{MSP430_OP_RET, "RET", "ret"},
|
||||
{MSP430_OP_RLA, "RLA", "rla"},
|
||||
{MSP430_OP_RLC, "RLC", "rlc"},
|
||||
{MSP430_OP_SBC, "SBC", "sbc"},
|
||||
{MSP430_OP_SETC, "SETC", "setc"},
|
||||
{MSP430_OP_SETN, "SETN", "setn"},
|
||||
{MSP430_OP_SETZ, "SETZ", "setz"},
|
||||
{MSP430_OP_TST, "TST", "tst"},
|
||||
{MSP430_OP_ADC, "ADC"},
|
||||
{MSP430_OP_BR, "BR"},
|
||||
{MSP430_OP_CLR, "CLR"},
|
||||
{MSP430_OP_CLRC, "CLRC"},
|
||||
{MSP430_OP_CLRN, "CLRN"},
|
||||
{MSP430_OP_CLRZ, "CLRZ"},
|
||||
{MSP430_OP_DADC, "DADC"},
|
||||
{MSP430_OP_DEC, "DEC"},
|
||||
{MSP430_OP_DECD, "DECD"},
|
||||
{MSP430_OP_DINT, "DINT"},
|
||||
{MSP430_OP_EINT, "EINT"},
|
||||
{MSP430_OP_INC, "INC"},
|
||||
{MSP430_OP_INCD, "INCD"},
|
||||
{MSP430_OP_INV, "INV"},
|
||||
{MSP430_OP_NOP, "NOP"},
|
||||
{MSP430_OP_POP, "POP"},
|
||||
{MSP430_OP_RET, "RET"},
|
||||
{MSP430_OP_RLA, "RLA"},
|
||||
{MSP430_OP_RLC, "RLC"},
|
||||
{MSP430_OP_SBC, "SBC"},
|
||||
{MSP430_OP_SETC, "SETC"},
|
||||
{MSP430_OP_SETN, "SETN"},
|
||||
{MSP430_OP_SETZ, "SETZ"},
|
||||
{MSP430_OP_TST, "TST"},
|
||||
|
||||
/* MSP430X double operand (extension word) */
|
||||
{MSP430_OP_MOVX, "MOVX", "movx"},
|
||||
{MSP430_OP_ADDX, "ADDX", "addx"},
|
||||
{MSP430_OP_ADDCX, "ADDCX", "addcx"},
|
||||
{MSP430_OP_SUBCX, "SUBCX", "subcx"},
|
||||
{MSP430_OP_SUBX, "SUBX", "subx"},
|
||||
{MSP430_OP_CMPX, "CMPX", "cmpx"},
|
||||
{MSP430_OP_DADDX, "DADDX", "daddx"},
|
||||
{MSP430_OP_BITX, "BITX", "bitx"},
|
||||
{MSP430_OP_BICX, "BICX", "bicx"},
|
||||
{MSP430_OP_BISX, "BISX", "bisx"},
|
||||
{MSP430_OP_XORX, "XORX", "xorx"},
|
||||
{MSP430_OP_ANDX, "ANDX", "andx"},
|
||||
{MSP430_OP_MOVX, "MOVX"},
|
||||
{MSP430_OP_ADDX, "ADDX"},
|
||||
{MSP430_OP_ADDCX, "ADDCX"},
|
||||
{MSP430_OP_SUBCX, "SUBCX"},
|
||||
{MSP430_OP_SUBX, "SUBX"},
|
||||
{MSP430_OP_CMPX, "CMPX"},
|
||||
{MSP430_OP_DADDX, "DADDX"},
|
||||
{MSP430_OP_BITX, "BITX"},
|
||||
{MSP430_OP_BICX, "BICX"},
|
||||
{MSP430_OP_BISX, "BISX"},
|
||||
{MSP430_OP_XORX, "XORX"},
|
||||
{MSP430_OP_ANDX, "ANDX"},
|
||||
|
||||
/* MSP430X single operand (extension word) */
|
||||
{MSP430_OP_RRCX, "RRCX", "rrcx"},
|
||||
{MSP430_OP_RRUX, "RRUX", "rrux"},
|
||||
{MSP430_OP_SWPBX, "SWPBX", "swpbx"},
|
||||
{MSP430_OP_RRAX, "RRAX", "rrax"},
|
||||
{MSP430_OP_SXTX, "SXTX", "sxtx"},
|
||||
{MSP430_OP_PUSHX, "PUSHX", "pushx"},
|
||||
{MSP430_OP_RRCX, "RRCX"},
|
||||
{MSP430_OP_RRUX, "RRUX"},
|
||||
{MSP430_OP_SWPBX, "SWPBX"},
|
||||
{MSP430_OP_RRAX, "RRAX"},
|
||||
{MSP430_OP_SXTX, "SXTX"},
|
||||
{MSP430_OP_PUSHX, "PUSHX"},
|
||||
|
||||
/* MSP430X group 13xx */
|
||||
{MSP430_OP_CALLA, "CALLA", "calla"},
|
||||
{MSP430_OP_CALLA, "CALLA"},
|
||||
|
||||
/* MSP430X group 14xx */
|
||||
{MSP430_OP_PUSHM, "PUSHM", "pushm"},
|
||||
{MSP430_OP_POPM, "POPM", "popm"},
|
||||
{MSP430_OP_PUSHM, "PUSHM"},
|
||||
{MSP430_OP_POPM, "POPM"},
|
||||
|
||||
/* MSP430X address instructions */
|
||||
{MSP430_OP_MOVA, "MOVA", "mova"},
|
||||
{MSP430_OP_CMPA, "CMPA", "cmpa"},
|
||||
{MSP430_OP_SUBA, "SUBA", "suba"},
|
||||
{MSP430_OP_ADDA, "ADDA", "adda"},
|
||||
{MSP430_OP_MOVA, "MOVA"},
|
||||
{MSP430_OP_CMPA, "CMPA"},
|
||||
{MSP430_OP_SUBA, "SUBA"},
|
||||
{MSP430_OP_ADDA, "ADDA"},
|
||||
|
||||
/* MSP430X group 00xx, non-address */
|
||||
{MSP430_OP_RRCM, "RRCM", "rrcm"},
|
||||
{MSP430_OP_RRAM, "RRAM", "rram"},
|
||||
{MSP430_OP_RLAM, "RLAM", "rlam"},
|
||||
{MSP430_OP_RRUM, "RRUM", "rrum"},
|
||||
{MSP430_OP_RRCM, "RRCM"},
|
||||
{MSP430_OP_RRAM, "RRAM"},
|
||||
{MSP430_OP_RLAM, "RLAM"},
|
||||
{MSP430_OP_RRUM, "RRUM"},
|
||||
|
||||
/* MSP430X emulated instructions */
|
||||
{MSP430_OP_ADCX, "ADCX", "adcx"},
|
||||
{MSP430_OP_BRA, "BRA", "bra"},
|
||||
{MSP430_OP_RETA, "RETA", "reta"},
|
||||
{MSP430_OP_CLRX, "CLRX", "clrx"},
|
||||
{MSP430_OP_DADCX, "DADCX", "dadcx"},
|
||||
{MSP430_OP_DECX, "DECX", "decx"},
|
||||
{MSP430_OP_DECDA, "DECDA", "decda"},
|
||||
{MSP430_OP_DECDX, "DECDX", "decdx"},
|
||||
{MSP430_OP_INCX, "INCX", "incx"},
|
||||
{MSP430_OP_INCDA, "INCDA", "incda"},
|
||||
{MSP430_OP_INVX, "INVX", "invx"},
|
||||
{MSP430_OP_RLAX, "RLAX", "rlax"},
|
||||
{MSP430_OP_RLCX, "RLCX", "rlcx"},
|
||||
{MSP430_OP_SECX, "SECX", "secx"},
|
||||
{MSP430_OP_TSTA, "TSTA", "tsta"},
|
||||
{MSP430_OP_TSTX, "TSTX", "tstx"},
|
||||
{MSP430_OP_POPX, "POPX", "popx"},
|
||||
{MSP430_OP_INCDX, "INCDX", "incdx"}
|
||||
{MSP430_OP_ADCX, "ADCX"},
|
||||
{MSP430_OP_BRA, "BRA"},
|
||||
{MSP430_OP_RETA, "RETA"},
|
||||
{MSP430_OP_CLRX, "CLRX"},
|
||||
{MSP430_OP_DADCX, "DADCX"},
|
||||
{MSP430_OP_DECX, "DECX"},
|
||||
{MSP430_OP_DECDA, "DECDA"},
|
||||
{MSP430_OP_DECDX, "DECDX"},
|
||||
{MSP430_OP_INCX, "INCX"},
|
||||
{MSP430_OP_INCDA, "INCDA"},
|
||||
{MSP430_OP_INVX, "INVX"},
|
||||
{MSP430_OP_RLAX, "RLAX"},
|
||||
{MSP430_OP_RLCX, "RLCX"},
|
||||
{MSP430_OP_SECX, "SECX"},
|
||||
{MSP430_OP_TSTA, "TSTA"},
|
||||
{MSP430_OP_TSTX, "TSTX"},
|
||||
{MSP430_OP_POPX, "POPX"},
|
||||
{MSP430_OP_INCDX, "INCDX"}
|
||||
};
|
||||
|
||||
/* Return the mnemonic for an operation, if possible. */
|
||||
|
|
@ -977,9 +975,7 @@ const char *dis_opcode_name(msp430_op_t op)
|
|||
|
||||
for (i = 0; i < ARRAY_LEN(opcode_names); i++)
|
||||
if (op == opcode_names[i].op)
|
||||
return opdb_get_boolean("lowercase_dis")
|
||||
? opcode_names[i].lowercase
|
||||
: opcode_names[i].mnemonic;
|
||||
return opcode_names[i].mnemonic;
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
|
@ -1001,12 +997,6 @@ static const char *const msp430_reg_names[] = {
|
|||
"R8", "R9", "R10", "R11",
|
||||
"R12", "R13", "R14", "R15"
|
||||
};
|
||||
static const char *const msp430_reg_lowercases[] = {
|
||||
"pc", "sp", "sr", "r3",
|
||||
"r4", "r5", "r6", "r7",
|
||||
"r8", "r9", "r10", "r11",
|
||||
"r12", "r13", "r14", "r15"
|
||||
};
|
||||
|
||||
int dis_reg_from_name(const char *name)
|
||||
{
|
||||
|
|
@ -1036,9 +1026,7 @@ int dis_reg_from_name(const char *name)
|
|||
const char *dis_reg_name(msp430_reg_t reg)
|
||||
{
|
||||
if (reg <= 15)
|
||||
return opdb_get_boolean("lowercase_dis")
|
||||
? msp430_reg_lowercases[reg]
|
||||
: msp430_reg_names[reg];
|
||||
return msp430_reg_names[reg];
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@
|
|||
#include <assert.h>
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#include <ctype.h>
|
||||
|
||||
#include "dis.h"
|
||||
#include "output_util.h"
|
||||
|
|
@ -28,6 +29,67 @@
|
|||
#include "demangle.h"
|
||||
#include "opdb.h"
|
||||
|
||||
static char* copy_string(int lowercase_dis, char *dst, const char *const end,
|
||||
const char *src)
|
||||
{
|
||||
int c;
|
||||
|
||||
if (src != NULL) {
|
||||
while (dst < end && (c = *src++) != '\0') {
|
||||
if (lowercase_dis && isupper(c))
|
||||
c = tolower(c);
|
||||
*dst++ = c;
|
||||
}
|
||||
}
|
||||
*dst = '\0';
|
||||
return dst;
|
||||
}
|
||||
|
||||
static const char *opcode_name_with_size(const struct msp430_instruction *insn)
|
||||
{
|
||||
static char buf[10];
|
||||
const char *const end = buf + sizeof(buf) - 1;
|
||||
const char *opname = dis_opcode_name(insn->op);
|
||||
const int lowercase_dis = opdb_get_boolean("lowercase_dis");
|
||||
const char *suffix = NULL;
|
||||
char *dst;
|
||||
|
||||
if (!opname)
|
||||
opname = "???";
|
||||
|
||||
if (insn->dsize == MSP430_DSIZE_BYTE)
|
||||
suffix = ".B";
|
||||
else if (insn->dsize == MSP430_DSIZE_AWORD)
|
||||
suffix = ".A";
|
||||
else if (insn->dsize == MSP430_DSIZE_UNKNOWN)
|
||||
suffix = ".?";
|
||||
|
||||
/* Don't show the .A suffix for these instructions */
|
||||
if (insn->op == MSP430_OP_MOVA || insn->op == MSP430_OP_CMPA ||
|
||||
insn->op == MSP430_OP_SUBA || insn->op == MSP430_OP_ADDA ||
|
||||
insn->op == MSP430_OP_BRA || insn->op == MSP430_OP_RETA)
|
||||
suffix = NULL;
|
||||
|
||||
dst = copy_string(lowercase_dis, buf, end, opname);
|
||||
dst = copy_string(lowercase_dis, dst, end, suffix);
|
||||
return buf;
|
||||
}
|
||||
|
||||
static const char *reg_name(const msp430_reg_t reg)
|
||||
{
|
||||
static char buf[4];
|
||||
const char *const end = buf + sizeof(buf) - 1;
|
||||
const int lowercase_dis = opdb_get_boolean("lowercase_dis");
|
||||
const char *name = dis_reg_name(reg);
|
||||
|
||||
if (!name)
|
||||
return "???";
|
||||
if (lowercase_dis == 0)
|
||||
return name;
|
||||
copy_string(lowercase_dis, buf, end, name);
|
||||
return buf;
|
||||
}
|
||||
|
||||
static int format_addr(msp430_amode_t amode, address_t addr)
|
||||
{
|
||||
char name[MAX_SYMBOL_LENGTH];
|
||||
|
|
@ -60,7 +122,6 @@ static int format_reg(msp430_amode_t amode, msp430_reg_t reg)
|
|||
{
|
||||
const char *prefix = "";
|
||||
const char *suffix = "";
|
||||
const char *name;
|
||||
|
||||
switch (amode) {
|
||||
case MSP430_AMODE_REGISTER:
|
||||
|
|
@ -83,11 +144,7 @@ static int format_reg(msp430_amode_t amode, msp430_reg_t reg)
|
|||
break;
|
||||
}
|
||||
|
||||
name = dis_reg_name(reg);
|
||||
if (!name)
|
||||
name = "???";
|
||||
|
||||
return printc("%s\x1b[33m%s\x1b[0m%s", prefix, name, suffix);
|
||||
return printc("%s\x1b[33m%s\x1b[0m%s", prefix, reg_name(reg), suffix);
|
||||
}
|
||||
|
||||
/* Given an operands addressing mode, value and associated register,
|
||||
|
|
@ -110,27 +167,8 @@ static int format_operand(msp430_amode_t amode, address_t addr,
|
|||
static int dis_format(const struct msp430_instruction *insn)
|
||||
{
|
||||
int len = 0;
|
||||
const char *opname = dis_opcode_name(insn->op);
|
||||
const char *suffix = "";
|
||||
const int lowercase = opdb_get_boolean("lowercase_dis");
|
||||
|
||||
if (!opname)
|
||||
opname = "???";
|
||||
|
||||
if (insn->dsize == MSP430_DSIZE_BYTE)
|
||||
suffix = lowercase ? ".b" : ".B";
|
||||
else if (insn->dsize == MSP430_DSIZE_AWORD)
|
||||
suffix = lowercase ? ".a" : ".A";
|
||||
else if (insn->dsize == MSP430_DSIZE_UNKNOWN)
|
||||
suffix = ".?";
|
||||
|
||||
/* Don't show the .A suffix for these instructions */
|
||||
if (insn->op == MSP430_OP_MOVA || insn->op == MSP430_OP_CMPA ||
|
||||
insn->op == MSP430_OP_SUBA || insn->op == MSP430_OP_ADDA ||
|
||||
insn->op == MSP430_OP_BRA || insn->op == MSP430_OP_RETA)
|
||||
suffix = "";
|
||||
|
||||
len += printc("\x1b[36m%s%s\x1b[0m", opname, suffix);
|
||||
len += printc("\x1b[36m%s\x1b[0m", opcode_name_with_size(insn));
|
||||
while (len < 8)
|
||||
len += printc(" ");
|
||||
|
||||
|
|
@ -154,7 +192,7 @@ static int dis_format(const struct msp430_instruction *insn)
|
|||
|
||||
/* Repetition count */
|
||||
if (insn->rep_register)
|
||||
len += printc(" [repeat %s]", dis_reg_name(insn->rep_index));
|
||||
len += printc(" [repeat %s]", reg_name(insn->rep_index));
|
||||
else if (insn->rep_index)
|
||||
len += printc(" [repeat %d]", insn->rep_index + 1);
|
||||
|
||||
|
|
@ -280,7 +318,7 @@ void show_regs(const address_t *regs)
|
|||
int k = j * 4 + i;
|
||||
|
||||
printc("(\x1b[1m%3s:\x1b[0m %05x) ",
|
||||
dis_reg_name(k), regs[k]);
|
||||
reg_name(k), regs[k]);
|
||||
}
|
||||
|
||||
printc("\n");
|
||||
|
|
|
|||
Loading…
Reference in New Issue