diff options
| -rw-r--r-- | lib/Target/X86/X86CodeEmitter.cpp | 2 | ||||
| -rw-r--r-- | lib/Target/X86/X86InstrInfo.cpp | 10 |
2 files changed, 12 insertions, 0 deletions
diff --git a/lib/Target/X86/X86CodeEmitter.cpp b/lib/Target/X86/X86CodeEmitter.cpp index ab57e3d018..e08688bae3 100644 --- a/lib/Target/X86/X86CodeEmitter.cpp +++ b/lib/Target/X86/X86CodeEmitter.cpp @@ -420,6 +420,8 @@ void Emitter::emitInstruction(const MachineInstr &MI, case X86II::GS: MCE.emitByte(0x65); break; + default: assert(0 && "Invalid segment!"); + case 0: break; // No segment override! } // Emit the repeat opcode prefix as needed. diff --git a/lib/Target/X86/X86InstrInfo.cpp b/lib/Target/X86/X86InstrInfo.cpp index 87c866a286..d2e2cf1efc 100644 --- a/lib/Target/X86/X86InstrInfo.cpp +++ b/lib/Target/X86/X86InstrInfo.cpp @@ -2668,6 +2668,16 @@ static unsigned GetInstSizeWithDesc(const MachineInstr &MI, // Emit the lock opcode prefix as needed. if (Desc->TSFlags & X86II::LOCK) ++FinalSize; + // Emit segment overrid opcode prefix as needed. + switch (Desc->TSFlags & X86II::SegOvrMask) { + case X86II::FS: + case X86II::GS: + ++FinalSize; + break; + default: assert(0 && "Invalid segment!"); + case 0: break; // No segment override! + } + // Emit the repeat opcode prefix as needed. if ((Desc->TSFlags & X86II::Op0Mask) == X86II::REP) ++FinalSize; |