Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(248)

Unified Diff: runtime/vm/debugger_mips.cc

Issue 131853006: Fix debugger stub patching on x64 architecture (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/vm/debugger_ia32.cc ('k') | runtime/vm/debugger_x64.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/debugger_mips.cc
===================================================================
--- runtime/vm/debugger_mips.cc (revision 31811)
+++ runtime/vm/debugger_mips.cc (working copy)
@@ -5,6 +5,7 @@
#include "vm/globals.h"
#if defined(TARGET_ARCH_MIPS)
+#include "vm/code_patcher.h"
#include "vm/cpu.h"
#include "vm/debugger.h"
#include "vm/instructions.h"
@@ -31,6 +32,72 @@
*reinterpret_cast<uword*>(closure_addr));
}
+
+uword CodeBreakpoint::OrigStubAddress() const {
+ return saved_value_;
+}
+
+
+void CodeBreakpoint::PatchCode() {
+ ASSERT(!is_enabled_);
+ switch (breakpoint_kind_) {
+ case PcDescriptors::kIcCall: {
+ const Code& code =
+ Code::Handle(Function::Handle(function_).unoptimized_code());
+ saved_value_ = CodePatcher::GetInstanceCallAt(pc_, code, NULL);
+ CodePatcher::PatchInstanceCallAt(pc_, code,
+ StubCode::BreakpointDynamicEntryPoint());
+ break;
+ }
+ case PcDescriptors::kUnoptStaticCall: {
+ const Code& code =
+ Code::Handle(Function::Handle(function_).unoptimized_code());
+ saved_value_ = CodePatcher::GetStaticCallTargetAt(pc_, code);
+ CodePatcher::PatchStaticCallAt(pc_, code,
+ StubCode::BreakpointStaticEntryPoint());
+ break;
+ }
+ case PcDescriptors::kRuntimeCall:
+ case PcDescriptors::kClosureCall:
+ case PcDescriptors::kReturn: {
+ const Code& code =
+ Code::Handle(Function::Handle(function_).unoptimized_code());
+ saved_value_ = CodePatcher::GetStaticCallTargetAt(pc_, code);
+ CodePatcher::PatchStaticCallAt(pc_, code,
+ StubCode::BreakpointRuntimeEntryPoint());
+ break;
+ }
+ default:
+ UNREACHABLE();
+ }
+ is_enabled_ = true;
+}
+
+
+void CodeBreakpoint::RestoreCode() {
+ ASSERT(is_enabled_);
+ switch (breakpoint_kind_) {
+ case PcDescriptors::kIcCall: {
+ const Code& code =
+ Code::Handle(Function::Handle(function_).unoptimized_code());
+ CodePatcher::PatchInstanceCallAt(pc_, code, saved_value_);
+ break;
+ }
+ case PcDescriptors::kUnoptStaticCall:
+ case PcDescriptors::kClosureCall:
+ case PcDescriptors::kRuntimeCall:
+ case PcDescriptors::kReturn: {
+ const Code& code =
+ Code::Handle(Function::Handle(function_).unoptimized_code());
+ CodePatcher::PatchStaticCallAt(pc_, code, saved_value_);
+ break;
+ }
+ default:
+ UNREACHABLE();
+ }
+ is_enabled_ = false;
+}
+
} // namespace dart
#endif // defined TARGET_ARCH_MIPS
« no previous file with comments | « runtime/vm/debugger_ia32.cc ('k') | runtime/vm/debugger_x64.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698