commit 0f6784737882199197796b67b99e5f1ded383bee
author Ian Rogers <irogers@google.com> Mon Mar 10 16:18:37 2014 -0700
committer Ian Rogers <irogers@google.com> Mon Mar 10 18:02:07 2014 -0700
tree 139888bdfad743c50e800ad46b9aec97ae3415d3
parent 73a471336a9515fa7fdc5859e3c481ec451237a5

Unify 64bit int constant definitions.

LL and ULL prefixes are word size dependent, use the INT64_C and UINT64_C
macros instead.

Change-Id: I5b70027651898814fc0b3e9e22a18a1047e76cb9

compiler/dex/quick/arm/fp_arm.cc

diff --git a/compiler/dex/quick/arm/fp_arm.cc b/compiler/dex/quick/arm/fp_arm.cc
index cdbfa35..6868f6f 100644
--- a/compiler/dex/quick/arm/fp_arm.cc
+++ b/compiler/dex/quick/arm/fp_arm.cc
@@ -151,7 +151,7 @@
 
       NewLIR2(kThumb2VcvtF64S32, tmp1 | ARM_FP_DOUBLE, (src_reg & ~ARM_FP_DOUBLE) + 1);
       NewLIR2(kThumb2VcvtF64U32, S2d(rl_result.reg.GetReg(), rl_result.reg.GetHighReg()), (src_reg & ~ARM_FP_DOUBLE));
-      LoadConstantWide(tmp2, tmp2 + 1, 0x41f0000000000000LL);
+      LoadConstantWide(tmp2, tmp2 + 1, INT64_C(0x41f0000000000000));
       NewLIR3(kThumb2VmlaF64, S2d(rl_result.reg.GetReg(), rl_result.reg.GetHighReg()), tmp1 | ARM_FP_DOUBLE,
               tmp2 | ARM_FP_DOUBLE);
       FreeTemp(tmp1);
@@ -173,7 +173,7 @@
       // Long to double.
       NewLIR2(kThumb2VcvtF64S32, high_val | ARM_FP_DOUBLE, (src_reg & ~ARM_FP_DOUBLE) + 1);
       NewLIR2(kThumb2VcvtF64U32, low_val | ARM_FP_DOUBLE, (src_reg & ~ARM_FP_DOUBLE));
-      LoadConstantWide(const_val, const_val + 1, 0x41f0000000000000LL);
+      LoadConstantWide(const_val, const_val + 1, INT64_C(0x41f0000000000000));
       NewLIR3(kThumb2VmlaF64, low_val | ARM_FP_DOUBLE, high_val | ARM_FP_DOUBLE,
           const_val | ARM_FP_DOUBLE);
       // Double to float.

compiler/dex/quick/arm/utility_arm.cc

diff --git a/compiler/dex/quick/arm/utility_arm.cc b/compiler/dex/quick/arm/utility_arm.cc
index c2cfb4d..8b02a42 100644
--- a/compiler/dex/quick/arm/utility_arm.cc
+++ b/compiler/dex/quick/arm/utility_arm.cc
@@ -49,12 +49,12 @@
  */
 static int32_t EncodeImmDouble(int64_t value) {
   int32_t res;
-  int32_t bit_a = (value & 0x8000000000000000ll) >> 63;
-  int32_t not_bit_b = (value & 0x4000000000000000ll) >> 62;
-  int32_t bit_b = (value & 0x2000000000000000ll) >> 61;
-  int32_t b_smear = (value & 0x3fc0000000000000ll) >> 54;
-  int32_t slice =  (value & 0x003f000000000000ll) >> 48;
-  uint64_t zeroes = (value & 0x0000ffffffffffffll);
+  int32_t bit_a = (value & INT64_C(0x8000000000000000)) >> 63;
+  int32_t not_bit_b = (value & INT64_C(0x4000000000000000)) >> 62;
+  int32_t bit_b = (value & INT64_C(0x2000000000000000)) >> 61;
+  int32_t b_smear = (value & INT64_C(0x3fc0000000000000)) >> 54;
+  int32_t slice =  (value & INT64_C(0x003f000000000000)) >> 48;
+  uint64_t zeroes = (value & INT64_C(0x0000ffffffffffff));
   if (zeroes != 0ull)
     return -1;
   if (bit_b) {