diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-05-11 15:14:46 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-05-11 15:14:46 -0700 |
| commit | 03348777ae33732c6e9fa30fbeb487152b021f4c (patch) | |
| tree | fdc5614660cef6cf6fcdddeb537df0316dda66dd /emulator/qtools/thumbdis.cpp | |
| parent | 884d096132183d7379bc32c232525f05b879f092 (diff) | |
| parent | be8c17dbe6c9b8924fa74c088bf47486bf706215 (diff) | |
| download | sdk-03348777ae33732c6e9fa30fbeb487152b021f4c.zip sdk-03348777ae33732c6e9fa30fbeb487152b021f4c.tar.gz sdk-03348777ae33732c6e9fa30fbeb487152b021f4c.tar.bz2 | |
am 2822ae3: Merge change 1343 into donut
Merge commit '2822ae37115ebf13412bbef91339ee0d9454525e'
* commit '2822ae37115ebf13412bbef91339ee0d9454525e':
Fix compiler warnings by changing "char*" to "const char*".
Diffstat (limited to 'emulator/qtools/thumbdis.cpp')
| -rw-r--r-- | emulator/qtools/thumbdis.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/emulator/qtools/thumbdis.cpp b/emulator/qtools/thumbdis.cpp index f4294dd..07c482f 100644 --- a/emulator/qtools/thumbdis.cpp +++ b/emulator/qtools/thumbdis.cpp @@ -46,7 +46,7 @@ struct thumb_opcode { unsigned short value, mask; /* recognise instruction if (op&mask)==value */ Opcode opcode; - char * assembler; /* how to disassemble this instruction */ + const char * assembler; /* how to disassemble this instruction */ }; /* format of the assembler string : @@ -216,7 +216,7 @@ static struct thumb_opcode thumb_opcodes[] = #define BDISP23(x,y) ((((((x) & 0x07ff) << 11) | ((y) & 0x07ff)) \ ^ 0x200000) - 0x200000) /* 23bit */ -static char * arm_conditional[] = +static const char * arm_conditional[] = {"eq", "ne", "cs", "cc", "mi", "pl", "vs", "vc", "hi", "ls", "ge", "lt", "gt", "le", "", "nv"}; @@ -281,7 +281,7 @@ char *disasm_insn_thumb(uint32_t pc, uint32_t insn1, uint32_t insn2, char *resul if ((insn1 & insn->mask) != insn->value) continue; - char * c = insn->assembler; + const char * c = insn->assembler; /* Special processing for Thumb 2-instruction BL sequence: */ if (!*c) { /* Check for empty (not NULL) assembler string. */ |