| Index: src/x64/code-stubs-x64.cc
|
| diff --git a/src/x64/code-stubs-x64.cc b/src/x64/code-stubs-x64.cc
|
| index 9196e3a5736aef2fb0ff5f1dd5c1839af1614388..2f9aa66cd232963591a3cf757a9972a34c3c0b4e 100644
|
| --- a/src/x64/code-stubs-x64.cc
|
| +++ b/src/x64/code-stubs-x64.cc
|
| @@ -359,7 +359,8 @@ void GenericBinaryOpStub::GenerateCall(
|
|
|
| // Update flags to indicate that arguments are in registers.
|
| SetArgsInRegisters();
|
| - __ IncrementCounter(COUNTERS->generic_binary_stub_calls_regs(), 1);
|
| + Counters* counters = masm->isolate()->counters();
|
| + __ IncrementCounter(counters->generic_binary_stub_calls_regs(), 1);
|
| }
|
|
|
| // Call the stub.
|
| @@ -395,7 +396,8 @@ void GenericBinaryOpStub::GenerateCall(
|
|
|
| // Update flags to indicate that arguments are in registers.
|
| SetArgsInRegisters();
|
| - __ IncrementCounter(COUNTERS->generic_binary_stub_calls_regs(), 1);
|
| + Counters* counters = masm->isolate()->counters();
|
| + __ IncrementCounter(counters->generic_binary_stub_calls_regs(), 1);
|
| }
|
|
|
| // Call the stub.
|
| @@ -430,7 +432,8 @@ void GenericBinaryOpStub::GenerateCall(
|
| }
|
| // Update flags to indicate that arguments are in registers.
|
| SetArgsInRegisters();
|
| - __ IncrementCounter(COUNTERS->generic_binary_stub_calls_regs(), 1);
|
| + Counters* counters = masm->isolate()->counters();
|
| + __ IncrementCounter(counters->generic_binary_stub_calls_regs(), 1);
|
| }
|
|
|
| // Call the stub.
|
| @@ -2599,7 +2602,8 @@ void RegExpExecStub::Generate(MacroAssembler* masm) {
|
| // rcx: encoding of subject string (1 if ascii 0 if two_byte);
|
| // r11: code
|
| // All checks done. Now push arguments for native regexp code.
|
| - __ IncrementCounter(COUNTERS->regexp_entry_native(), 1);
|
| + Counters* counters = masm->isolate()->counters();
|
| + __ IncrementCounter(counters->regexp_entry_native(), 1);
|
|
|
| // Isolates: note we add an additional parameter here (isolate pointer).
|
| static const int kRegExpExecuteArguments = 8;
|
| @@ -2951,7 +2955,8 @@ void NumberToStringStub::GenerateLookupNumberStringCache(MacroAssembler* masm,
|
| index,
|
| times_1,
|
| FixedArray::kHeaderSize + kPointerSize));
|
| - __ IncrementCounter(COUNTERS->number_to_string_native(), 1);
|
| + Counters* counters = masm->isolate()->counters();
|
| + __ IncrementCounter(counters->number_to_string_native(), 1);
|
| }
|
|
|
|
|
| @@ -4173,7 +4178,8 @@ void StringAddStub::Generate(MacroAssembler* masm) {
|
| __ SmiTest(rcx);
|
| __ j(not_zero, &second_not_zero_length);
|
| // Second string is empty, result is first string which is already in rax.
|
| - __ IncrementCounter(COUNTERS->string_add_native(), 1);
|
| + Counters* counters = masm->isolate()->counters();
|
| + __ IncrementCounter(counters->string_add_native(), 1);
|
| __ ret(2 * kPointerSize);
|
| __ bind(&second_not_zero_length);
|
| __ movq(rbx, FieldOperand(rax, String::kLengthOffset));
|
| @@ -4181,7 +4187,7 @@ void StringAddStub::Generate(MacroAssembler* masm) {
|
| __ j(not_zero, &both_not_zero_length);
|
| // First string is empty, result is second string which is in rdx.
|
| __ movq(rax, rdx);
|
| - __ IncrementCounter(COUNTERS->string_add_native(), 1);
|
| + __ IncrementCounter(counters->string_add_native(), 1);
|
| __ ret(2 * kPointerSize);
|
|
|
| // Both strings are non-empty.
|
| @@ -4225,7 +4231,7 @@ void StringAddStub::Generate(MacroAssembler* masm) {
|
| Label make_two_character_string, make_flat_ascii_string;
|
| StringHelper::GenerateTwoCharacterSymbolTableProbe(
|
| masm, rbx, rcx, r14, r11, rdi, r15, &make_two_character_string);
|
| - __ IncrementCounter(COUNTERS->string_add_native(), 1);
|
| + __ IncrementCounter(counters->string_add_native(), 1);
|
| __ ret(2 * kPointerSize);
|
|
|
| __ bind(&make_two_character_string);
|
| @@ -4265,7 +4271,7 @@ void StringAddStub::Generate(MacroAssembler* masm) {
|
| __ movq(FieldOperand(rcx, ConsString::kFirstOffset), rax);
|
| __ movq(FieldOperand(rcx, ConsString::kSecondOffset), rdx);
|
| __ movq(rax, rcx);
|
| - __ IncrementCounter(COUNTERS->string_add_native(), 1);
|
| + __ IncrementCounter(counters->string_add_native(), 1);
|
| __ ret(2 * kPointerSize);
|
| __ bind(&non_ascii);
|
| // At least one of the strings is two-byte. Check whether it happens
|
| @@ -4339,7 +4345,7 @@ void StringAddStub::Generate(MacroAssembler* masm) {
|
| // rdi: length of second argument
|
| StringHelper::GenerateCopyCharacters(masm, rcx, rdx, rdi, true);
|
| __ movq(rax, rbx);
|
| - __ IncrementCounter(COUNTERS->string_add_native(), 1);
|
| + __ IncrementCounter(counters->string_add_native(), 1);
|
| __ ret(2 * kPointerSize);
|
|
|
| // Handle creating a flat two byte result.
|
| @@ -4376,7 +4382,7 @@ void StringAddStub::Generate(MacroAssembler* masm) {
|
| // rdi: length of second argument
|
| StringHelper::GenerateCopyCharacters(masm, rcx, rdx, rdi, false);
|
| __ movq(rax, rbx);
|
| - __ IncrementCounter(COUNTERS->string_add_native(), 1);
|
| + __ IncrementCounter(counters->string_add_native(), 1);
|
| __ ret(2 * kPointerSize);
|
|
|
| // Just jump to runtime to add the two strings.
|
| @@ -4791,7 +4797,8 @@ void SubStringStub::Generate(MacroAssembler* masm) {
|
| // rsi: character of sub string start
|
| StringHelper::GenerateCopyCharactersREP(masm, rdi, rsi, rcx, true);
|
| __ movq(rsi, rdx); // Restore rsi.
|
| - __ IncrementCounter(COUNTERS->sub_string_native(), 1);
|
| + Counters* counters = masm->isolate()->counters();
|
| + __ IncrementCounter(counters->sub_string_native(), 1);
|
| __ ret(kArgumentsSize);
|
|
|
| __ bind(&non_ascii_flat);
|
| @@ -4828,7 +4835,7 @@ void SubStringStub::Generate(MacroAssembler* masm) {
|
| __ movq(rsi, rdx); // Restore esi.
|
|
|
| __ bind(&return_rax);
|
| - __ IncrementCounter(COUNTERS->sub_string_native(), 1);
|
| + __ IncrementCounter(counters->sub_string_native(), 1);
|
| __ ret(kArgumentsSize);
|
|
|
| // Just jump to runtime to create the sub string.
|
| @@ -4942,7 +4949,8 @@ void StringCompareStub::Generate(MacroAssembler* masm) {
|
| __ cmpq(rdx, rax);
|
| __ j(not_equal, ¬_same);
|
| __ Move(rax, Smi::FromInt(EQUAL));
|
| - __ IncrementCounter(COUNTERS->string_compare_native(), 1);
|
| + Counters* counters = masm->isolate()->counters();
|
| + __ IncrementCounter(counters->string_compare_native(), 1);
|
| __ ret(2 * kPointerSize);
|
|
|
| __ bind(¬_same);
|
| @@ -4951,7 +4959,7 @@ void StringCompareStub::Generate(MacroAssembler* masm) {
|
| __ JumpIfNotBothSequentialAsciiStrings(rdx, rax, rcx, rbx, &runtime);
|
|
|
| // Inline comparison of ascii strings.
|
| - __ IncrementCounter(COUNTERS->string_compare_native(), 1);
|
| + __ IncrementCounter(counters->string_compare_native(), 1);
|
| // Drop arguments from the stack
|
| __ pop(rcx);
|
| __ addq(rsp, Immediate(2 * kPointerSize));
|
|
|