Subzero. Moves code around in preparations for 64-bit lowering.

src/IceInstX8664.h

@@ -8,9 +8,8 @@
 //===----------------------------------------------------------------------===//
 ///
 /// \file
-/// This file used to house all the X8664 instructions. Subzero has been
-/// modified to use templates for X86 instructions, so all those definitions are
-/// are in IceInstX86Base.h
+/// (Note: x86 instructions are templates, and they are defined in
+///  src/IceInstX86Base.)
 ///
 /// When interacting with the X8664 target (which should only happen in the
 /// X8664 TargetLowering) clients have should use the Ice::X8664::Traits::Insts

src/IceTargetLoweringX8632.h

@@ -43,6 +43,10 @@ public:
 
 protected:
   void lowerCall(const InstCall *Instr) override;
+  void lowerArguments() override;
+  void lowerRet(const InstRet *Inst) override;
+  void addProlog(CfgNode *Node) override;
+  void addEpilog(CfgNode *Node) override;
 
 private:
   friend class ::Ice::X86Internal::TargetX86Base<TargetX8632>;

src/IceTargetLoweringX8664.h

@@ -40,6 +40,10 @@ public:
 
 protected:
   void lowerCall(const InstCall *Instr) override;
+  void lowerArguments() override;
+  void lowerRet(const InstRet *Inst) override;
+  void addProlog(CfgNode *Node) override;
+  void addEpilog(CfgNode *Node) override;
 
 private:
   friend class ::Ice::X86Internal::TargetX86Base<TargetX8664>;

src/IceTargetLoweringX86Base.h

@@ -98,10 +98,7 @@ public:
   void emit(const ConstantFloat *C) const final;
   void emit(const ConstantDouble *C) const final;
 
-  void lowerArguments() override;
   void initNodeForLowering(CfgNode *Node) override;
-  void addProlog(CfgNode *Node) override;
-  void addEpilog(CfgNode *Node) override;
   /// Ensure that a 64-bit Variable has been split into 2 32-bit
   /// Variables, creating them if necessary.  This is needed for all
   /// I64 operations, and it is needed for pushing F64 arguments for
@@ -136,7 +133,6 @@ protected:
   void lowerInsertElement(const InstInsertElement *Inst) override;
   void lowerLoad(const InstLoad *Inst) override;
   void lowerPhi(const InstPhi *Inst) override;
-  void lowerRet(const InstRet *Inst) override;
   void lowerSelect(const InstSelect *Inst) override;
   void lowerStore(const InstStore *Inst) override;
   void lowerSwitch(const InstSwitch *Inst) override;