[llvm-commits] [parallel] CVS: llvm/lib/Target/SparcV9/InstrSelection/InstrSelection.cpp InstrSelectionSupport.cpp Makefile

[Misha Brukman]

Changes in directory llvm/lib/Target/SparcV9/InstrSelection:

InstrSelection.cpp updated: 1.68 -> 1.68.2.1
InstrSelectionSupport.cpp updated: 1.61 -> 1.61.2.1
Makefile updated: 1.4 -> 1.4.2.1

---
Log message:

Merge from trunk

---
Diffs of the changes:  (+7 -9)

Index: llvm/lib/Target/SparcV9/InstrSelection/InstrSelection.cpp
diff -u llvm/lib/Target/SparcV9/InstrSelection/InstrSelection.cpp:1.68 llvm/lib/Target/SparcV9/InstrSelection/InstrSelection.cpp:1.68.2.1
--- llvm/lib/Target/SparcV9/InstrSelection/InstrSelection.cpp:1.68	Sun Dec 28 15:23:38 2003
+++ llvm/lib/Target/SparcV9/InstrSelection/InstrSelection.cpp	Mon Mar  1 17:58:15 2004
@@ -283,10 +283,7 @@
       break;
     }
 
-  // find the position of first machine instruction generated by the
-  // terminator of this BB
-  MachineBasicBlock::iterator MCIt =
-    std::find(MBB->begin(), MBB->end(), FirstMIOfTerm);
+  MachineBasicBlock::iterator MCIt = FirstMIOfTerm;
 
   assert(MCIt != MBB->end() && "Start inst of terminator not found");
   


Index: llvm/lib/Target/SparcV9/InstrSelection/InstrSelectionSupport.cpp
diff -u llvm/lib/Target/SparcV9/InstrSelection/InstrSelectionSupport.cpp:1.61 llvm/lib/Target/SparcV9/InstrSelection/InstrSelectionSupport.cpp:1.61.2.1
--- llvm/lib/Target/SparcV9/InstrSelection/InstrSelectionSupport.cpp:1.61	Fri Jan  9 00:22:34 2004
+++ llvm/lib/Target/SparcV9/InstrSelection/InstrSelectionSupport.cpp	Mon Mar  1 17:58:15 2004
@@ -14,7 +14,7 @@
 
 #include "llvm/CodeGen/InstrSelectionSupport.h"
 #include "llvm/CodeGen/InstrSelection.h"
-#include "llvm/CodeGen/MachineInstrAnnot.h"
+#include "../MachineInstrAnnot.h"
 #include "llvm/CodeGen/MachineCodeForInstruction.h"
 #include "llvm/CodeGen/InstrForest.h"
 #include "llvm/Target/TargetMachine.h"
@@ -23,7 +23,7 @@
 #include "llvm/Constants.h"
 #include "llvm/BasicBlock.h"
 #include "llvm/DerivedTypes.h"
-#include "../SparcInstrSelectionSupport.h"
+#include "../SparcV9InstrSelectionSupport.h"
 
 namespace llvm {
 
@@ -71,7 +71,8 @@
       opType = isSigned? MachineOperand::MO_SignExtendedImmed
                        : MachineOperand::MO_UnextendedImmed;
       getImmedValue = intValue;
-  } else if (intValue == 0 && target.getRegInfo().getZeroRegNum() >= 0) {
+  } else if (intValue == 0 &&
+             target.getRegInfo().getZeroRegNum() != (unsigned)-1) {
     opType = MachineOperand::MO_MachineRegister;
     getMachineRegNum = target.getRegInfo().getZeroRegNum();
   }
@@ -129,7 +130,7 @@
 {
   std::vector<MachineInstr*> MVec;
   
-  MachineOpCode opCode = minstr->getOpCode();
+  MachineOpCode opCode = minstr->getOpcode();
   const TargetInstrInfo& instrInfo = target.getInstrInfo();
   int resultPos = instrInfo.getResultPos(opCode);
   int immedPos = instrInfo.getImmedConstantPos(opCode);


Index: llvm/lib/Target/SparcV9/InstrSelection/Makefile
diff -u llvm/lib/Target/SparcV9/InstrSelection/Makefile:1.4 llvm/lib/Target/SparcV9/InstrSelection/Makefile:1.4.2.1
--- llvm/lib/Target/SparcV9/InstrSelection/Makefile:1.4	Fri Jan  9 00:22:34 2004
+++ llvm/lib/Target/SparcV9/InstrSelection/Makefile	Mon Mar  1 17:58:15 2004
@@ -9,6 +9,6 @@
 
 LEVEL = ../../../..
 DIRS  = 
-LIBRARYNAME = select
+LIBRARYNAME = sparcv9select
 
 include $(LEVEL)/Makefile.common