Merged addProlog and addEpilog on x86.

src/IceTargetLoweringX8632.h

 //===- subzero/src/IceTargetLoweringX8632.h - x86-32 lowering ---*- C++ -*-===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file
@@ skipping 16 matching lines @@
 #include "IceTargetLoweringX8632Traits.h"
 
 namespace Ice {
 namespace X8632 {
 
 class TargetX8632 final : public ::Ice::X8632::TargetX86Base<X8632::Traits> {
   TargetX8632() = delete;
   TargetX8632(const TargetX8632 &) = delete;
   TargetX8632 &operator=(const TargetX8632 &) = delete;
 
+  void emitSandboxedReturn() override;
   void emitJumpTable(const Cfg *Func,
                      const InstJumpTable *JumpTable) const override;
 
 public:
   ~TargetX8632() = default;
 
   static std::unique_ptr<::Ice::TargetLowering> create(Cfg *Func) {
     return makeUnique<TargetX8632>(Func);
   }
 
   std::unique_ptr<::Ice::Assembler> createAssembler() const override {
     return makeUnique<X8632::AssemblerX8632>();
   }
 
 protected:
   void _add_sp(Operand *Adjustment);
   void _mov_sp(Operand *NewValue);
   Traits::X86OperandMem *_sandbox_mem_reference(X86OperandMem *) {
     llvm::report_fatal_error("sandbox mem reference for x86-32.");
   }
   void _sub_sp(Operand *Adjustment);
+  void _link_bp();
+  void _unlink_bp();
+  void _push_reg(Variable *Reg);
 
   void initSandbox() {}
   void lowerIndirectJump(Variable *JumpTarget);
+  void emitGetIP(CfgNode *Node);
   Inst *emitCallToTarget(Operand *CallTarget, Variable *ReturnReg) override;
   Variable *moveReturnValueToRegister(Operand *Value, Type ReturnType) override;
-  void addProlog(CfgNode *Node) override;
-  void addEpilog(CfgNode *Node) override;
 
 private:
   ENABLE_MAKE_UNIQUE;
   friend class X8632::TargetX86Base<X8632::Traits>;
 
   Operand *createNaClReadTPSrcOperand() {
     Constant *Zero = Ctx->getConstantZero(IceType_i32);
     return Traits::X86OperandMem::create(Func, IceType_i32, nullptr, Zero,
                                          nullptr, 0,
                                          Traits::X86OperandMem::SegReg_GS);
@@ skipping 40 matching lines @@
   explicit TargetHeaderX8632(GlobalContext *Ctx);
 
 private:
   ~TargetHeaderX8632() = default;
 };
 
 } // end of namespace X8632
 } // end of namespace Ice
 
 #endif // SUBZERO_SRC_ICETARGETLOWERINGX8632_H