From eaf09bc65f9a10d12befcdb239156938c9bceef2 Mon Sep 17 00:00:00 2001 From: buzbee Date: Thu, 15 Nov 2012 14:51:41 -0800 Subject: Quick compiler: more refactoring Focus on header file cleanup here. Note: target_list.h is transitional, and upcoming CLs will do additional header file reorganization. Change-Id: If86e1a8c1c43305762fe37b157a9d3c17d911ea7 --- src/compiler/codegen/method_bitcode.cc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/compiler/codegen/method_bitcode.cc') diff --git a/src/compiler/codegen/method_bitcode.cc b/src/compiler/codegen/method_bitcode.cc index 1e81458dca..d6f1ae9034 100644 --- a/src/compiler/codegen/method_bitcode.cc +++ b/src/compiler/codegen/method_bitcode.cc @@ -27,6 +27,9 @@ #include #include +#include "method_codegen_driver.h" +#include "local_optimizations.h" + static const char* kLabelFormat = "%c0x%x_%d"; static const char kInvalidBlock = 0xff; static const char kNormalBlock = 'L'; @@ -2819,8 +2822,8 @@ void cvtSwitch(CompilationUnit* cUnit, llvm::Instruction* inst) static_cast(tableOffsetNode->getOperand(0)); int32_t tableOffset = tableOffsetValue->getSExtValue(); RegLocation rlSrc = getLoc(cUnit, testVal); - const u2* table = cUnit->insns + cUnit->currentDalvikOffset + tableOffset; - u2 tableMagic = *table; + const uint16_t* table = cUnit->insns + cUnit->currentDalvikOffset + tableOffset; + uint16_t tableMagic = *table; if (tableMagic == 0x100) { genPackedSwitch(cUnit, tableOffset, rlSrc); } else { -- cgit v1.2.3-59-g8ed1b