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

Unified Diff: runtime/vm/assembler_x64.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/assembler_x64.h ('k') | runtime/vm/code_patcher.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/assembler_x64.cc
===================================================================
--- runtime/vm/assembler_x64.cc (revision 31811)
+++ runtime/vm/assembler_x64.cc (working copy)
@@ -104,6 +104,32 @@
object_pool_.Add(Object::null_object(), Heap::kOld);
patchable_pool_entries_.Add(kNotPatchable);
}
+
+ // Create fixed object pool entries for debugger stubs.
+ if (StubCode::BreakpointStatic_entry() != NULL) {
+ intptr_t index =
+ FindExternalLabel(&StubCode::BreakpointStaticLabel(), kNotPatchable);
+ ASSERT(index == kBreakpointStaticCPIndex);
+ } else {
+ object_pool_.Add(Object::null_object(), Heap::kOld);
+ patchable_pool_entries_.Add(kNotPatchable);
+ }
+ if (StubCode::BreakpointDynamic_entry() != NULL) {
+ intptr_t index =
+ FindExternalLabel(&StubCode::BreakpointDynamicLabel(), kNotPatchable);
+ ASSERT(index == kBreakpointDynamicCPIndex);
+ } else {
+ object_pool_.Add(Object::null_object(), Heap::kOld);
+ patchable_pool_entries_.Add(kNotPatchable);
+ }
+ if (StubCode::BreakpointRuntime_entry() != NULL) {
+ intptr_t index =
+ FindExternalLabel(&StubCode::BreakpointRuntimeLabel(), kNotPatchable);
+ ASSERT(index == kBreakpointRuntimeCPIndex);
+ } else {
+ object_pool_.Add(Object::null_object(), Heap::kOld);
+ patchable_pool_entries_.Add(kNotPatchable);
+ }
}
}
« no previous file with comments | « runtime/vm/assembler_x64.h ('k') | runtime/vm/code_patcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698