Patch for allowing several V8 instances in process:...

src/ia32/codegen-ia32.cc

Index: src/ia32/codegen-ia32.cc
===================================================================
--- src/ia32/codegen-ia32.cc	(revision 3427)
+++ src/ia32/codegen-ia32.cc	(working copy)
@@ -154,7 +154,7 @@
 
   // New scope to get automatic timing calculation.
   {  // NOLINT
-    HistogramTimerScope codegen_timer(&Counters::code_generation);
+    HistogramTimerScope codegen_timer(&COUNTER(code_generation));
     CodeGenState state(this);
 
     // Entry:
@@ -316,7 +316,7 @@
 
   // Process any deferred code using the register allocator.
   if (!HasStackOverflow()) {
-    HistogramTimerScope deferred_timer(&Counters::deferred_code_generation);
+    HistogramTimerScope deferred_timer(&COUNTER(deferred_code_generation));
     JumpTarget::set_compiling_deferred_code(true);
     ProcessDeferred();
     JumpTarget::set_compiling_deferred_code(false);
@@ -6027,7 +6027,7 @@
   // Here we use masm_-> instead of the __ macro because this is the
   // instruction that gets patched and coverage code gets in the way.
   masm_->test(eax, Immediate(-delta_to_patch_site));
-  __ IncrementCounter(&Counters::named_load_inline_miss, 1);
+  __ IncrementCounter(&COUNTER(named_load_inline_miss), 1);
 
   if (!dst_.is(eax)) __ mov(dst_, eax);
   __ pop(receiver_);
@@ -6081,7 +6081,7 @@
   // Here we use masm_-> instead of the __ macro because this is the
   // instruction that gets patched and coverage code gets in the way.
   masm_->test(eax, Immediate(-delta_to_patch_site));
-  __ IncrementCounter(&Counters::keyed_load_inline_miss, 1);
+  __ IncrementCounter(&COUNTER(keyed_load_inline_miss), 1);
 
   if (!dst_.is(eax)) __ mov(dst_, eax);
   __ pop(key_);
@@ -6111,7 +6111,7 @@
 
 
 void DeferredReferenceSetKeyedValue::Generate() {
-  __ IncrementCounter(&Counters::keyed_store_inline_miss, 1);
+  __ IncrementCounter(&COUNTER(keyed_store_inline_miss), 1);
   // Push receiver and key arguments on the stack.
   __ push(receiver_);
   __ push(key_);
@@ -6240,7 +6240,7 @@
         int offset = kMaxInt;
         masm->mov(value.reg(), FieldOperand(receiver.reg(), offset));
 
-        __ IncrementCounter(&Counters::named_load_inline, 1);
+        __ IncrementCounter(&COUNTER(named_load_inline), 1);
         deferred->BindExit();
         cgen_->frame()->Push(&receiver);
         cgen_->frame()->Push(&value);
@@ -6335,7 +6335,7 @@
         index.Unuse();
         __ cmp(Operand(value.reg()), Immediate(Factory::the_hole_value()));
         deferred->Branch(equal);
-        __ IncrementCounter(&Counters::keyed_load_inline, 1);
+        __ IncrementCounter(&COUNTER(keyed_load_inline), 1);
 
         deferred->BindExit();
         // Restore the receiver and key to the frame and push the
@@ -6504,7 +6504,7 @@
                        times_2,
                        FixedArray::kHeaderSize - kHeapObjectTag),
                value.reg());
-        __ IncrementCounter(&Counters::keyed_store_inline, 1);
+        __ IncrementCounter(&COUNTER(keyed_store_inline), 1);
 
         deferred->BindExit();
 
@@ -6629,7 +6629,7 @@
 
     // Update flags to indicate that arguments are in registers.
     SetArgsInRegisters();
-    __ IncrementCounter(&Counters::generic_binary_stub_calls_regs, 1);
+    __ IncrementCounter(&COUNTER(generic_binary_stub_calls_regs), 1);
   }
 
   // Call the stub.
@@ -6661,7 +6661,7 @@
 
     // Update flags to indicate that arguments are in registers.
     SetArgsInRegisters();
-    __ IncrementCounter(&Counters::generic_binary_stub_calls_regs, 1);
+    __ IncrementCounter(&COUNTER(generic_binary_stub_calls_regs), 1);
   }
 
   // Call the stub.
@@ -6692,7 +6692,7 @@
     }
     // Update flags to indicate that arguments are in registers.
     SetArgsInRegisters();
-    __ IncrementCounter(&Counters::generic_binary_stub_calls_regs, 1);
+    __ IncrementCounter(&COUNTER(generic_binary_stub_calls_regs), 1);
   }
 
   // Call the stub.
@@ -6847,7 +6847,7 @@
 void GenericBinaryOpStub::Generate(MacroAssembler* masm) {
   Label call_runtime;
 
-  __ IncrementCounter(&Counters::generic_binary_stub_calls, 1);
+  __ IncrementCounter(&COUNTER(generic_binary_stub_calls), 1);
 
   // Generate fast case smi code if requested. This flag is set when the fast
   // case smi code is not generated by the caller. Generating it here will speed
@@ -8266,7 +8266,7 @@
   __ test(ecx, Operand(ecx));
   __ j(not_zero, &second_not_zero_length);
   // Second string is empty, result is first string which is already in eax.
-  __ IncrementCounter(&Counters::string_add_native, 1);
+  __ IncrementCounter(&COUNTER(string_add_native), 1);
   __ ret(2 * kPointerSize);
   __ bind(&second_not_zero_length);
   __ mov(ebx, FieldOperand(eax, String::kLengthOffset));
@@ -8274,7 +8274,7 @@
   __ j(not_zero, &both_not_zero_length);
   // First string is empty, result is second string which is in edx.
   __ mov(eax, edx);
-  __ IncrementCounter(&Counters::string_add_native, 1);
+  __ IncrementCounter(&COUNTER(string_add_native), 1);
   __ ret(2 * kPointerSize);
 
   // Both strings are non-empty.
@@ -8318,7 +8318,7 @@
   __ mov(FieldOperand(ecx, ConsString::kFirstOffset), eax);
   __ mov(FieldOperand(ecx, ConsString::kSecondOffset), edx);
   __ mov(eax, ecx);
-  __ IncrementCounter(&Counters::string_add_native, 1);
+  __ IncrementCounter(&COUNTER(string_add_native), 1);
   __ ret(2 * kPointerSize);
   __ bind(&non_ascii);
   // Allocate a two byte cons string.
@@ -8379,7 +8379,7 @@
   // edx: first char of second argument
   // edi: length of second argument
   GenerateCopyCharacters(masm, ecx, edx, edi, ebx, true);
-  __ IncrementCounter(&Counters::string_add_native, 1);
+  __ IncrementCounter(&COUNTER(string_add_native), 1);
   __ ret(2 * kPointerSize);
 
   // Handle creating a flat two byte result.
@@ -8418,7 +8418,7 @@
   // edx: first char of second argument
   // edi: length of second argument
   GenerateCopyCharacters(masm, ecx, edx, edi, ebx, false);
-  __ IncrementCounter(&Counters::string_add_native, 1);
+  __ IncrementCounter(&COUNTER(string_add_native), 1);
   __ ret(2 * kPointerSize);
 
   // Just jump to runtime to add the two strings.