AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Move a line, in codegen-*.cc. Make formatting of ic-*.cc uniform.

Browse Source 
Review URL: http://codereview.chromium.org/552210

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@3734 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
whesse@chromium.org 2010-01-28 12:41:27 +00:00
parent ef4b110620
commit 8999064435
6 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/arm/codegen-arm.cc
View File

@ -4377,6 +4377,7 @@ void Reference::SetValue(InitState init_state) {
Comment cmnt(masm, "[ Store to Slot"); Comment cmnt(masm, "[ Store to Slot");
Slot* slot = expression_->AsVariableProxy()->AsVariable()->slot(); Slot* slot = expression_->AsVariableProxy()->AsVariable()->slot();
cgen_->StoreToSlot(slot, init_state); cgen_->StoreToSlot(slot, init_state);
cgen_->UnloadReference(this);
break; break;
} }
@ -4398,6 +4399,7 @@ void Reference::SetValue(InitState init_state) {
&property_name, &property_name,
0); 0);
frame->EmitPush(r0); frame->EmitPush(r0);
cgen_->UnloadReference(this);
break; break;
} }
@ -4414,13 +4416,13 @@ void Reference::SetValue(InitState init_state) {
frame->EmitPop(r0); // value frame->EmitPop(r0); // value
frame->CallCodeObject(ic, RelocInfo::CODE_TARGET, &value, 0); frame->CallCodeObject(ic, RelocInfo::CODE_TARGET, &value, 0);
frame->EmitPush(r0); frame->EmitPush(r0);
cgen_->UnloadReference(this);
break; break;
} }
default: default:
UNREACHABLE(); UNREACHABLE();
} }
cgen_->UnloadReference(this);
} }

12
src/arm/ic-arm.cc
View File

