diff options
| author | 2012-09-18 08:57:04 -0700 | |
|---|---|---|
| committer | 2012-09-21 17:32:56 -0700 | |
| commit | 66f19258f9728d4ffe026074d8fd429d639802fa (patch) | |
| tree | fd94009774c6cbbb1528ea096e606133bd35f104 /src/compiler/codegen/GenInvoke.cc | |
| parent | a5e1e3d153990845d80cb8d013157210f11a473c (diff) | |
Change dex cache to be java object instead of array, add pointer to dex file in dex cache.
Generic clean up to facilitate having GDB macros for Pretty* helper functions.
Improved cleanliness of DexCache since having it as an object array was not the best solution.
Fixed a bug in InOrderWalk caused by ResolveType sometimes allocating classes.
Rename C++ Method to AbstractMethod and add two new classes Constructor, Method which both inherit from AbstractMethod.
Rename done to have the C++ code be closer to the java code.
Change-Id: I4995b4c5e47a3822192b08afa24a639d3b1f4da9
Diffstat (limited to 'src/compiler/codegen/GenInvoke.cc')
| -rw-r--r-- | src/compiler/codegen/GenInvoke.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/compiler/codegen/GenInvoke.cc b/src/compiler/codegen/GenInvoke.cc index ba580f8b88..3cc7c93511 100644 --- a/src/compiler/codegen/GenInvoke.cc +++ b/src/compiler/codegen/GenInvoke.cc @@ -193,7 +193,7 @@ int nextSDCallInsn(CompilationUnit* cUnit, CallInfo* info, break; case 1: // Get method->dex_cache_resolved_methods_ loadWordDisp(cUnit, rARG0, - Method::DexCacheResolvedMethodsOffset().Int32Value(), + AbstractMethod::DexCacheResolvedMethodsOffset().Int32Value(), rARG0); // Set up direct code if known. if (directCode != 0) { @@ -224,7 +224,7 @@ int nextSDCallInsn(CompilationUnit* cUnit, CallInfo* info, #if !defined(TARGET_X86) case 3: // Grab the code from the method* if (directCode == 0) { - loadWordDisp(cUnit, rARG0, Method::GetCodeOffset().Int32Value(), + loadWordDisp(cUnit, rARG0, AbstractMethod::GetCodeOffset().Int32Value(), rINVOKE_TGT); } break; @@ -273,7 +273,7 @@ int nextVCallInsn(CompilationUnit* cUnit, CallInfo* info, break; #if !defined(TARGET_X86) case 4: // Get the compiled code address [uses rARG0, sets rINVOKE_TGT] - loadWordDisp(cUnit, rARG0, Method::GetCodeOffset().Int32Value(), + loadWordDisp(cUnit, rARG0, AbstractMethod::GetCodeOffset().Int32Value(), rINVOKE_TGT); break; #endif |