[llvm-commits] [llvm] r140754 - in /llvm/trunk/lib/Target/ARM: ARM.h ARMSjLjLoweringPass.cpp ARMTargetMachine.cpp

[Bill Wendling]

Author: void
Date: Wed Sep 28 20:13:55 2011
New Revision: 140754

URL: http://llvm.org/viewvc/llvm-project?rev=140754&view=rev
Log:
Move to ISelLowering.

Removed:
    llvm/trunk/lib/Target/ARM/ARMSjLjLoweringPass.cpp
Modified:
    llvm/trunk/lib/Target/ARM/ARM.h
    llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp

Modified: llvm/trunk/lib/Target/ARM/ARM.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARM.h?rev=140754&r1=140753&r2=140754&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/ARM.h (original)
+++ llvm/trunk/lib/Target/ARM/ARM.h Wed Sep 28 20:13:55 2011
@@ -41,7 +41,6 @@
 FunctionPass *createARMExpandPseudoPass();
 FunctionPass *createARMGlobalMergePass(const TargetLowering* tli);
 FunctionPass *createARMConstantIslandPass();
-FunctionPass *createARMSjLjLoweringPass();
 FunctionPass *createNEONMoveFixPass();
 FunctionPass *createMLxExpansionPass();
 FunctionPass *createThumb2ITBlockPass();

Removed: llvm/trunk/lib/Target/ARM/ARMSjLjLoweringPass.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMSjLjLoweringPass.cpp?rev=140753&view=auto
==============================================================================
--- llvm/trunk/lib/Target/ARM/ARMSjLjLoweringPass.cpp (original)
+++ llvm/trunk/lib/Target/ARM/ARMSjLjLoweringPass.cpp (removed)
@@ -1,128 +0,0 @@
-//===-- ARMSjLjLoweringPass.cpp - ARM SjLj Lowering Pass ------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This file contains a pass that lowers the SjLj exception handling into
-// machine instructions.
-//
-//===----------------------------------------------------------------------===//
-
-#define DEBUG_TYPE "arm-sjlj-lowering"
-#include "ARM.h"
-#include "llvm/Function.h"
-#include "llvm/CodeGen/MachineFrameInfo.h"
-#include "llvm/CodeGen/MachineFunction.h"
-#include "llvm/CodeGen/MachineFunctionPass.h"
-#include "llvm/Target/TargetData.h"
-#include "llvm/Target/TargetLowering.h"
-#include "llvm/Support/CommandLine.h"
-using namespace llvm;
-
-// Hidden options for the new EH stuff.
-static cl::opt<bool>
-EnableNewSjLjEHPrepare("enable-new-sjlj-eh", cl::Hidden,
-                       cl::desc("Use the new SjLj EH preparation pass"));
-
-namespace {
-
-class ARMSjLjLowering : public MachineFunctionPass {
-  Type *FunctionCtxTy;
-  LLVMContext *Context;
-
-  MachineFunction *MF;
-  const Function *F;
-  const TargetLowering *TLI;
-  const TargetInstrInfo *TII;
-  const TargetRegisterInfo *TRI;
-
-  /// setupFunctionContext - Setup the function context on the stack. Some of
-  /// the fields were set by the SjLj EH prepare pass.
-  int setupFunctionContext();
-
-public:
-  static char ID;
-  ARMSjLjLowering() : MachineFunctionPass(ID) {}
-
-  virtual bool runOnMachineFunction(MachineFunction &mf);
-
-  virtual const char *getPassName() const {
-    return "ARM setjmp/longjmp exception handling lowering pass";
-  }
-};
-
-char ARMSjLjLowering::ID = 0;
-
-} // end anonymous namespace
-
-FunctionPass *llvm::createARMSjLjLoweringPass() {
-  return new ARMSjLjLowering();
-}
-
-bool ARMSjLjLowering::runOnMachineFunction(MachineFunction &mf) {
-  if (!EnableNewSjLjEHPrepare) return false;
-
-  MF = &mf;
-  F = MF->getFunction();
-  Context = &F->getContext();
-  TLI = MF->getTarget().getTargetLowering();
-  TII = MF->getTarget().getInstrInfo();
-  TRI = MF->getTarget().getRegisterInfo();
-
-  // Perform the lowering only if there are invokes.
-  bool HasInvokes = false;
-  for (Function::const_iterator BB = F->begin(), E = F->end(); BB != E; ++BB)
-    if (isa<InvokeInst>(BB->getTerminator())) {
-      HasInvokes = true;
-      break;
-    }
-
-  if (!HasInvokes) return false;
-
-  int FrameIdx = setupFunctionContext(); (void)FrameIdx;
-
-  return true;
-}
-
-/// setupFunctionContext - Create the function context on the stack.
-int ARMSjLjLowering::setupFunctionContext() {
-  // struct _Unwind_FunctionContext {
-  //   // next function in stack of handlers.
-  //   struct _Unwind_FunctionContext *prev;
-  //
-  //   // set by calling function before registering to be the landing pad.
-  //   uintptr_t resumeLocation;
-  //
-  //   // set by personality handler to be parameters passed to landing pad
-  //   // function.
-  //   uintptr_t resumeParameters[4];
-  //
-  //   // set by calling function before registering
-  //   __personality_routine personality;  // arm offset=24
-  //
-  //   uintptr_t lsda                      // arm offset=28
-  //
-  //   // variable length array, contains registers to restore
-  //   // 0 = r7, 1 = pc, 2 = sp
-  //   void *jbuf[];  // 5 for GCC compatibility.
-  // };
-  Type *VoidPtrTy = Type::getInt8PtrTy(*Context);
-  Type *Int32Ty = Type::getInt32Ty(*Context);
-  FunctionCtxTy =
-    StructType::get(VoidPtrTy,                        // prev
-                    Int32Ty,                          // resumeLocation
-                    ArrayType::get(Int32Ty, 4),       // resumeParameters
-                    VoidPtrTy,                        // personality
-                    VoidPtrTy,                        // lsda
-                    ArrayType::get(VoidPtrTy, 5),     // jbuf
-                    NULL);
-
-  uint64_t TySize = TLI->getTargetData()->getTypeAllocSize(FunctionCtxTy);
-  unsigned Align = TLI->getTargetData()->getPrefTypeAlignment(FunctionCtxTy);
-
-  return MF->getFrameInfo()->CreateStackObject(TySize, Align, false, false);
-}

Modified: llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp?rev=140754&r1=140753&r2=140754&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp (original)
+++ llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp Wed Sep 28 20:13:55 2011
@@ -108,8 +108,6 @@
     PM.add(createARMLoadStoreOptimizationPass(true));
   if (OptLevel != CodeGenOpt::None && Subtarget.isCortexA9())
     PM.add(createMLxExpansionPass());
-  if (getMCAsmInfo()->getExceptionHandlingType() == ExceptionHandling::SjLj)
-    PM.add(createARMSjLjLoweringPass());
   return true;
 }