@ -170,7 +170,6 @@ void LoadIC::GenerateArrayLength(MacroAssembler* masm) {
// -- lr : return address // -- lr : return address
// -- [sp] : receiver // -- [sp] : receiver
// ----------------------------------- // -----------------------------------
Label miss; Label miss;
__ ldr(r0, MemOperand(sp, 0)); __ ldr(r0, MemOperand(sp, 0));
@ -204,7 +203,6 @@ void LoadIC::GenerateFunctionPrototype(MacroAssembler* masm) {
// -- lr : return address // -- lr : return address
// -- [sp] : receiver // -- [sp] : receiver
// ----------------------------------- // -----------------------------------
Label miss; Label miss;
// Load receiver. // Load receiver.
@ -318,7 +316,6 @@ void CallIC::GenerateNormal(MacroAssembler* masm, int argc) {
// ----------- S t a t e ------------- // ----------- S t a t e -------------
// -- lr: return address // -- lr: return address
// ----------------------------------- // -----------------------------------
Label miss, global_object, non_global_object; Label miss, global_object, non_global_object;
// Get the receiver of the function from the stack into r1. // Get the receiver of the function from the stack into r1.
@ -451,7 +448,6 @@ void LoadIC::GenerateNormal(MacroAssembler* masm) {
// -- lr : return address // -- lr : return address
// -- [sp] : receiver // -- [sp] : receiver
// ----------------------------------- // -----------------------------------
Label miss, probe, global; Label miss, probe, global;
__ ldr(r0, MemOperand(sp, 0)); __ ldr(r0, MemOperand(sp, 0));
@ -543,6 +539,8 @@ void KeyedLoadIC::Generate(MacroAssembler* masm, const ExternalReference& f) {
// -- lr : return address // -- lr : return address
// -- sp[0] : key // -- sp[0] : key
// -- sp[4] : receiver // -- sp[4] : receiver
// -----------------------------------
__ ldm(ia, sp, r2.bit() | r3.bit()); __ ldm(ia, sp, r2.bit() | r3.bit());
__ stm(db_w, sp, r2.bit() | r3.bit()); __ stm(db_w, sp, r2.bit() | r3.bit());
@ -555,6 +553,7 @@ void KeyedLoadIC::GenerateGeneric(MacroAssembler* masm) {
// -- lr : return address // -- lr : return address
// -- sp[0] : key // -- sp[0] : key
// -- sp[4] : receiver // -- sp[4] : receiver
// -----------------------------------
Label slow, fast; Label slow, fast;
// Get the key and receiver object from the stack. // Get the key and receiver object from the stack.
@ -622,6 +621,8 @@ void KeyedLoadIC::GenerateString(MacroAssembler* masm) {
// -- lr : return address // -- lr : return address
// -- sp[0] : key // -- sp[0] : key
// -- sp[4] : receiver // -- sp[4] : receiver
// -----------------------------------
GenerateGeneric(masm); GenerateGeneric(masm);
} }
@ -640,6 +641,7 @@ void KeyedStoreIC::Generate(MacroAssembler* masm,
// -- lr : return address // -- lr : return address
// -- sp[0] : key // -- sp[0] : key
// -- sp[1] : receiver // -- sp[1] : receiver
// -----------------------------------
__ ldm(ia, sp, r2.bit() | r3.bit()); __ ldm(ia, sp, r2.bit() | r3.bit());
__ stm(db_w, sp, r0.bit() | r2.bit() | r3.bit()); __ stm(db_w, sp, r0.bit() | r2.bit() | r3.bit());
@ -654,7 +656,9 @@ void KeyedStoreIC::GenerateGeneric(MacroAssembler* masm) {
// -- lr : return address // -- lr : return address
// -- sp[0] : key // -- sp[0] : key
// -- sp[1] : receiver // -- sp[1] : receiver
// -----------------------------------
Label slow, fast, array, extra, exit; Label slow, fast, array, extra, exit;
// Get the key and the object from the stack. // Get the key and the object from the stack.
__ ldm(ia, sp, r1.bit() | r3.bit()); // r1 = key, r3 = receiver __ ldm(ia, sp, r1.bit() | r3.bit()); // r1 = key, r3 = receiver
// Check that the key is a smi. // Check that the key is a smi.

4
src/ia32/codegen-ia32.cc
View File

@ -6704,6 +6704,7 @@ void Reference::SetValue(InitState init_state) {
Slot* slot = expression_->AsVariableProxy()->AsVariable()->slot(); Slot* slot = expression_->AsVariableProxy()->AsVariable()->slot();
ASSERT(slot != NULL); ASSERT(slot != NULL);
cgen_->StoreToSlot(slot, init_state); cgen_->StoreToSlot(slot, init_state);
cgen_->UnloadReference(this);
break; break;
} }
@ -6712,6 +6713,7 @@ void Reference::SetValue(InitState init_state) {
cgen_->frame()->Push(GetName()); cgen_->frame()->Push(GetName());
Result answer = cgen_->frame()->CallStoreIC(); Result answer = cgen_->frame()->CallStoreIC();
cgen_->frame()->Push(&answer); cgen_->frame()->Push(&answer);
cgen_->UnloadReference(this);
break; break;
} }
@ -6814,13 +6816,13 @@ void Reference::SetValue(InitState init_state) {
__ nop(); __ nop();
cgen_->frame()->Push(&answer); cgen_->frame()->Push(&answer);
} }
cgen_->UnloadReference(this);
break; break;
} }
default: default:
UNREACHABLE(); UNREACHABLE();
} }
cgen_->UnloadReference(this);
} }

8
src/ia32/ic-ia32.cc
View File

