From 5433072f589b61413e042eddf76e8190a048f71d Mon Sep 17 00:00:00 2001
From: buzbee <buzbee@google.com>
Date: Tue, 23 Aug 2011 16:46:55 -0700
Subject: Added support for 64-bit shifts, fix const-wide

Change-Id: I4823056d83652ecc7d3e391e905d480d73fab718
---
 src/compiler/codegen/arm/MethodCodegenDriver.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/compiler/codegen/arm/MethodCodegenDriver.cc')

diff --git a/src/compiler/codegen/arm/MethodCodegenDriver.cc b/src/compiler/codegen/arm/MethodCodegenDriver.cc
index fd1b8a7ac8..483d7a7048 100644
--- a/src/compiler/codegen/arm/MethodCodegenDriver.cc
+++ b/src/compiler/codegen/arm/MethodCodegenDriver.cc
@@ -897,7 +897,8 @@ static bool compileDalvikInstruction(CompilationUnit* cUnit, MIR* mir,
         case OP_CONST_WIDE:
             rlResult = oatEvalLoc(cUnit, rlDest, kAnyReg, true);
             loadConstantValueWide(cUnit, rlResult.lowReg, rlResult.highReg,
-                                  0, mir->dalvikInsn.vB);
+                          mir->dalvikInsn.vB_wide & 0xffffffff,
+                          (mir->dalvikInsn.vB_wide >> 32) & 0xffffffff);
             storeValueWide(cUnit, rlDest, rlResult);
             break;
 
-- 
cgit v1.2.3-59-g8ed1b