Fix up some types and constants

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

diff --git a/lib/Target/Alpha/AlphaISelPattern.cpp b/lib/Target/Alpha/AlphaISelPattern.cpp
index 2fad66fad4539f7a0f137f551b9cca1f8d65abab..0717dc1dbb50e55af5ff569a81b8bf9fe327ae59 100644 (file)
--- a/lib/Target/Alpha/AlphaISelPattern.cpp
+++ b/lib/Target/Alpha/AlphaISelPattern.cpp
@@ -327,8 +327,8 @@ public:
 }
 
 //These describe LDAx
-static const int64_t IMM_LOW  = 0xffffffffffff8000LL;
-static const int IMM_HIGH = 0x0000000000007fffLL;
+static const int IMM_LOW  = -32768;
+static const int IMM_HIGH = 32767;
 static const int IMM_MULT = 65536;
 
 static long getUpper16(long l)
@@ -1325,8 +1325,6 @@ unsigned ISel::SelectExpr(SDOperand N) {
           BuildMI(BB, Alpha::ADDQi, 2, Tmp4).addReg(Alpha::R31).addImm(1);
           Opc = inv?Alpha::CMOVNEi_FP:Alpha::CMOVEQi_FP;
           BuildMI(BB, Opc, 3, Result).addReg(Tmp4).addImm(0).addReg(Tmp3);
-//           Opc = inv?Alpha::CC2INT_INV:Alpha::CC2INT;
-//           BuildMI(BB, Opc, 1, Result).addReg(Tmp3);
 
 //           // Spill the FP to memory and reload it from there.
 //           unsigned Size = MVT::getSizeInBits(MVT::f64)/8;
@@ -1515,7 +1513,7 @@ unsigned ISel::SelectExpr(SDOperand N) {
 
   case ISD::Constant:
     {
-      int64_t val = (long)cast<ConstantSDNode>(N)->getValue();
+      int64_t val = (int64_t)cast<ConstantSDNode>(N)->getValue();
       if (val <= IMM_HIGH && val >= IMM_LOW) {
        BuildMI(BB, Alpha::LDA, 2, Result).addImm(val).addReg(Alpha::R31);
       }

diff --git a/lib/Target/Alpha/AlphaRegisterInfo.cpp b/lib/Target/Alpha/AlphaRegisterInfo.cpp
index 3c8c616f000162cf27dc1d85f08e447dd09ccf11..96a05938f1a59f32fe447963f64885a67c82443a 100644 (file)
--- a/lib/Target/Alpha/AlphaRegisterInfo.cpp
+++ b/lib/Target/Alpha/AlphaRegisterInfo.cpp
@@ -31,8 +31,8 @@
 using namespace llvm;
 
 //These describe LDAx
-static const int64_t IMM_LOW  = 0xffffffffffff8000LL;
-static const int IMM_HIGH = 0x0000000000007fffLL;
+static const int IMM_LOW  = -32768;
+static const int IMM_HIGH = 32767;
 static const int IMM_MULT = 65536;
 
 static long getUpper16(long l)