runtime/vm/stub_code_ia32.cc - Issue 8357034: Transitioning to new IC structure: change IC data to include function name; pass IC data instead ...

Unified Diff: runtime/vm/stub_code_ia32.cc

Issue 8357034: Transitioning to new IC structure: change IC data to include function name; pass IC data instead ... (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/

Patch Set: '' Created 9 years, 2 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

Index: runtime/vm/stub_code_ia32.cc

===================================================================

--- runtime/vm/stub_code_ia32.cc (revision 633)

+++ runtime/vm/stub_code_ia32.cc (working copy)

@@ -7,6 +7,7 @@

#include "vm/code_generator.h"

#include "vm/compiler.h"

+#include "vm/ic_data.h"

#include "vm/object_store.h"

#include "vm/pages.h"

#include "vm/resolver.h"

@@ -224,7 +225,8 @@

// Stub is entered after a call but before the callee's frame has been

// constructed.

// Handle stack overflow by calling the runtime routine and preserving

-// the argument descriptor (EDX) and the name/function object of the call (ECX).

+// the argument descriptor (EDX) and the ic-data array/function object of

+// the call (ECX).

// The stub must be able to return to callee in case the stack overflow

// exception is not thrown.

void StubCode::GenerateStackOverflowStub(Assembler* assembler) {

@@ -235,9 +237,9 @@

// TOS + 2: Last argument of caller.

// ....

__ pushl(EDX); // Preserve arguments descriptor array.

- __ pushl(ECX); // Preserve object (function name or function object).

+ __ pushl(ECX); // Preserve object (ic-data array or function object).

__ CallRuntimeFromStub(kStackOverflowRuntimeEntry);

- __ popl(ECX); // Restore object (function name or function object).

+ __ popl(ECX); // Restore object (ic-data array or function object).

__ popl(EDX); // Restore arguments descriptor array.

__ LeaveFrame();

__ int3();

@@ -290,7 +292,7 @@

// Lookup for [function-name, arg count] in 'functions_map_'.

// Input parameters (to be treated as read only, unless calling to target!):

-// ECX: function name string.

+// ECX: ic-data array.

// EDX: arguments descriptor array (num_args is first Smi element).

// Stack: return address, arguments.

// If the lookup succeeds we jump to the target method from here, otherwise

@@ -339,7 +341,8 @@

__ cmpl(EDI, raw_null);

__ j(EQUAL, &not_found, Assembler::kNearJump);

- __ cmpl(EDI, ECX);

+ ASSERT(ICData::kNameIndex == 0);

+ __ cmpl(EDI, FieldAddress(ECX, Array::data_offset()));

__ j(NOT_EQUAL, &next_iteration, Assembler::kNearJump);

// Name found, check total argument count and named argument count.

@@ -402,7 +405,7 @@

// Input parameters:

-// ECX: function name string.

+// ECX: ic-data array.

// EDX: arguments descriptor array (num_args is first Smi element).

// Note: The receiver object is the first argument to the function being

// called, the stub accesses the receiver from this location directly

@@ -431,7 +434,7 @@

__ movl(EAX, Address(ESP, EAX, TIMES_2, kWordSize)); // Get receiver.

__ pushl(EDX); // Preserve arguments descriptor array.

__ pushl(EAX); // Preserve receiver.

- __ pushl(ECX); // Preserve function name.

+ __ pushl(ECX); // Preserve ic-data array.

// First resolve the function to get the function object.

// Setup space for return value on stack by pushing smi 0.

@@ -441,7 +444,7 @@

__ popl(EAX); // Remove receiver pushed earlier.

__ popl(ECX); // Pop returned code object into ECX.

// Pop preserved values

- __ popl(EDX); // Restore function name.

+ __ popl(EDX); // Restore ic-data array.

__ popl(EAX); // Restore receiver.

__ popl(EDI); // Restore arguments descriptor array.

@@ -459,7 +462,7 @@

__ Bind(&check_implicit_closure);

// EAX: receiver.

- // EDX: function name.

+ // EDX: ic-data array.

// ECX: raw_null.

// EDI: arguments descriptor array.

// The target function was not found.

@@ -467,12 +470,12 @@

// trying to create a closure of an instance function.

// Push values that need to be preserved across runtime call.

__ pushl(EAX); // Preserve receiver.

- __ pushl(EDX); // Preserve function name.

+ __ pushl(EDX); // Preserve ic-data array.

__ pushl(EDI); // Preserve arguments descriptor array.

__ pushl(Immediate(0));

__ pushl(EAX); // Push receiver.

- __ pushl(EDX); // Function name.

+ __ pushl(EDX); // Ic-data array.

__ CallRuntimeFromStub(kResolveImplicitClosureFunctionRuntimeEntry);

__ popl(EAX);

@@ -480,7 +483,7 @@

// Pop preserved values.

__ popl(EDI); // Restore arguments descriptor array.

- __ popl(EDX); // Restore function name.

+ __ popl(EDX); // Restore ic-data array.

__ popl(EAX); // Restore receiver.

__ cmpl(ECX, raw_null);

@@ -494,7 +497,7 @@

__ Bind(&check_implicit_closure_through_getter);

// EAX: receiver.

- // EDX: function name.

+ // EDX: ic-data array.

// ECX: raw_null.

// EDI: arguments descriptor array.

// This is not the case of an instance so invoke the getter of the

@@ -502,20 +505,20 @@

// supposed to invoke.

// Push values that need to be preserved across runtime call.

__ pushl(EAX); // Preserve receiver.

- __ pushl(EDX); // Preserve function name.

+ __ pushl(EDX); // Preserve ic-data array.

__ pushl(EDI); // Preserve arguments descriptor array.

__ pushl(Immediate(0));

__ pushl(EAX); // Push receiver.

- __ pushl(EDX); // Function name.

+ __ pushl(EDX); // Ic-data array.

__ CallRuntimeFromStub(kResolveImplicitClosureThroughGetterRuntimeEntry);

- __ popl(EDX); // Restore function name.

- __ popl(EAX); // Restore receiver.

+ __ popl(EDX); // Pop argument.

+ __ popl(EAX); // Pop argument.

__ popl(ECX); // get return value into ECX, might be Closure object.

// Pop preserved values.

__ popl(EDI); // Restore arguments descriptor array.

- __ popl(EDX); // Restore function name.

+ __ popl(EDX); // Restore ic-data array.

__ popl(EAX); // Restore receiver.

__ cmpl(ECX, raw_null);

@@ -556,14 +559,14 @@

// The target function was not found, so invoke method

// "void noSuchMethod(function_name, args_array)".

// EAX: receiver.

- // EDX: function name.

+ // EDX: ic-data array.

// ECX: raw_null.

// EDI: argument descriptor array.

// Setup space for return value on stack by pushing smi 0.

__ pushl(Immediate(0)); // Result from noSuchMethod.

__ pushl(EAX); // Receiver.

- __ pushl(EDX); // Function name.

+ __ pushl(EDX); // IC-data array.

__ pushl(EDI); // Argument descriptor array.

__ movl(EDI, FieldAddress(EDI, Array::data_offset()));

__ SmiUntag(EDI);

@@ -574,7 +577,7 @@

// Stack:

// TOS + 0: Argument array.

// TOS + 1: Argument descriptor array.

- // TOS + 2: Function name.

+ // TOS + 2: IC-data array.

// TOS + 3: Receiver.

// TOS + 4: Place for result from noSuchMethod.

// TOS + 5: Saved EBP of previous frame. <== EBP

@@ -607,12 +610,12 @@

__ movl(EAX, FieldAddress(EDX, Array::data_offset())); // EAX is a Smi.

__ movl(EAX, Address(ESP, EAX, TIMES_2, kWordSize)); // Load receiver.

__ pushl(EDX); // Preserve arguments descriptor array.

- __ pushl(ECX); // Preserve function name.

+ __ pushl(ECX); // Preserve ic-data array.

__ pushl(EAX); // Push receiver.

__ CallRuntimeFromStub(kResolvePatchInstanceCallRuntimeEntry);

__ popl(EAX); // Remove receiver pushed earlier.

// Pop preserved values

- __ popl(ECX); // Restore function name.

+ __ popl(ECX); // Restore ic-data array.

__ popl(EDX); // Restore arguments descriptor array.

__ LeaveFrame();

__ popl(EAX);

@@ -1396,7 +1399,7 @@

// EBP + 4 : points to return address.

// EBP + 8 : address of last argument (arg n-1).

// EBP + 8 + 4*(n-1) : address of first argument (arg 0).

-// ECX : function name.

+// ECX : ic-data array.

// EDX : arguments descriptor array.

// Uses EAX, EBX, EDI as temporary registers.

void StubCode::GenerateCallNoSuchMethodFunctionStub(Assembler* assembler) {

@@ -1418,7 +1421,7 @@

// Setup space for return value on stack by pushing smi 0.

__ pushl(Immediate(0)); // Result from noSuchMethod.

__ pushl(EAX); // Receiver.

- __ pushl(ECX); // Function name.

+ __ pushl(ECX); // IC data array.

__ pushl(EDX); // Arguments descriptor array.

__ subl(EDI, Immediate(1)); // Arguments array length, minus the receiver.

// See stack layout below explaining "wordSize * 8" offset.

@@ -1427,7 +1430,7 @@

// Stack:

// TOS + 0: Argument array.

// TOS + 1: Arguments descriptor array.

- // TOS + 2: Function name.

+ // TOS + 2: Ic-data array.

// TOS + 3: Receiver.

// TOS + 4: Place for result from noSuchMethod.

// TOS + 5: Saved EBP of previous frame. <== EBP

« no previous file with comments | « runtime/vm/ic_stubs_ia32_test.cc ('k') | runtime/vm/vm_sources.gypi » ('j') | no next file with comments »