diff --git a/include/llvm/Target/MachineInstrInfo.h b/include/llvm/Target/MachineInstrInfo.h
index a64cbbe8628..506cb9f7a02 100644
--- a/include/llvm/Target/MachineInstrInfo.h
+++ b/include/llvm/Target/MachineInstrInfo.h
@@ -209,6 +209,13 @@ public:
   virtual int maxLatency(MachineOpCode opCode) const {
     return getDescriptor(opCode).latency;
   }
+
+  //
+  // Which operand holds an immediate constant?  Returns -1 if none
+  // 
+  virtual int getImmmedConstantPos(MachineOpCode opCode) const {
+    return -1; // immediate position is machine specific, so say -1 == "none"
+  }
   
   // Check if the specified constant fits in the immediate field
   // of this machine instruction
diff --git a/include/llvm/Target/TargetInstrInfo.h b/include/llvm/Target/TargetInstrInfo.h
index a64cbbe8628..506cb9f7a02 100644
--- a/include/llvm/Target/TargetInstrInfo.h
+++ b/include/llvm/Target/TargetInstrInfo.h
@@ -209,6 +209,13 @@ public:
   virtual int maxLatency(MachineOpCode opCode) const {
     return getDescriptor(opCode).latency;
   }
+
+  //
+  // Which operand holds an immediate constant?  Returns -1 if none
+  // 
+  virtual int getImmmedConstantPos(MachineOpCode opCode) const {
+    return -1; // immediate position is machine specific, so say -1 == "none"
+  }
   
   // Check if the specified constant fits in the immediate field
   // of this machine instruction
diff --git a/lib/Target/SparcV9/SparcV9Internals.h b/lib/Target/SparcV9/SparcV9Internals.h
index 53a4beb6cec..c24b9bd3841 100644
--- a/lib/Target/SparcV9/SparcV9Internals.h
+++ b/lib/Target/SparcV9/SparcV9Internals.h
@@ -89,6 +89,22 @@ extern const MachineInstrDescriptor SparcMachineInstrDesc[];
 class UltraSparcInstrInfo : public MachineInstrInfo {
 public:
   /*ctor*/	UltraSparcInstrInfo(const TargetMachine& tgt);
+
+  //
+  // All immediate constants are in position 0 except the
+  // store instructions.
+  // 
+  virtual int getImmmedConstantPos(MachineOpCode opCode) const {
+    bool ignore;
+    if (this->maxImmedConstant(opCode, ignore) != 0)
+      {
+        assert(! this->isStore((MachineOpCode) STB - 1)); // first store is STB
+        assert(! this->isStore((MachineOpCode) STD + 1)); // last  store is STD
+        return (opCode >= STB || opCode <= STD)? 2 : 1;
+      }
+    else
+      return -1;
+  }
   
   virtual bool		hasResultInterlock	(MachineOpCode opCode) const
   {