emitIAS for push -- simplify push since it's not used for args passing anymore

src/IceInstX8632.cpp

@@ -305,10 +305,8 @@ InstX8632Fstp::InstX8632Fstp(Cfg *Func, Variable *Dest)
 InstX8632Pop::InstX8632Pop(Cfg *Func, Variable *Dest)
     : InstX8632(Func, InstX8632::Pop, 0, Dest) {}
 
-InstX8632Push::InstX8632Push(Cfg *Func, Operand *Source,
-                             bool SuppressStackAdjustment)
-    : InstX8632(Func, InstX8632::Push, 1, NULL),
-      SuppressStackAdjustment(SuppressStackAdjustment) {
+InstX8632Push::InstX8632Push(Cfg *Func, Variable *Source)
+    : InstX8632(Func, InstX8632::Push, 1, NULL) {
   addSource(Source);
 }
 
@@ -2074,34 +2072,24 @@ void InstX8632AdjustStack::dump(const Cfg *Func) const {
 void InstX8632Push::emit(const Cfg *Func) const {
   Ostream &Str = Func->getContext()->getStrEmit();
   assert(getSrcSize() == 1);
-  Type Ty = getSrc(0)->getType();
-  Variable *Var = llvm::dyn_cast<Variable>(getSrc(0));
-  if ((isVectorType(Ty) || isScalarFloatingType(Ty)) && Var && Var->hasReg()) {
-    // The xmm registers can't be directly pushed, so we fake it by
-    // decrementing esp and then storing to [esp].
-    Str << "\tsub\tesp, " << typeWidthInBytes(Ty) << "\n";
-    if (!SuppressStackAdjustment)
-      Func->getTarget()->updateStackAdjustment(typeWidthInBytes(Ty));
-    if (isVectorType(Ty)) {
-      Str << "\tmovups\txmmword ptr [esp], ";
-    } else {
-      Str << "\tmov" << TypeX8632Attributes[Ty].SdSsString << "\t"
-          << TypeX8632Attributes[Ty].WidthString << " [esp], ";
-    }
-    getSrc(0)->emit(Func);
-    Str << "\n";
-  } else if (Ty == IceType_f64 && (!Var || !Var->hasReg())) {
-    // A double on the stack has to be pushed as two halves.  Push the
-    // upper half followed by the lower half for little-endian.  TODO:
-    // implement.
-    llvm_unreachable("Missing support for pushing doubles from memory");
-  } else {
+  // Push is currently only used for saving GPRs.
+  Variable *Var = llvm::cast<Variable>(getSrc(0));
+  assert(Var->hasReg());
   Str << "\tpush\t";
-    getSrc(0)->emit(Func);
+  Var->emit(Func);
   Str << "\n";
-    if (!SuppressStackAdjustment)
-      Func->getTarget()->updateStackAdjustment(4);
-  }
+}
+
+void InstX8632Push::emitIAS(const Cfg *Func) const {
+  Ostream &Str = Func->getContext()->getStrEmit();
+  assert(getSrcSize() == 1);
+  // Push is currently only used for saving GPRs.
+  Variable *Var = llvm::cast<Variable>(getSrc(0));
+  assert(Var->hasReg());
+  x86::AssemblerX86 *Asm = Func->getAssembler<x86::AssemblerX86>();
+  intptr_t StartPosition = Asm->GetPosition();
+  Asm->pushl(RegX8632::getEncodedGPR(Var->getRegNum()));
+  emitIASBytes(Str, Asm, StartPosition);
 }
 
 void InstX8632Push::dump(const Cfg *Func) const {

src/IceInstX8632.h

@@ -1395,20 +1395,19 @@ private:
 
 class InstX8632Push : public InstX8632 {
 public:
-  static InstX8632Push *create(Cfg *Func, Operand *Source,
-                               bool SuppressStackAdjustment) {
+  static InstX8632Push *create(Cfg *Func, Variable *Source) {
     return new (Func->allocate<InstX8632Push>())
-        InstX8632Push(Func, Source, SuppressStackAdjustment);
+        InstX8632Push(Func, Source);
   }
   void emit(const Cfg *Func) const override;
+  void emitIAS(const Cfg *Func) const override;
   void dump(const Cfg *Func) const override;
   static bool classof(const Inst *Inst) { return isClassof(Inst, Push); }
 
 private:
-  InstX8632Push(Cfg *Func, Operand *Source, bool SuppressStackAdjustment);
+  InstX8632Push(Cfg *Func, Variable *Source);
   InstX8632Push(const InstX8632Push &) = delete;
   InstX8632Push &operator=(const InstX8632Push &) = delete;
-  bool SuppressStackAdjustment;
   ~InstX8632Push() override {}
 };
 

src/IceTargetLoweringX8632.cpp

@@ -748,8 +748,7 @@ void TargetX8632::addProlog(CfgNode *Node) {
     if (CalleeSaves[i] && RegsUsed[i]) {
       ++NumCallee;
       PreservedRegsSizeBytes += 4;
-      const bool SuppressStackAdjustment = true;
-      _push(getPhysicalRegister(i), SuppressStackAdjustment);
+      _push(getPhysicalRegister(i));
     }
   }
   Ctx->statsUpdateRegistersSaved(NumCallee);
@@ -761,8 +760,7 @@ void TargetX8632::addProlog(CfgNode *Node) {
     PreservedRegsSizeBytes += 4;
     Variable *ebp = getPhysicalRegister(RegX8632::Reg_ebp);
     Variable *esp = getPhysicalRegister(RegX8632::Reg_esp);
-    const bool SuppressStackAdjustment = true;
-    _push(ebp, SuppressStackAdjustment);
+    _push(ebp);
     _mov(ebp, esp);
   }
 

src/IceTargetLoweringX8632.h

@@ -383,8 +383,8 @@ protected:
   void _psub(Variable *Dest, Operand *Src0) {
     Context.insert(InstX8632Psub::create(Func, Dest, Src0));
   }
-  void _push(Operand *Src0, bool SuppressStackAdjustment = false) {
-    Context.insert(InstX8632Push::create(Func, Src0, SuppressStackAdjustment));
+  void _push(Variable *Src0) {
+    Context.insert(InstX8632Push::create(Func, Src0));
   }
   void _pxor(Variable *Dest, Operand *Src0) {
     Context.insert(InstX8632Pxor::create(Func, Dest, Src0));

src/assembler_ia32.cpp

@@ -99,18 +99,6 @@ void AssemblerX86::pushl(GPRRegister reg) {
   EmitUint8(0x50 + reg);
 }
 
-void AssemblerX86::pushl(const Address &address) {
-  AssemblerBuffer::EnsureCapacity ensured(&buffer_);
-  EmitUint8(0xFF);
-  EmitOperand(6, address);
-}
-
-void AssemblerX86::pushl(const Immediate &imm) {
-  AssemblerBuffer::EnsureCapacity ensured(&buffer_);
-  EmitUint8(0x68);
-  EmitImmediate(BrokenType, imm);
-}
-
 void AssemblerX86::popl(GPRRegister reg) {
   AssemblerBuffer::EnsureCapacity ensured(&buffer_);
   EmitUint8(0x58 + reg);

src/assembler_ia32.h

@@ -408,8 +408,6 @@ public:
   static const intptr_t kCallExternalLabelSize = 5;
 
   void pushl(GPRRegister reg);
-  void pushl(const Address &address);
-  void pushl(const Immediate &imm);
 
   void popl(GPRRegister reg);
   void popl(const Address &address);