[llvm-branch-commits] [llvm-tag] r101967 - in /llvm/tags/Apple/llvmCore-2326.9: ./ lib/Target/X86/X86CodeEmitter.cpp

[Bill Wendling]

Author: void
Date: Tue Apr 20 19:37:21 2010
New Revision: 101967

URL: http://llvm.org/viewvc/llvm-project?rev=101967&view=rev
Log:
llvmCore-2326.8 + r101965.

Added:
    llvm/tags/Apple/llvmCore-2326.9/   (props changed)
      - copied from r101966, llvm/tags/Apple/llvmCore-2326.8/
Modified:
    llvm/tags/Apple/llvmCore-2326.9/lib/Target/X86/X86CodeEmitter.cpp

Propchange: llvm/tags/Apple/llvmCore-2326.9/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Apr 20 19:37:21 2010
@@ -0,0 +1,22 @@
+Debug
+Release
+Release-Asserts
+mklib
+Makefile.config
+config.log
+config.status
+cvs.out
+autom4te.cache
+configure.out
+LLVM-*
+_distcheckdir
+llvm.spec
+svn-commit.*
+*.patch
+*.patch.raw
+cscope.*
+Debug+Coverage-Asserts
+Release+Coverage-Asserts
+Debug+Coverage
+Release+Coverage
+Debug+Checks

Propchange: llvm/tags/Apple/llvmCore-2326.9/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Apr 20 19:37:21 2010
@@ -0,0 +1,3 @@
+/llvm/branches/Apple/Hermes:96832,96835,96858,96870,96876,96879
+/llvm/branches/Apple/Morbo:100162
+/llvm/trunk:98602,98604,98612,98615-98616,98675,98686,98743-98744,98773,98778,98780,98810,98835,98839,98845,98855,98862,98881,98920,98977,99032-99033,99043,99223,99263,99282-99284,99306,99319-99321,99324,99336,99378,99418,99423,99429,99455,99463,99465,99469,99484,99490,99492-99494,99537,99539,99544,99570,99575,99629-99630,99671,99692,99695,99697,99699,99722,99846,99850,99910,100149,100170,100186,101453,101686

Modified: llvm/tags/Apple/llvmCore-2326.9/lib/Target/X86/X86CodeEmitter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/tags/Apple/llvmCore-2326.9/lib/Target/X86/X86CodeEmitter.cpp?rev=101967&r1=101966&r2=101967&view=diff
==============================================================================
--- llvm/tags/Apple/llvmCore-2326.9/lib/Target/X86/X86CodeEmitter.cpp (original)
+++ llvm/tags/Apple/llvmCore-2326.9/lib/Target/X86/X86CodeEmitter.cpp Tue Apr 20 19:37:21 2010
@@ -378,6 +378,16 @@
   const MachineOperand &IndexReg = MI.getOperand(Op+2);
 
   unsigned BaseReg = Base.getReg();
+  
+  // Handle %rip relative addressing.
+  if (BaseReg == X86::RIP ||
+      (Is64BitMode && DispForReloc)) { // [disp32+RIP] in X86-64 mode
+    assert(IndexReg.getReg() == 0 && Is64BitMode &&
+           "Invalid rip-relative address");
+    MCE.emitByte(ModRMByte(0, RegOpcodeField, 5));
+    emitDisplacementField(DispForReloc, DispVal, PCAdj, true);
+    return;
+  }
 
   // Indicate that the displacement will use an pcrel or absolute reference
   // by default. MCEs able to resolve addresses on-the-fly use pcrel by default
@@ -445,7 +455,7 @@
     // Emit the normal disp32 encoding.
     MCE.emitByte(ModRMByte(2, RegOpcodeField, 4));
     ForceDisp32 = true;
-  } else if (DispVal == 0 && getX86RegNum(BaseReg) != N86::EBP) {
+  } else if (DispVal == 0 && BaseRegNo != N86::EBP) {
     // Emit no displacement ModR/M byte
     MCE.emitByte(ModRMByte(0, RegOpcodeField, 4));
   } else if (isDisp8(DispVal)) {