diff options
| author | Craig Topper <craig.topper@intel.com> | 2018-06-01 04:29:30 +0000 |
|---|---|---|
| committer | Craig Topper <craig.topper@intel.com> | 2018-06-01 04:29:30 +0000 |
| commit | c6b2c2bb70d368e1f6d78d0fcfab3d3a84a43ab4 (patch) | |
| tree | 5d1102a6aa4f8ff55bf8b050b2d0d4fbcf2a0122 /llvm/lib/Target | |
| parent | e43778895c94de58d1e5fece501abec4d0f595f3 (diff) | |
| download | bcm5719-llvm-c6b2c2bb70d368e1f6d78d0fcfab3d3a84a43ab4.tar.gz bcm5719-llvm-c6b2c2bb70d368e1f6d78d0fcfab3d3a84a43ab4.zip | |
[X86][Disassembler] Use a local variable instead of using a field in the instruction object. NFC
llvm-svn: 333721
Diffstat (limited to 'llvm/lib/Target')
| -rw-r--r-- | llvm/lib/Target/X86/Disassembler/X86DisassemblerDecoder.cpp | 20 | ||||
| -rw-r--r-- | llvm/lib/Target/X86/Disassembler/X86DisassemblerDecoder.h | 1 |
2 files changed, 11 insertions, 10 deletions
diff --git a/llvm/lib/Target/X86/Disassembler/X86DisassemblerDecoder.cpp b/llvm/lib/Target/X86/Disassembler/X86DisassemblerDecoder.cpp index 922fe8e1cbb..17397b21d41 100644 --- a/llvm/lib/Target/X86/Disassembler/X86DisassemblerDecoder.cpp +++ b/llvm/lib/Target/X86/Disassembler/X86DisassemblerDecoder.cpp @@ -1349,8 +1349,8 @@ static int readModRM(struct InternalInstruction* insn) { insn->reg = (Reg)(insn->regBase + reg); switch (insn->addressSize) { - case 2: - insn->eaBaseBase = EA_BASE_BX_SI; + case 2: { + EABase eaBaseBase = EA_BASE_BX_SI; switch (mod) { case 0x0: @@ -1360,19 +1360,19 @@ static int readModRM(struct InternalInstruction* insn) { if (readDisplacement(insn)) return -1; } else { - insn->eaBase = (EABase)(insn->eaBaseBase + rm); + insn->eaBase = (EABase)(eaBaseBase + rm); insn->eaDisplacement = EA_DISP_NONE; } break; case 0x1: - insn->eaBase = (EABase)(insn->eaBaseBase + rm); + insn->eaBase = (EABase)(eaBaseBase + rm); insn->eaDisplacement = EA_DISP_8; insn->displacementSize = 1; if (readDisplacement(insn)) return -1; break; case 0x2: - insn->eaBase = (EABase)(insn->eaBaseBase + rm); + insn->eaBase = (EABase)(eaBaseBase + rm); insn->eaDisplacement = EA_DISP_16; if (readDisplacement(insn)) return -1; @@ -1384,9 +1384,10 @@ static int readModRM(struct InternalInstruction* insn) { break; } break; + } case 4: - case 8: - insn->eaBaseBase = (insn->addressSize == 4 ? EA_BASE_EAX : EA_BASE_RAX); + case 8: { + EABase eaBaseBase = (insn->addressSize == 4 ? EA_BASE_EAX : EA_BASE_RAX); switch (mod) { case 0x0: @@ -1408,7 +1409,7 @@ static int readModRM(struct InternalInstruction* insn) { return -1; break; default: - insn->eaBase = (EABase)(insn->eaBaseBase + rm); + insn->eaBase = (EABase)(eaBaseBase + rm); break; } break; @@ -1424,7 +1425,7 @@ static int readModRM(struct InternalInstruction* insn) { return -1; break; default: - insn->eaBase = (EABase)(insn->eaBaseBase + rm); + insn->eaBase = (EABase)(eaBaseBase + rm); if (readDisplacement(insn)) return -1; break; @@ -1436,6 +1437,7 @@ static int readModRM(struct InternalInstruction* insn) { break; } break; + } } /* switch (insn->addressSize) */ return 0; diff --git a/llvm/lib/Target/X86/Disassembler/X86DisassemblerDecoder.h b/llvm/lib/Target/X86/Disassembler/X86DisassemblerDecoder.h index 0fe1fab7ba5..c7ad7859967 100644 --- a/llvm/lib/Target/X86/Disassembler/X86DisassemblerDecoder.h +++ b/llvm/lib/Target/X86/Disassembler/X86DisassemblerDecoder.h @@ -627,7 +627,6 @@ struct InternalInstruction { // These fields determine the allowable values for the ModR/M fields, which // depend on operand and address widths. - EABase eaBaseBase; EABase eaRegBase; Reg regBase; |
