1 files changed, 24 insertions, 24 deletions

diff --git a/llvm/lib/Target/Sparc/SparcInstrSelectionSupport.h b/llvm/lib/Target/Sparc/SparcInstrSelectionSupport.h
index 9038a4db85a..aea482e9274 100644
--- a/llvm/lib/Target/Sparc/SparcInstrSelectionSupport.h
+++ b/llvm/lib/Target/Sparc/SparcInstrSelectionSupport.h
@@ -14,17 +14,17 @@ ChooseLoadInstruction(const Type *DestTy)
 {
   switch (DestTy->getPrimitiveID()) {
   case Type::BoolTyID:
-  case Type::UByteTyID:   return LDUB;
-  case Type::SByteTyID:   return LDSB;
-  case Type::UShortTyID:  return LDUH;
-  case Type::ShortTyID:   return LDSH;
-  case Type::UIntTyID:    return LDUW;
-  case Type::IntTyID:     return LDSW;
+  case Type::UByteTyID:   return V9::LDUB;
+  case Type::SByteTyID:   return V9::LDSB;
+  case Type::UShortTyID:  return V9::LDUH;
+  case Type::ShortTyID:   return V9::LDSH;
+  case Type::UIntTyID:    return V9::LDUW;
+  case Type::IntTyID:     return V9::LDSW;
   case Type::PointerTyID:
   case Type::ULongTyID:
-  case Type::LongTyID:    return LDX;
-  case Type::FloatTyID:   return LD;
-  case Type::DoubleTyID:  return LDD;
+  case Type::LongTyID:    return V9::LDX;
+  case Type::FloatTyID:   return V9::LD;
+  case Type::DoubleTyID:  return V9::LDD;
   default: assert(0 && "Invalid type for Load instruction");
   }
   
@@ -37,16 +37,16 @@ ChooseStoreInstruction(const Type *DestTy)
   switch (DestTy->getPrimitiveID()) {
   case Type::BoolTyID:
   case Type::UByteTyID:
-  case Type::SByteTyID:   return STB;
+  case Type::SByteTyID:   return V9::STB;
   case Type::UShortTyID:
-  case Type::ShortTyID:   return STH;
+  case Type::ShortTyID:   return V9::STH;
   case Type::UIntTyID:
-  case Type::IntTyID:     return STW;
+  case Type::IntTyID:     return V9::STW;
   case Type::PointerTyID:
   case Type::ULongTyID:
-  case Type::LongTyID:    return STX;
-  case Type::FloatTyID:   return ST;
-  case Type::DoubleTyID:  return STD;
+  case Type::LongTyID:    return V9::STX;
+  case Type::FloatTyID:   return V9::ST;
+  case Type::DoubleTyID:  return V9::STD;
   default: assert(0 && "Invalid type for Store instruction");
   }
   
@@ -57,22 +57,22 @@ ChooseStoreInstruction(const Type *DestTy)
 inline MachineOpCode 
 ChooseAddInstructionByType(const Type* resultType)
 {
-  MachineOpCode opCode = INVALID_OPCODE;
+  MachineOpCode opCode = V9::INVALID_OPCODE;
   
   if (resultType->isIntegral() ||
       isa<PointerType>(resultType) ||
       isa<FunctionType>(resultType) ||
       resultType == Type::LabelTy)
-    {
-      opCode = ADD;
-    }
+  {
+    opCode = V9::ADD;
+  }
   else
     switch(resultType->getPrimitiveID())
-      {
-      case Type::FloatTyID:  opCode = FADDS; break;
-      case Type::DoubleTyID: opCode = FADDD; break;
-      default: assert(0 && "Invalid type for ADD instruction"); break; 
-      }
+    {
+    case Type::FloatTyID:  opCode = V9::FADDS; break;
+    case Type::DoubleTyID: opCode = V9::FADDD; break;
+    default: assert(0 && "Invalid type for ADD instruction"); break; 
+    }
   
   return opCode;
 }