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

Unified Diff: runtime/vm/stub_code_ia32.cc

Issue 600243002: Patchable AllocateArray stub, like instance allocation stubs. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 6 years, 3 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/stub_code_arm64.cc ('k') | runtime/vm/stub_code_mips.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/stub_code_ia32.cc
===================================================================
--- runtime/vm/stub_code_ia32.cc (revision 40629)
+++ runtime/vm/stub_code_ia32.cc (working copy)
@@ -411,6 +411,29 @@
}
+// Called from array allocate instruction when the allocation stub has been
+// disabled.
+// EDX: length (preserved).
+// ECX: element type (preserved).
+void StubCode::GenerateFixAllocateArrayStubTargetStub(Assembler* assembler) {
+ const Immediate& raw_null =
+ Immediate(reinterpret_cast<intptr_t>(Object::null()));
+ __ EnterStubFrame();
+ __ pushl(EDX); // Preserve length.
+ __ pushl(ECX); // Preserve element type.
+ __ pushl(raw_null); // Setup space on stack for return value.
+ __ CallRuntime(kFixAllocationStubTargetRuntimeEntry, 0);
+ __ popl(EAX); // Get Code object.
+ __ popl(ECX); // Restore element type.
+ __ popl(EDX); // Restore length.
+ __ movl(EAX, FieldAddress(EAX, Code::instructions_offset()));
+ __ addl(EAX, Immediate(Instructions::HeaderSize() - kHeapObjectTag));
+ __ LeaveFrame();
+ __ jmp(EAX);
+ __ int3();
+}
+
+
// Input parameters:
// EDX: smi-tagged argument count, may be zero.
// EBP[kParamEndSlotFromFp + 1]: last argument.
@@ -422,7 +445,9 @@
// Allocate array to store arguments of caller.
__ movl(ECX, raw_null); // Null element type for raw Array.
- __ call(&stub_code->AllocateArrayLabel());
+ const Code& array_stub = Code::Handle(stub_code->GetAllocateArrayStub());
+ const ExternalLabel array_label(array_stub.EntryPoint());
+ __ call(&array_label);
__ SmiUntag(EDX);
// EAX: newly allocated array.
// EDX: length of the array (was preserved by the stub).
@@ -610,7 +635,9 @@
// ECX : array element type (either NULL or an instantiated type).
// Uses EAX, EBX, ECX, EDI as temporary registers.
// The newly allocated object is returned in EAX.
-void StubCode::GenerateAllocateArrayStub(Assembler* assembler) {
+void StubCode::GeneratePatchableAllocateArrayStub(Assembler* assembler,
+ uword* entry_patch_offset, uword* patch_code_pc_offset) {
+ *entry_patch_offset = assembler->CodeSize();
Label slow_case;
const Immediate& raw_null =
Immediate(reinterpret_cast<intptr_t>(Object::null()));
@@ -738,6 +765,11 @@
__ popl(EAX); // Pop return value from return slot.
__ LeaveFrame();
__ ret();
+ // Emit function patching code. This will be swapped with the first 5 bytes
+ // at entry point.
+ *patch_code_pc_offset = assembler->CodeSize();
+ StubCode* stub_code = Isolate::Current()->stub_code();
+ __ jmp(&stub_code->FixAllocateArrayStubTargetLabel());
}
« no previous file with comments | « runtime/vm/stub_code_arm64.cc ('k') | runtime/vm/stub_code_mips.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698