diff options
| author | 2012-11-16 16:50:17 -0800 | |
|---|---|---|
| committer | 2012-11-16 16:50:18 -0800 | |
| commit | 6aa852b927a12ba16f5c05ee7d044ac1372feb7f (patch) | |
| tree | e88e202952fcf09fad44a58eb366b6a59dcd0424 /src/compiler/codegen/method_bitcode.cc | |
| parent | 2bcb4a496b7aa00d996df3a070524f7568fb35a1 (diff) | |
| parent | eaf09bc65f9a10d12befcdb239156938c9bceef2 (diff) | |
Merge "Quick compiler: more refactoring" into dalvik-dev
Diffstat (limited to 'src/compiler/codegen/method_bitcode.cc')
| -rw-r--r-- | src/compiler/codegen/method_bitcode.cc | 7 |
1 files changed, 5 insertions, 2 deletions
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 <llvm/Support/Casting.h> #include <llvm/Support/InstIterator.h> +#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<llvm::ConstantInt*>(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 { |