diff options
| author | Udayan Banerji <udayan.banerji@intel.com> | 2013-03-29 14:05:18 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2013-04-01 16:34:35 -0700 |
| commit | ed2876e520bbdf295f894c5fb7c5a58bf90bf60f (patch) | |
| tree | 7328054d0c2069aa2ca3d57a97f2fcd5086cf733 /vm/compiler/codegen/x86/LowerReturn.cpp | |
| parent | 82c80de14da66b80474b298ae99cbff37cdf9b53 (diff) | |
[x86] Fix errors with WITH_JIT_TUNING defined
This patch makes the necessary changes to pass on correct information to
dvmBumpNoChain, so that WITH_JIT_TUNING flag can be enabled for x86 codegen
Signed-off-by: Udayan Banerji <udayan.banerji@intel.com>
(cherry picked from commit 19eb287ac848f10e03ca2614bf53bd9d1ddd3724)
Change-Id: I6871dd0839b3656beed4633e3a0f3df780af98a0
Diffstat (limited to 'vm/compiler/codegen/x86/LowerReturn.cpp')
| -rw-r--r-- | vm/compiler/codegen/x86/LowerReturn.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/vm/compiler/codegen/x86/LowerReturn.cpp b/vm/compiler/codegen/x86/LowerReturn.cpp index 928c05c9f..294d6b59d 100644 --- a/vm/compiler/codegen/x86/LowerReturn.cpp +++ b/vm/compiler/codegen/x86/LowerReturn.cpp @@ -95,7 +95,11 @@ int common_returnFromMethod() { typedef void (*vmHelper)(int); vmHelper funcPtr = dvmJitToInterpNoChainNoProfile; //%eax is the input move_imm_to_reg(OpndSize_32, (int)funcPtr, C_SCRATCH_1, isScratchPhysical); - +#if defined(WITH_JIT_TUNING) + /* Return address not in code cache. Indicate that continuing with interpreter. + */ + move_imm_to_mem(OpndSize_32, kCallsiteInterpreted, 0, PhysicalReg_ESP, true); +#endif unconditional_jump_reg(C_SCRATCH_1, isScratchPhysical); touchEax(); return 0; |