From 9fb0ac70e4627be7113533cc126483117bfca068 Mon Sep 17 00:00:00 2001 From: Serguei Katkov Date: Sat, 20 Feb 2016 12:55:24 +0600 Subject: Enable bytecode tracing in ART FI Trace bytecode execution in Fast Interpreter similar to other interpreters. Update TraceExecutionEnabled function to switch on tracing. Change-Id: Icabc17871c8198b11cd4c3dbfaa901e4fbf67946 Signed-off-by: Serguei Katkov --- runtime/interpreter/mterp/mterp.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'runtime/interpreter/mterp/mterp.cc') diff --git a/runtime/interpreter/mterp/mterp.cc b/runtime/interpreter/mterp/mterp.cc index 15745d2731..1a90acd799 100644 --- a/runtime/interpreter/mterp/mterp.cc +++ b/runtime/interpreter/mterp/mterp.cc @@ -47,7 +47,9 @@ void CheckMterpAsmConstants() { void InitMterpTls(Thread* self) { self->SetMterpDefaultIBase(artMterpAsmInstructionStart); self->SetMterpAltIBase(artMterpAsmAltInstructionStart); - self->SetMterpCurrentIBase(artMterpAsmInstructionStart); + self->SetMterpCurrentIBase(TraceExecutionEnabled() ? + artMterpAsmAltInstructionStart : + artMterpAsmInstructionStart); } /* @@ -445,6 +447,7 @@ extern "C" void MterpCheckBefore(Thread* self, ShadowFrame* shadow_frame) } else { self->AssertNoPendingException(); } + TraceExecution(*shadow_frame, inst, shadow_frame->GetDexPC()); } extern "C" void MterpLogDivideByZeroException(Thread* self, ShadowFrame* shadow_frame) -- cgit v1.2.3