[llvm-commits] [llvm] r105656 - /llvm/trunk/lib/Target/X86/X86MCCodeEmitter.cpp

Eric Christopher echristo at apple.com
Tue Jun 8 15:57:33 PDT 2010


Author: echristo
Date: Tue Jun  8 17:57:33 2010
New Revision: 105656

URL: http://llvm.org/viewvc/llvm-project?rev=105656&view=rev
Log:
Split out these asserts so it's more apparent why we're not assembling
that rip-relative address when executing in 32-bit mode.

Modified:
    llvm/trunk/lib/Target/X86/X86MCCodeEmitter.cpp

Modified: llvm/trunk/lib/Target/X86/X86MCCodeEmitter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86MCCodeEmitter.cpp?rev=105656&r1=105655&r2=105656&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/X86MCCodeEmitter.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86MCCodeEmitter.cpp Tue Jun  8 17:57:33 2010
@@ -202,8 +202,8 @@
   
   // Handle %rip relative addressing.
   if (BaseReg == X86::RIP) {    // [disp32+RIP] in X86-64 mode
-    assert(IndexReg.getReg() == 0 && Is64BitMode &&
-           "Invalid rip-relative address");
+    assert(Is64BitMode && "Rip-relative addressing requires 64-bit mode");
+    assert(IndexReg.getReg() == 0 && "Invalid rip-relative address");
     EmitByte(ModRMByte(0, RegOpcodeField, 5), CurByte, OS);
     
     unsigned FixupKind = X86::reloc_riprel_4byte;





More information about the llvm-commits mailing list