@ -180,7 +180,6 @@ void LoadIC::GenerateArrayLength(MacroAssembler* masm) {
// -- esp[0] : return address // -- esp[0] : return address
// -- esp[4] : receiver // -- esp[4] : receiver
// ----------------------------------- // -----------------------------------
Label miss; Label miss;
__ mov(eax, Operand(esp, kPointerSize)); __ mov(eax, Operand(esp, kPointerSize));
@ -197,7 +196,6 @@ void LoadIC::GenerateStringLength(MacroAssembler* masm) {
// -- esp[0] : return address // -- esp[0] : return address
// -- esp[4] : receiver // -- esp[4] : receiver
// ----------------------------------- // -----------------------------------
Label miss; Label miss;
__ mov(eax, Operand(esp, kPointerSize)); __ mov(eax, Operand(esp, kPointerSize));
@ -214,7 +212,6 @@ void LoadIC::GenerateFunctionPrototype(MacroAssembler* masm) {
// -- esp[0] : return address // -- esp[0] : return address
// -- esp[4] : receiver // -- esp[4] : receiver
// ----------------------------------- // -----------------------------------
Label miss; Label miss;
__ mov(eax, Operand(esp, kPointerSize)); __ mov(eax, Operand(esp, kPointerSize));
@ -1039,7 +1036,6 @@ void CallIC::GenerateNormal(MacroAssembler* masm, int argc) {
// -- ... // -- ...
// -- esp[(argc + 1) * 4] : receiver // -- esp[(argc + 1) * 4] : receiver
// ----------------------------------- // -----------------------------------
Label miss, global_object, non_global_object; Label miss, global_object, non_global_object;
// Get the receiver of the function from the stack; 1 ~ return address. // Get the receiver of the function from the stack; 1 ~ return address.
@ -1178,7 +1174,6 @@ void LoadIC::GenerateNormal(MacroAssembler* masm) {
// -- esp[0] : return address // -- esp[0] : return address
// -- esp[4] : receiver // -- esp[4] : receiver
// ----------------------------------- // -----------------------------------
Label miss, probe, global; Label miss, probe, global;
__ mov(eax, Operand(esp, kPointerSize)); __ mov(eax, Operand(esp, kPointerSize));
@ -1428,7 +1423,6 @@ void StoreIC::Generate(MacroAssembler* masm, const ExternalReference& f) {
// -- esp[4] : receiver // -- esp[4] : receiver
// ----------------------------------- // -----------------------------------
// Move the return address below the arguments.
__ pop(ebx); __ pop(ebx);
__ push(Operand(esp, 0)); __ push(Operand(esp, 0));
__ push(ecx); __ push(ecx);
@ -1451,7 +1445,6 @@ void KeyedStoreIC::Generate(MacroAssembler* masm, const ExternalReference& f) {
// -- esp[8] : receiver // -- esp[8] : receiver
// ----------------------------------- // -----------------------------------
// Move the return address below the arguments.
__ pop(ecx); __ pop(ecx);
__ push(Operand(esp, 1 * kPointerSize)); __ push(Operand(esp, 1 * kPointerSize));
__ push(Operand(esp, 1 * kPointerSize)); __ push(Operand(esp, 1 * kPointerSize));
@ -1472,7 +1465,6 @@ void KeyedStoreIC::GenerateExtendStorage(MacroAssembler* masm) {
// -- esp[8] : receiver // -- esp[8] : receiver
// ----------------------------------- // -----------------------------------
// Move the return address below the arguments.
__ pop(ebx); __ pop(ebx);
__ push(Operand(esp, 1 * kPointerSize)); __ push(Operand(esp, 1 * kPointerSize));
__ push(ecx); __ push(ecx);

4
src/x64/codegen-x64.cc
View File

@ -6009,6 +6009,7 @@ void Reference::SetValue(InitState init_state) {
Slot* slot = expression_->AsVariableProxy()->AsVariable()->slot(); Slot* slot = expression_->AsVariableProxy()->AsVariable()->slot();
ASSERT(slot != NULL); ASSERT(slot != NULL);
cgen_->StoreToSlot(slot, init_state); cgen_->StoreToSlot(slot, init_state);
cgen_->UnloadReference(this);
break; break;
} }
@ -6017,6 +6018,7 @@ void Reference::SetValue(InitState init_state) {
cgen_->frame()->Push(GetName()); cgen_->frame()->Push(GetName());
Result answer = cgen_->frame()->CallStoreIC(); Result answer = cgen_->frame()->CallStoreIC();
cgen_->frame()->Push(&answer); cgen_->frame()->Push(&answer);
cgen_->UnloadReference(this);
break; break;
} }
@ -6118,13 +6120,13 @@ void Reference::SetValue(InitState init_state) {
masm->nop(); masm->nop();
cgen_->frame()->Push(&answer); cgen_->frame()->Push(&answer);
} }
cgen_->UnloadReference(this);
break; break;
} }
default: default:
UNREACHABLE(); UNREACHABLE();
} }
cgen_->UnloadReference(this);
} }

