Index: src/x64/stub-cache-x64.cc |
=================================================================== |
--- src/x64/stub-cache-x64.cc (revision 3427) |
+++ src/x64/stub-cache-x64.cc (working copy) |
@@ -969,7 +969,7 @@ |
__ movq(rsi, FieldOperand(rdi, JSFunction::kContextOffset)); |
// Jump to the cached code (tail call). |
- __ IncrementCounter(&Counters::call_global_inline, 1); |
+ __ IncrementCounter(&COUNTER(call_global_inline), 1); |
ASSERT(function->is_compiled()); |
Handle<Code> code(function->code()); |
ParameterCount expected(function->shared()->formal_parameter_count()); |
@@ -978,7 +978,7 @@ |
// Handle call cache miss. |
__ bind(&miss); |
- __ IncrementCounter(&Counters::call_global_inline_miss, 1); |
+ __ IncrementCounter(&COUNTER(call_global_inline_miss), 1); |
Handle<Code> ic = ComputeCallMiss(arguments().immediate()); |
__ Jump(ic, RelocInfo::CODE_TARGET); |
@@ -1123,11 +1123,11 @@ |
__ Check(not_equal, "DontDelete cells can't contain the hole"); |
} |
- __ IncrementCounter(&Counters::named_load_global_inline, 1); |
+ __ IncrementCounter(&COUNTER(named_load_global_inline), 1); |
__ ret(0); |
__ bind(&miss); |
- __ IncrementCounter(&Counters::named_load_global_inline_miss, 1); |
+ __ IncrementCounter(&COUNTER(named_load_global_inline_miss), 1); |
GenerateLoadMiss(masm(), Code::LOAD_IC); |
// Return the generated code. |
@@ -1148,7 +1148,7 @@ |
__ movq(rax, Operand(rsp, kPointerSize)); |
__ movq(rcx, Operand(rsp, 2 * kPointerSize)); |
- __ IncrementCounter(&Counters::keyed_load_callback, 1); |
+ __ IncrementCounter(&COUNTER(keyed_load_callback), 1); |
// Check that the name has not changed. |
__ Cmp(rax, Handle<String>(name)); |
@@ -1157,7 +1157,7 @@ |
GenerateLoadCallback(receiver, holder, rcx, rax, rbx, rdx, |
callback, name, &miss); |
__ bind(&miss); |
- __ DecrementCounter(&Counters::keyed_load_callback, 1); |
+ __ DecrementCounter(&COUNTER(keyed_load_callback), 1); |
GenerateLoadMiss(masm(), Code::KEYED_LOAD_IC); |
// Return the generated code. |
@@ -1175,7 +1175,7 @@ |
__ movq(rax, Operand(rsp, kPointerSize)); |
__ movq(rcx, Operand(rsp, 2 * kPointerSize)); |
- __ IncrementCounter(&Counters::keyed_load_array_length, 1); |
+ __ IncrementCounter(&COUNTER(keyed_load_array_length), 1); |
// Check that the name has not changed. |
__ Cmp(rax, Handle<String>(name)); |
@@ -1183,7 +1183,7 @@ |
GenerateLoadArrayLength(masm(), rcx, rdx, &miss); |
__ bind(&miss); |
- __ DecrementCounter(&Counters::keyed_load_array_length, 1); |
+ __ DecrementCounter(&COUNTER(keyed_load_array_length), 1); |
GenerateLoadMiss(masm(), Code::KEYED_LOAD_IC); |
// Return the generated code. |
@@ -1204,7 +1204,7 @@ |
__ movq(rax, Operand(rsp, kPointerSize)); |
__ movq(rcx, Operand(rsp, 2 * kPointerSize)); |
- __ IncrementCounter(&Counters::keyed_load_constant_function, 1); |
+ __ IncrementCounter(&COUNTER(keyed_load_constant_function), 1); |
// Check that the name has not changed. |
__ Cmp(rax, Handle<String>(name)); |
@@ -1213,7 +1213,7 @@ |
GenerateLoadConstant(receiver, holder, rcx, rbx, rdx, |
value, name, &miss); |
__ bind(&miss); |
- __ DecrementCounter(&Counters::keyed_load_constant_function, 1); |
+ __ DecrementCounter(&COUNTER(keyed_load_constant_function), 1); |
GenerateLoadMiss(masm(), Code::KEYED_LOAD_IC); |
// Return the generated code. |
@@ -1231,7 +1231,7 @@ |
__ movq(rax, Operand(rsp, kPointerSize)); |
__ movq(rcx, Operand(rsp, 2 * kPointerSize)); |
- __ IncrementCounter(&Counters::keyed_load_function_prototype, 1); |
+ __ IncrementCounter(&COUNTER(keyed_load_function_prototype), 1); |
// Check that the name has not changed. |
__ Cmp(rax, Handle<String>(name)); |
@@ -1239,7 +1239,7 @@ |
GenerateLoadFunctionPrototype(masm(), rcx, rdx, rbx, &miss); |
__ bind(&miss); |
- __ DecrementCounter(&Counters::keyed_load_function_prototype, 1); |
+ __ DecrementCounter(&COUNTER(keyed_load_function_prototype), 1); |
GenerateLoadMiss(masm(), Code::KEYED_LOAD_IC); |
// Return the generated code. |
@@ -1259,7 +1259,7 @@ |
__ movq(rax, Operand(rsp, kPointerSize)); |
__ movq(rcx, Operand(rsp, 2 * kPointerSize)); |
- __ IncrementCounter(&Counters::keyed_load_interceptor, 1); |
+ __ IncrementCounter(&COUNTER(keyed_load_interceptor), 1); |
// Check that the name has not changed. |
__ Cmp(rax, Handle<String>(name)); |
@@ -1277,7 +1277,7 @@ |
name, |
&miss); |
__ bind(&miss); |
- __ DecrementCounter(&Counters::keyed_load_interceptor, 1); |
+ __ DecrementCounter(&COUNTER(keyed_load_interceptor), 1); |
GenerateLoadMiss(masm(), Code::KEYED_LOAD_IC); |
// Return the generated code. |
@@ -1295,7 +1295,7 @@ |
__ movq(rax, Operand(rsp, kPointerSize)); |
__ movq(rcx, Operand(rsp, 2 * kPointerSize)); |
- __ IncrementCounter(&Counters::keyed_load_string_length, 1); |
+ __ IncrementCounter(&COUNTER(keyed_load_string_length), 1); |
// Check that the name has not changed. |
__ Cmp(rax, Handle<String>(name)); |
@@ -1303,7 +1303,7 @@ |
GenerateLoadStringLength(masm(), rcx, rdx, &miss); |
__ bind(&miss); |
- __ DecrementCounter(&Counters::keyed_load_string_length, 1); |
+ __ DecrementCounter(&COUNTER(keyed_load_string_length), 1); |
GenerateLoadMiss(masm(), Code::KEYED_LOAD_IC); |
// Return the generated code. |
@@ -1474,12 +1474,12 @@ |
__ movq(FieldOperand(rcx, JSGlobalPropertyCell::kValueOffset), rax); |
// Return the value (register rax). |
- __ IncrementCounter(&Counters::named_store_global_inline, 1); |
+ __ IncrementCounter(&COUNTER(named_store_global_inline), 1); |
__ ret(0); |
// Handle store cache miss. |
__ bind(&miss); |
- __ IncrementCounter(&Counters::named_store_global_inline_miss, 1); |
+ __ IncrementCounter(&COUNTER(named_store_global_inline_miss), 1); |
Handle<Code> ic(Builtins::builtin(Builtins::StoreIC_Miss)); |
__ Jump(ic, RelocInfo::CODE_TARGET); |
@@ -1501,7 +1501,7 @@ |
__ movq(rax, Operand(rsp, kPointerSize)); |
__ movq(rcx, Operand(rsp, 2 * kPointerSize)); |
- __ IncrementCounter(&Counters::keyed_load_field, 1); |
+ __ IncrementCounter(&COUNTER(keyed_load_field), 1); |
// Check that the name has not changed. |
__ Cmp(rax, Handle<String>(name)); |
@@ -1510,7 +1510,7 @@ |
GenerateLoadField(receiver, holder, rcx, rbx, rdx, index, name, &miss); |
__ bind(&miss); |
- __ DecrementCounter(&Counters::keyed_load_field, 1); |
+ __ DecrementCounter(&COUNTER(keyed_load_field), 1); |
GenerateLoadMiss(masm(), Code::KEYED_LOAD_IC); |
// Return the generated code. |
@@ -1530,7 +1530,7 @@ |
// ----------------------------------- |
Label miss; |
- __ IncrementCounter(&Counters::keyed_store_field, 1); |
+ __ IncrementCounter(&COUNTER(keyed_store_field), 1); |
// Get the name from the stack. |
__ movq(rcx, Operand(rsp, 1 * kPointerSize)); |
@@ -1552,7 +1552,7 @@ |
// Handle store cache miss. |
__ bind(&miss); |
- __ DecrementCounter(&Counters::keyed_store_field, 1); |
+ __ DecrementCounter(&COUNTER(keyed_store_field), 1); |
Handle<Code> ic(Builtins::builtin(Builtins::KeyedStoreIC_Miss)); |
__ Jump(ic, RelocInfo::CODE_TARGET); |
@@ -1840,8 +1840,8 @@ |
__ pop(rcx); |
__ lea(rsp, Operand(rsp, rbx, times_pointer_size, 1 * kPointerSize)); |
__ push(rcx); |
- __ IncrementCounter(&Counters::constructed_objects, 1); |
- __ IncrementCounter(&Counters::constructed_objects_stub, 1); |
+ __ IncrementCounter(&COUNTER(constructed_objects), 1); |
+ __ IncrementCounter(&COUNTER(constructed_objects_stub), 1); |
__ ret(0); |
// Jump to the generic stub in case the specialized code cannot handle the |