* Convert load/store opcodes from register to immediate forms.

* Stop code from wrapping to the next line.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@6566 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Target/SparcV9/SparcV9InstrSelection.cpp b/lib/Target/SparcV9/SparcV9InstrSelection.cpp
index 38a6c1652f3845c655eca3734f54a9bffbec8cf1..db49c4ebde230c8f5c0565bd57e48198a40499b7 100644 (file)
--- a/lib/Target/SparcV9/SparcV9InstrSelection.cpp
+++ b/lib/Target/SparcV9/SparcV9InstrSelection.cpp
@@ -2228,15 +2228,16 @@ GetInstructionsByRule(InstructionNode* subtreeRoot,
               // float-to-int instructions to pass the value as an int.
               // To check if it is in teh first $K$, get the register
               // number for the arg #i.
-              int copyRegNum = regInfo.regNumForIntArg(false, false,
-                                                       argNo, regClassIDOfArgReg);
+              int copyRegNum = regInfo.regNumForIntArg(false, false, argNo,
+                                                       regClassIDOfArgReg);
               if (copyRegNum != regInfo.getInvalidRegNum()) {
                 // Create a virtual register to represent copyReg. Mark
                 // this vreg as being an implicit operand of the call MI
                 const Type* loadTy = (argType == Type::FloatTy
                                       ? Type::IntTy : Type::LongTy);
-                TmpInstruction* argVReg= new TmpInstruction(mcfi,loadTy,
-                                                            argVal, NULL, "argRegCopy");
+                TmpInstruction* argVReg = new TmpInstruction(mcfi, loadTy,
+                                                             argVal, NULL,
+                                                             "argRegCopy");
                 callMI->addImplicitRef(argVReg);
                         
                 // Get a temp stack location to use to copy
@@ -2251,22 +2252,23 @@ GetInstructionsByRule(InstructionNode* subtreeRoot,
                 int tmpOffset = MF.getInfo()->allocateLocalVar(argVReg);
                     
                 // Generate the store from FP reg to stack
-                M = BuildMI(ChooseStoreInstruction(argType), 3)
+                unsigned StoreOpcode = ChooseStoreInstruction(argType);
+                M = BuildMI(convertOpcodeFromRegToImm(StoreOpcode), 3)
                   .addReg(argVal).addMReg(regInfo.getFramePointer())
                   .addSImm(tmpOffset);
                 mvec.push_back(M);
                         
                 // Generate the load from stack to int arg reg
-                M = BuildMI(ChooseLoadInstruction(loadTy), 3)
+                unsigned LoadOpcode = ChooseLoadInstruction(loadTy);
+                M = BuildMI(convertOpcodeFromRegToImm(LoadOpcode), 3)
                   .addMReg(regInfo.getFramePointer()).addSImm(tmpOffset)
                   .addReg(argVReg, MOTy::Def);
 
                 // Mark operand with register it should be assigned
                 // both for copy and for the callMI
                 M->SetRegForOperand(M->getNumOperands()-1, copyRegNum);
-                callMI->SetRegForImplicitRef(
-                                             callMI->getNumImplicitRefs()-1, copyRegNum);
-
+                callMI->SetRegForImplicitRef(callMI->getNumImplicitRefs()-1,
+                                             copyRegNum);
                 mvec.push_back(M);
 
                 // Add info about the argument to the CallArgsDescriptor