7
src/x64/ic-x64.cc
View File

@ -414,6 +414,7 @@ void KeyedLoadIC::GenerateString(MacroAssembler* masm) {
// -- rsp[8] : name // -- rsp[8] : name
// -- rsp[16] : receiver // -- rsp[16] : receiver
// ----------------------------------- // -----------------------------------
GenerateGeneric(masm); GenerateGeneric(masm);
} }
@ -1080,7 +1081,6 @@ void CallIC::GenerateNormal(MacroAssembler* masm, int argc) {
// rsp[(argc + 1) * 8] argument 0 = receiver // rsp[(argc + 1) * 8] argument 0 = receiver
// rsp[(argc + 2) * 8] function name // rsp[(argc + 2) * 8] function name
// ----------------------------------- // -----------------------------------
Label miss, global_object, non_global_object; Label miss, global_object, non_global_object;
// Get the receiver of the function from the stack. // Get the receiver of the function from the stack.
@ -1178,7 +1178,6 @@ void LoadIC::GenerateArrayLength(MacroAssembler* masm) {
// -- rsp[0] : return address // -- rsp[0] : return address
// -- rsp[8] : receiver // -- rsp[8] : receiver
// ----------------------------------- // -----------------------------------
Label miss; Label miss;
__ movq(rax, Operand(rsp, kPointerSize)); __ movq(rax, Operand(rsp, kPointerSize));
@ -1195,7 +1194,6 @@ void LoadIC::GenerateFunctionPrototype(MacroAssembler* masm) {
// -- rsp[0] : return address // -- rsp[0] : return address
// -- rsp[8] : receiver // -- rsp[8] : receiver
// ----------------------------------- // -----------------------------------
Label miss; Label miss;
__ movq(rax, Operand(rsp, kPointerSize)); __ movq(rax, Operand(rsp, kPointerSize));
@ -1243,7 +1241,6 @@ void LoadIC::GenerateNormal(MacroAssembler* masm) {
// -- rsp[0] : return address // -- rsp[0] : return address
// -- rsp[8] : receiver // -- rsp[8] : receiver
// ----------------------------------- // -----------------------------------
Label miss, probe, global; Label miss, probe, global;
__ movq(rax, Operand(rsp, kPointerSize)); __ movq(rax, Operand(rsp, kPointerSize));
@ -1291,7 +1288,6 @@ void LoadIC::GenerateStringLength(MacroAssembler* masm) {
// -- rsp[0] : return address // -- rsp[0] : return address
// -- rsp[8] : receiver // -- rsp[8] : receiver
// ----------------------------------- // -----------------------------------
Label miss; Label miss;
__ movq(rax, Operand(rsp, kPointerSize)); __ movq(rax, Operand(rsp, kPointerSize));
@ -1337,6 +1333,7 @@ void StoreIC::Generate(MacroAssembler* masm, ExternalReference const& f) {
// -- rsp[0] : return address // -- rsp[0] : return address
// -- rsp[8] : receiver // -- rsp[8] : receiver
// ----------------------------------- // -----------------------------------
__ pop(rbx); __ pop(rbx);
__ push(Operand(rsp, 0)); // receiver __ push(Operand(rsp, 0)); // receiver
__ push(rcx); // name __ push(rcx); // name