diff options
| author | Bill Wendling <isanbard@gmail.com> | 2008-09-08 19:42:32 +0000 |
|---|---|---|
| committer | Bill Wendling <isanbard@gmail.com> | 2008-09-08 19:42:32 +0000 |
| commit | 1b0123c3cd79d50f3b59f6509d93f3ce97a1cbc0 (patch) | |
| tree | 4e050c5df320a9715cdf0f065f4a8ef7e69c8426 | |
| parent | 1ed49fb74ba5127c92d837f147ccb26840c29675 (diff) | |
Reverting r55898 as well. This wasn't reverted in the original revert...
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@55938 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Target/X86/X86ISelLowering.cpp | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/lib/Target/X86/X86ISelLowering.cpp b/lib/Target/X86/X86ISelLowering.cpp index 93ffb41015..26895bba85 100644 --- a/lib/Target/X86/X86ISelLowering.cpp +++ b/lib/Target/X86/X86ISelLowering.cpp @@ -258,7 +258,8 @@ X86TargetLowering::X86TargetLowering(X86TargetMachine &TM) } // X86 ret instruction may pop stack. setOperationAction(ISD::RET , MVT::Other, Custom); - setOperationAction(ISD::EH_RETURN , MVT::Other, Custom); + if (!Subtarget->is64Bit()) + setOperationAction(ISD::EH_RETURN , MVT::Other, Custom); // Darwin ABI issue. setOperationAction(ISD::ConstantPool , MVT::i32 , Custom); @@ -324,8 +325,7 @@ X86TargetLowering::X86TargetLowering(X86TargetMachine &TM) setExceptionSelectorRegister(X86::EDX); } setOperationAction(ISD::FRAME_TO_ARGS_OFFSET, MVT::i32, Custom); - setOperationAction(ISD::FRAME_TO_ARGS_OFFSET, MVT::i64, Custom); - + setOperationAction(ISD::TRAMPOLINE, MVT::Other, Custom); setOperationAction(ISD::TRAP, MVT::Other, Legal); @@ -5593,15 +5593,19 @@ SDValue X86TargetLowering::LowerFRAMEADDR(SDValue Op, SelectionDAG &DAG) { // Depths > 0 not supported yet! if (cast<ConstantSDNode>(Op.getOperand(0))->getValue() > 0) return SDValue(); - + SDValue RetAddrFI = getReturnAddressFrameIndex(DAG); - return DAG.getNode(ISD::SUB, getPointerTy(), RetAddrFI, + return DAG.getNode(ISD::SUB, getPointerTy(), RetAddrFI, DAG.getIntPtrConstant(!Subtarget->is64Bit() ? 4 : 8)); } SDValue X86TargetLowering::LowerFRAME_TO_ARGS_OFFSET(SDValue Op, - SelectionDAG &DAG) { - return DAG.getIntPtrConstant(Subtarget->is64Bit() ? 16 : 8); + SelectionDAG &DAG) { + // Is not yet supported on x86-64 + if (Subtarget->is64Bit()) + return SDValue(); + + return DAG.getIntPtrConstant(8); } SDValue X86TargetLowering::LowerEH_RETURN(SDValue Op, SelectionDAG &DAG) |