[llvm-branch-commits] [llvm-branch] r71111 - /llvm/branches/Apple/Dib/lib/Target/X86/X86CodeEmitter.cpp

[Bill Wendling]

Author: void
Date: Wed May  6 15:12:04 2009
New Revision: 71111

URL: http://llvm.org/viewvc/llvm-project?rev=71111&view=rev
Log:
--- Merging r71106 into '.':
U    lib/Target/X86/X86CodeEmitter.cpp


Modified:
    llvm/branches/Apple/Dib/lib/Target/X86/X86CodeEmitter.cpp

Modified: llvm/branches/Apple/Dib/lib/Target/X86/X86CodeEmitter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Dib/lib/Target/X86/X86CodeEmitter.cpp?rev=71111&r1=71110&r2=71111&view=diff

==============================================================================
--- llvm/branches/Apple/Dib/lib/Target/X86/X86CodeEmitter.cpp (original)
+++ llvm/branches/Apple/Dib/lib/Target/X86/X86CodeEmitter.cpp Wed May  6 15:12:04 2009
@@ -709,7 +709,8 @@
   case X86II::MRM4m: case X86II::MRM5m:
   case X86II::MRM6m: case X86II::MRM7m: {
     intptr_t PCAdj = (CurOp + X86AddrNumOperands != NumOps) ?
-      (MI.getOperand(CurOp+4).isImm() ? X86InstrInfo::sizeOfImm(Desc) : 4) : 0;
+      (MI.getOperand(CurOp+X86AddrNumOperands).isImm() ? 
+          X86InstrInfo::sizeOfImm(Desc) : 4) : 0;
 
     MCE.emitByte(BaseOpcode);
     emitMemModRMByte(MI, CurOp, (Desc->TSFlags & X86II::FormMask)-X86II::MRM0m,