Revision: 4585
Author: [email protected]
Date: Tue May 4 23:50:15 2010
Log: Handle loading the property name for load IC in the virtual frame
Review URL: http://codereview.chromium.org/1946001
http://code.google.com/p/v8/source/detail?r=4585
Modified:
/branches/bleeding_edge/src/arm/codegen-arm.cc
/branches/bleeding_edge/src/arm/virtual-frame-arm.cc
/branches/bleeding_edge/src/arm/virtual-frame-arm.h
=======================================
--- /branches/bleeding_edge/src/arm/codegen-arm.cc Tue May 4 23:40:14 2010
+++ /branches/bleeding_edge/src/arm/codegen-arm.cc Tue May 4 23:50:15 2010
@@ -1343,9 +1343,7 @@
// give us a megamorphic load site. Not super, but it works.
LoadAndSpill(applicand);
Handle<String> name = Factory::LookupAsciiSymbol("apply");
- __ mov(r2, Operand(name));
- __ ldr(r0, MemOperand(sp, 0));
- frame_->CallLoadIC(RelocInfo::CODE_TARGET);
+ frame_->CallLoadIC(name, RelocInfo::CODE_TARGET);
frame_->EmitPush(r0);
// Load the receiver and the existing arguments object onto the
@@ -3012,11 +3010,10 @@
// Load the global object.
LoadGlobal();
// Setup the name register and call load IC.
- frame_->SpillAllButCopyTOSToR0();
- __ mov(r2, Operand(slot->var()->name()));
- frame_->CallLoadIC(typeof_state == INSIDE_TYPEOF
- ? RelocInfo::CODE_TARGET
- : RelocInfo::CODE_TARGET_CONTEXT);
+ frame_->CallLoadIC(slot->var()->name(),
+ typeof_state == INSIDE_TYPEOF
+ ? RelocInfo::CODE_TARGET
+ : RelocInfo::CODE_TARGET_CONTEXT);
// Drop the global object. The result is in r0.
frame_->Drop();
}
@@ -5446,11 +5443,10 @@
if (is_contextual || scope()->is_global_scope() || loop_nesting() == 0) {
Comment cmnt(masm(), "[ Load from named Property");
// Setup the name register and call load IC.
- frame_->SpillAllButCopyTOSToR0();
- __ mov(r2, Operand(name));
- frame_->CallLoadIC(is_contextual
- ? RelocInfo::CODE_TARGET_CONTEXT
- : RelocInfo::CODE_TARGET);
+ frame_->CallLoadIC(name,
+ is_contextual
+ ? RelocInfo::CODE_TARGET_CONTEXT
+ : RelocInfo::CODE_TARGET);
} else {
// Inline the in-object property case.
Comment cmnt(masm(), "[ Inlined named property load");
=======================================
--- /branches/bleeding_edge/src/arm/virtual-frame-arm.cc Tue May 4
23:40:14 2010
+++ /branches/bleeding_edge/src/arm/virtual-frame-arm.cc Tue May 4
23:50:15 2010
@@ -298,8 +298,10 @@
}
-void VirtualFrame::CallLoadIC(RelocInfo::Mode mode) {
+void VirtualFrame::CallLoadIC(Handle<String> name, RelocInfo::Mode mode) {
Handle<Code> ic(Builtins::builtin(Builtins::LoadIC_Initialize));
+ SpillAllButCopyTOSToR0();
+ __ mov(r2, Operand(name));
CallCodeObject(ic, mode, 0);
}
=======================================
--- /branches/bleeding_edge/src/arm/virtual-frame-arm.h Tue May 4 02:33:12
2010
+++ /branches/bleeding_edge/src/arm/virtual-frame-arm.h Tue May 4 23:50:15
2010
@@ -308,9 +308,8 @@
InvokeJSFlags flag,
int arg_count);
- // Call load IC. Receiver is on the stack and the property name is in r2.
- // Result is returned in r0.
- void CallLoadIC(RelocInfo::Mode mode);
+ // Call load IC. Receiver is on the stack. Result is returned in r0.
+ void CallLoadIC(Handle<String> name, RelocInfo::Mode mode);
// Call store IC. If the load is contextual, value is found on top of the
// frame. If not, value and receiver are on the frame. Both are consumed.
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
