diff options
| author | 2012-11-20 17:51:08 -0800 | |
|---|---|---|
| committer | 2012-11-20 17:51:09 -0800 | |
| commit | 024c463536180ce1e464bbb9853ab427dfac35f5 (patch) | |
| tree | d312d9f414a0ddec354b357436b3bbe83ce81656 /src/compiler/codegen/method_bitcode.cc | |
| parent | d91398cc7ed6ea8acf251bf1aa525df46d914044 (diff) | |
| parent | 1bc37c60da71c923ea9a2e99d31ba1b3d76d79a8 (diff) | |
Merge "Continuing Quick compiler refactoring" into dalvik-dev
Diffstat (limited to 'src/compiler/codegen/method_bitcode.cc')
| -rw-r--r-- | src/compiler/codegen/method_bitcode.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/compiler/codegen/method_bitcode.cc b/src/compiler/codegen/method_bitcode.cc index 2996e9a29f..72e3e68b3e 100644 --- a/src/compiler/codegen/method_bitcode.cc +++ b/src/compiler/codegen/method_bitcode.cc @@ -27,8 +27,11 @@ #include <llvm/Support/Casting.h> #include <llvm/Support/InstIterator.h> +#include "../compiler_internals.h" #include "method_codegen_driver.h" #include "local_optimizations.h" +#include "codegen_util.h" +#include "ralloc_util.h" static const char* kLabelFormat = "%c0x%x_%d"; static const char kInvalidBlock = 0xff; @@ -36,7 +39,10 @@ static const char kNormalBlock = 'L'; static const char kCatchBlock = 'C'; namespace art { -extern const RegLocation badLoc; +// TODO: unify badLoc +const RegLocation badLoc = {kLocDalvikFrame, 0, 0, 0, 0, 0, 0, 0, 0, + INVALID_REG, INVALID_REG, INVALID_SREG, + INVALID_SREG}; RegLocation getLoc(CompilationUnit* cUnit, llvm::Value* val); llvm::BasicBlock* getLLVMBlock(CompilationUnit* cUnit, int id) |