From fb3b1ec98260d848dd9a4b74498994aec808e930 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Sun, 3 Feb 2002 07:39:06 +0000 Subject: [PATCH] * Switch over to cleaner TmpInstruction model git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@1648 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/InstrSelection/InstrSelectionSupport.cpp | 12 +++++++----- .../SparcV9/InstrSelection/InstrSelectionSupport.cpp | 12 +++++++----- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/lib/CodeGen/InstrSelection/InstrSelectionSupport.cpp b/lib/CodeGen/InstrSelection/InstrSelectionSupport.cpp index 34dd83b49e0..ff655fc98da 100644 --- a/lib/CodeGen/InstrSelection/InstrSelectionSupport.cpp +++ b/lib/CodeGen/InstrSelection/InstrSelectionSupport.cpp @@ -14,12 +14,14 @@ #include "llvm/CodeGen/InstrSelectionSupport.h" #include "llvm/CodeGen/InstrSelection.h" #include "llvm/CodeGen/MachineInstr.h" +#include "llvm/CodeGen/MachineCodeForInstruction.h" +#include "llvm/CodeGen/MachineCodeForMethod.h" +#include "llvm/CodeGen/InstrForest.h" #include "llvm/Target/TargetMachine.h" #include "llvm/Target/MachineRegInfo.h" #include "llvm/ConstantVals.h" #include "llvm/Method.h" #include "llvm/BasicBlock.h" -#include "llvm/Instruction.h" #include "llvm/Type.h" #include "llvm/iMemory.h" using std::vector; @@ -36,16 +38,16 @@ InsertCodeToLoadConstant(Value* opValue, vector tempVec; // Create a tmp virtual register to hold the constant. - TmpInstruction* tmpReg = - new TmpInstruction(TMP_INSTRUCTION_OPCODE, opValue, NULL); - vmInstr->getMachineInstrVec().addTempValue(tmpReg); + TmpInstruction* tmpReg = new TmpInstruction(opValue); + MachineCodeForInstruction &MCFI = MachineCodeForInstruction::get(vmInstr); + MCFI.addTemp(tmpReg); target.getInstrInfo().CreateCodeToLoadConst(opValue, tmpReg, loadConstVec, tempVec); // Register the new tmp values created for this m/c instruction sequence for (unsigned i=0; i < tempVec.size(); i++) - vmInstr->getMachineInstrVec().addTempValue(tempVec[i]); + MCFI.addTemp(tempVec[i]); // Record the mapping from the tmp VM instruction to machine instruction. // Do this for all machine instructions that were not mapped to any diff --git a/lib/Target/SparcV9/InstrSelection/InstrSelectionSupport.cpp b/lib/Target/SparcV9/InstrSelection/InstrSelectionSupport.cpp index 34dd83b49e0..ff655fc98da 100644 --- a/lib/Target/SparcV9/InstrSelection/InstrSelectionSupport.cpp +++ b/lib/Target/SparcV9/InstrSelection/InstrSelectionSupport.cpp @@ -14,12 +14,14 @@ #include "llvm/CodeGen/InstrSelectionSupport.h" #include "llvm/CodeGen/InstrSelection.h" #include "llvm/CodeGen/MachineInstr.h" +#include "llvm/CodeGen/MachineCodeForInstruction.h" +#include "llvm/CodeGen/MachineCodeForMethod.h" +#include "llvm/CodeGen/InstrForest.h" #include "llvm/Target/TargetMachine.h" #include "llvm/Target/MachineRegInfo.h" #include "llvm/ConstantVals.h" #include "llvm/Method.h" #include "llvm/BasicBlock.h" -#include "llvm/Instruction.h" #include "llvm/Type.h" #include "llvm/iMemory.h" using std::vector; @@ -36,16 +38,16 @@ InsertCodeToLoadConstant(Value* opValue, vector tempVec; // Create a tmp virtual register to hold the constant. - TmpInstruction* tmpReg = - new TmpInstruction(TMP_INSTRUCTION_OPCODE, opValue, NULL); - vmInstr->getMachineInstrVec().addTempValue(tmpReg); + TmpInstruction* tmpReg = new TmpInstruction(opValue); + MachineCodeForInstruction &MCFI = MachineCodeForInstruction::get(vmInstr); + MCFI.addTemp(tmpReg); target.getInstrInfo().CreateCodeToLoadConst(opValue, tmpReg, loadConstVec, tempVec); // Register the new tmp values created for this m/c instruction sequence for (unsigned i=0; i < tempVec.size(); i++) - vmInstr->getMachineInstrVec().addTempValue(tempVec[i]); + MCFI.addTemp(tempVec[i]); // Record the mapping from the tmp VM instruction to machine instruction. // Do this for all machine instructions that were not mapped to any