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

src/x64/builtins-x64.cc

 // Copyright 2009 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 72 matching lines @@
 
 
 void Builtins::Generate_ArgumentsAdaptorTrampoline(MacroAssembler* masm) {
   // ----------- S t a t e -------------
   //  -- rax : actual number of arguments
   //  -- rbx : expected number of arguments
   //  -- rdx : code entry to call
   // -----------------------------------
 
   Label invoke, dont_adapt_arguments;
-  __ IncrementCounter(&Counters::arguments_adaptors, 1);
+  __ IncrementCounter(&COUNTER(arguments_adaptors), 1);
 
   Label enough, too_few;
   __ cmpq(rax, rbx);
   __ j(less, &too_few);
   __ cmpq(rbx, Immediate(SharedFunctionInfo::kDontAdaptArgumentsSentinel));
   __ j(equal, &dont_adapt_arguments);
 
   {  // Enough parameters: Actual >= expected.
     __ bind(&enough);
     EnterArgumentsAdaptorFrame(masm);
@@ skipping 577 matching lines @@
 
   // Handle construction of an empty array.
   AllocateEmptyJSArray(masm,
                        rdi,
                        rbx,
                        rcx,
                        rdx,
                        r8,
                        kPreallocatedArrayElements,
                        call_generic_code);
-  __ IncrementCounter(&Counters::array_function_native, 1);
+  __ IncrementCounter(&COUNTER(array_function_native), 1);
   __ movq(rax, rbx);
   __ ret(kPointerSize);
 
   // Check for one argument. Bail out if argument is not smi or if it is
   // negative.
   __ bind(&argc_one_or_more);
   __ cmpq(rax, Immediate(1));
   __ j(not_equal, &argc_two_or_more);
   __ movq(rdx, Operand(rsp, kPointerSize));  // Get the argument from the stack.
   __ JumpIfNotPositiveSmi(rdx, call_generic_code);
@@ skipping 10 matching lines @@
   // esp[8]: argument
   AllocateJSArray(masm,
                   rdi,
                   rdx,
                   rbx,
                   rcx,
                   r8,
                   r9,
                   true,
                   call_generic_code);
-  __ IncrementCounter(&Counters::array_function_native, 1);
+  __ IncrementCounter(&COUNTER(array_function_native), 1);
   __ movq(rax, rbx);
   __ ret(2 * kPointerSize);
 
   // Handle construction of an array from a list of arguments.
   __ bind(&argc_two_or_more);
   __ movq(rdx, rax);
   __ Integer32ToSmi(rdx, rdx);  // Convet argc to a smi.
   // rax: argc
   // rdx: array_size (smi)
   // rdi: constructor
   // esp[0] : return address
   // esp[8] : last argument
   AllocateJSArray(masm,
                   rdi,
                   rdx,
                   rbx,
                   rcx,
                   r8,
                   r9,
                   false,
                   call_generic_code);
-  __ IncrementCounter(&Counters::array_function_native, 1);
+  __ IncrementCounter(&COUNTER(array_function_native), 1);
 
   // rax: argc
   // rbx: JSArray
   // rcx: elements_array
   // r8: elements_array_end (untagged)
   // esp[0]: return address
   // esp[8]: last argument
 
   // Location of the last argument
   __ lea(r9, Operand(rsp, kPointerSize));
@@ skipping 362 matching lines @@
   // Restore the arguments count and leave the construct frame.
   __ bind(&exit);
   __ movq(rbx, Operand(rsp, kPointerSize));  // get arguments count
   __ LeaveConstructFrame();
 
   // Remove caller arguments from the stack and return.
   __ pop(rcx);
   SmiIndex index = masm->SmiToIndex(rbx, rbx, kPointerSizeLog2);
   __ lea(rsp, Operand(rsp, index.reg, index.scale, 1 * kPointerSize));
   __ push(rcx);
-  __ IncrementCounter(&Counters::constructed_objects, 1);
+  __ IncrementCounter(&COUNTER(constructed_objects), 1);
   __ ret(0);
 }
 
 
 static void Generate_JSEntryTrampolineHelper(MacroAssembler* masm,
                                              bool is_construct) {
   // Expects five C++ function parameters.
   // - Address entry (ignored)
   // - JSFunction* function (
   // - Object* receiver
@@ skipping 108 matching lines @@
 void Builtins::Generate_JSEntryTrampoline(MacroAssembler* masm) {
   Generate_JSEntryTrampolineHelper(masm, false);
 }
 
 
 void Builtins::Generate_JSConstructEntryTrampoline(MacroAssembler* masm) {
   Generate_JSEntryTrampolineHelper(masm, true);
 }
 
 } }  // namespace v8::internal