replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Reverting r55898 as well. This wasn't reverted in the original revert... 

llvm-svn: 55938
This commit is contained in:
Bill Wendling 2008-09-08 19:42:32 +00:00
parent 6fe5fe4209
commit 3871441861
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
llvm/lib/Target/X86/X86ISelLowering.cpp
View File

@ -258,7 +258,8 @@ X86TargetLowering::X86TargetLowering(X86TargetMachine &TM)
} }
// X86 ret instruction may pop stack. // X86 ret instruction may pop stack.
setOperationAction(ISD::RET , MVT::Other, Custom); 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. // Darwin ABI issue.
setOperationAction(ISD::ConstantPool , MVT::i32 , Custom); setOperationAction(ISD::ConstantPool , MVT::i32 , Custom);
@ -324,7 +325,6 @@ X86TargetLowering::X86TargetLowering(X86TargetMachine &TM)
setExceptionSelectorRegister(X86::EDX); setExceptionSelectorRegister(X86::EDX);
} }
setOperationAction(ISD::FRAME_TO_ARGS_OFFSET, MVT::i32, Custom); 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::TRAMPOLINE, MVT::Other, Custom);
@ -5600,8 +5600,12 @@ SDValue X86TargetLowering::LowerFRAMEADDR(SDValue Op, SelectionDAG &DAG) {
} }
SDValue X86TargetLowering::LowerFRAME_TO_ARGS_OFFSET(SDValue Op, SDValue X86TargetLowering::LowerFRAME_TO_ARGS_OFFSET(SDValue Op,
SelectionDAG &DAG) { SelectionDAG &DAG) {
return DAG.getIntPtrConstant(Subtarget->is64Bit() ? 16 : 8); // Is not yet supported on x86-64
if (Subtarget->is64Bit())
return SDValue();
return DAG.getIntPtrConstant(8);
} }
SDValue X86TargetLowering::LowerEH_RETURN(SDValue Op, SelectionDAG &DAG) SDValue X86TargetLowering::LowerEH_RETURN(SDValue Op, SelectionDAG &DAG)