maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[X86][MC][NFC] Refine code in X86MCCodeEmitter 

As we mentioned in D78180, merge some if clauses and use CamelCase for
variables, etc.
This commit is contained in:
Shengchen Kan 2020-04-16 10:36:31 +08:00
parent 61f594e45a
commit 6c66bb393e
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
llvm/lib/Target/X86/MCTargetDesc/X86MCCodeEmitter.cpp
View File

@ -637,13 +637,12 @@ void X86MCCodeEmitter::emitPrefixImpl(unsigned &CurOp, unsigned &CurByte,
uint64_t TSFlags = MCII.get(MI.getOpcode()).TSFlags; uint64_t TSFlags = MCII.get(MI.getOpcode()).TSFlags;
// Determine where the memory operand starts, if present. // Determine where the memory operand starts, if present.
int MemoryOperand = X86II::getMemoryOperandNo(TSFlags); int MemoryOperand = X86II::getMemoryOperandNo(TSFlags);
if (MemoryOperand != -1)
MemoryOperand += CurOp;
// Emit segment override opcode prefix as needed. // Emit segment override opcode prefix as needed.
if (MemoryOperand >= 0) if (MemoryOperand != -1) {
MemoryOperand += CurOp;
emitSegmentOverridePrefix(CurByte, MemoryOperand + X86::AddrSegmentReg, MI, emitSegmentOverridePrefix(CurByte, MemoryOperand + X86::AddrSegmentReg, MI,
OS); OS);
}
// Emit the repeat opcode prefix as needed. // Emit the repeat opcode prefix as needed.
unsigned Flags = MI.getFlags(); unsigned Flags = MI.getFlags();
@ -653,27 +652,27 @@ void X86MCCodeEmitter::emitPrefixImpl(unsigned &CurOp, unsigned &CurByte,
emitByte(0xF2, CurByte, OS); emitByte(0xF2, CurByte, OS);
// Emit the address size opcode prefix as needed. // Emit the address size opcode prefix as needed.
bool need_address_override; bool NeedAddressOverride;
uint64_t AdSize = TSFlags & X86II::AdSizeMask; uint64_t AdSize = TSFlags & X86II::AdSizeMask;
if ((STI.hasFeature(X86::Mode16Bit) && AdSize == X86II::AdSize32) || if ((STI.hasFeature(X86::Mode16Bit) && AdSize == X86II::AdSize32) ||
(STI.hasFeature(X86::Mode32Bit) && AdSize == X86II::AdSize16) || (STI.hasFeature(X86::Mode32Bit) && AdSize == X86II::AdSize16) ||
(STI.hasFeature(X86::Mode64Bit) && AdSize == X86II::AdSize32)) { (STI.hasFeature(X86::Mode64Bit) && AdSize == X86II::AdSize32)) {
need_address_override = true; NeedAddressOverride = true;
} else if (MemoryOperand < 0) { } else if (MemoryOperand < 0) {
need_address_override = false; NeedAddressOverride = false;
} else if (STI.hasFeature(X86::Mode64Bit)) { } else if (STI.hasFeature(X86::Mode64Bit)) {
assert(!is16BitMemOperand(MI, MemoryOperand, STI)); assert(!is16BitMemOperand(MI, MemoryOperand, STI));
need_address_override = is32BitMemOperand(MI, MemoryOperand); NeedAddressOverride = is32BitMemOperand(MI, MemoryOperand);
} else if (STI.hasFeature(X86::Mode32Bit)) { } else if (STI.hasFeature(X86::Mode32Bit)) {
assert(!is64BitMemOperand(MI, MemoryOperand)); assert(!is64BitMemOperand(MI, MemoryOperand));
need_address_override = is16BitMemOperand(MI, MemoryOperand, STI); NeedAddressOverride = is16BitMemOperand(MI, MemoryOperand, STI);
} else { } else {
assert(STI.hasFeature(X86::Mode16Bit)); assert(STI.hasFeature(X86::Mode16Bit));
assert(!is64BitMemOperand(MI, MemoryOperand)); assert(!is64BitMemOperand(MI, MemoryOperand));
need_address_override = !is16BitMemOperand(MI, MemoryOperand, STI); NeedAddressOverride = !is16BitMemOperand(MI, MemoryOperand, STI);
} }
if (need_address_override) if (NeedAddressOverride)
emitByte(0x67, CurByte, OS); emitByte(0x67, CurByte, OS);
// Encoding type for this instruction. // Encoding type for this instruction.
@ -732,8 +731,7 @@ void X86MCCodeEmitter::emitPrefixImpl(unsigned &CurOp, unsigned &CurByte,
} }
} }
/// emitVEXOpcodePrefix - AVX instructions are encoded using a opcode prefix /// AVX instructions are encoded using a opcode prefix called VEX.
/// called VEX.
void X86MCCodeEmitter::emitVEXOpcodePrefix(unsigned &CurByte, int MemOperand, void X86MCCodeEmitter::emitVEXOpcodePrefix(unsigned &CurByte, int MemOperand,
const MCInst &MI, const MCInst &MI,
raw_ostream &OS) const { raw_ostream &OS) const {