Don't mix declarations and code.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@150305 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Benjamin Kramer
2012-02-11 16:01:02 +00:00
parent 88b6fc06db
commit 6b30274e27
2 changed files with 6 additions and 8 deletions

View File

@@ -826,7 +826,7 @@ static int getID(struct InternalInstruction* insn, void *miiArg) {
const struct InstructionSpecifier *spec; const struct InstructionSpecifier *spec;
uint16_t instructionIDWithOpsize; uint16_t instructionIDWithOpsize;
const struct InstructionSpecifier *specWithOpsize; const char *specName, *specWithOpSizeName;
spec = specifierForUID(instructionID); spec = specifierForUID(instructionID);
@@ -843,15 +843,13 @@ static int getID(struct InternalInstruction* insn, void *miiArg) {
return 0; return 0;
} }
specWithOpsize = specifierForUID(instructionIDWithOpsize); specName = x86DisassemblerGetInstrName(instructionID, miiArg);
specWithOpSizeName =
const char *specName = x86DisassemblerGetInstrName(instructionID, miiArg);
const char *specWithOpSizeSizeName =
x86DisassemblerGetInstrName(instructionIDWithOpsize, miiArg); x86DisassemblerGetInstrName(instructionIDWithOpsize, miiArg);
if (is16BitEquvalent(specName, specWithOpSizeSizeName)) { if (is16BitEquvalent(specName, specWithOpSizeName)) {
insn->instructionID = instructionIDWithOpsize; insn->instructionID = instructionIDWithOpsize;
insn->spec = specWithOpsize; insn->spec = specifierForUID(instructionIDWithOpsize);
} else { } else {
insn->instructionID = instructionID; insn->instructionID = instructionID;
insn->spec = spec; insn->spec = spec;

View File

@@ -20,7 +20,7 @@
extern "C" { extern "C" {
#endif #endif
#define INSTRUCTION_SPECIFIER_FIELDS \ #define INSTRUCTION_SPECIFIER_FIELDS
#define INSTRUCTION_IDS \ #define INSTRUCTION_IDS \
unsigned instructionIDs; unsigned instructionIDs;