From ff093b31d75658c3404f9b51ee45760f346f06d9 Mon Sep 17 00:00:00 2001 From: Ian Rogers Date: Wed, 30 Apr 2014 19:04:27 -0700 Subject: Fix a few 64-bit compilation of 32-bit code issues. Bug: 13423943 Change-Id: I939389413af0a68c0d95b23cd598b7c42afa4383 --- compiler/dex/quick/codegen_util.cc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'compiler/dex/quick/codegen_util.cc') diff --git a/compiler/dex/quick/codegen_util.cc b/compiler/dex/quick/codegen_util.cc index c3f9b673d2..b030bb4ec8 100644 --- a/compiler/dex/quick/codegen_util.cc +++ b/compiler/dex/quick/codegen_util.cc @@ -555,8 +555,8 @@ static int AssignLiteralOffsetCommon(LIR* lir, CodeOffset offset) { return offset; } -static int AssignLiteralPointerOffsetCommon(LIR* lir, CodeOffset offset) { - unsigned int element_size = sizeof(void*); +static int AssignLiteralPointerOffsetCommon(LIR* lir, CodeOffset offset, + unsigned int element_size) { // Align to natural pointer size. offset = (offset + (element_size - 1)) & ~(element_size - 1); for (; lir != NULL; lir = lir->next) { @@ -726,9 +726,10 @@ void Mir2Lir::CreateNativeGcMap() { /* Determine the offset of each literal field */ int Mir2Lir::AssignLiteralOffset(CodeOffset offset) { offset = AssignLiteralOffsetCommon(literal_list_, offset); - offset = AssignLiteralPointerOffsetCommon(code_literal_list_, offset); - offset = AssignLiteralPointerOffsetCommon(method_literal_list_, offset); - offset = AssignLiteralPointerOffsetCommon(class_literal_list_, offset); + unsigned int ptr_size = GetInstructionSetPointerSize(cu_->instruction_set); + offset = AssignLiteralPointerOffsetCommon(code_literal_list_, offset, ptr_size); + offset = AssignLiteralPointerOffsetCommon(method_literal_list_, offset, ptr_size); + offset = AssignLiteralPointerOffsetCommon(class_literal_list_, offset, ptr_size); return offset; } -- cgit v1.2.3-59-g8ed1b