Merge isolates to bleeding_edge.

src/mips/macro-assembler-mips.cc

 // Copyright 2010 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 804 matching lines @@
     if (type == TRY_CATCH_HANDLER) {
       li(t0, Operand(StackHandler::TRY_CATCH));
     } else {
       li(t0, Operand(StackHandler::TRY_FINALLY));
     }
     ASSERT(StackHandlerConstants::kStateOffset == 1 * kPointerSize
            && StackHandlerConstants::kFPOffset == 2 * kPointerSize
            && StackHandlerConstants::kPCOffset == 3 * kPointerSize
            && StackHandlerConstants::kNextOffset == 0 * kPointerSize);
     // Save the current handler as the next handler.
-    LoadExternalReference(t2, ExternalReference(Top::k_handler_address));
+    LoadExternalReference(t2, ExternalReference(Isolate::k_handler_address));
     lw(t1, MemOperand(t2));
 
     addiu(sp, sp, -StackHandlerConstants::kSize);
     sw(ra, MemOperand(sp, 12));
     sw(fp, MemOperand(sp, 8));
     sw(t0, MemOperand(sp, 4));
     sw(t1, MemOperand(sp, 0));
 
     // Link this handler as the new current one.
     sw(sp, MemOperand(t2));
 
   } else {
     // Must preserve a0-a3, and s0 (argv).
     ASSERT(try_location == IN_JS_ENTRY);
     ASSERT(StackHandlerConstants::kStateOffset == 1 * kPointerSize
            && StackHandlerConstants::kFPOffset == 2 * kPointerSize
            && StackHandlerConstants::kPCOffset == 3 * kPointerSize
            && StackHandlerConstants::kNextOffset == 0 * kPointerSize);
 
     // The frame pointer does not point to a JS frame so we save NULL
     // for fp. We expect the code throwing an exception to check fp
     // before dereferencing it to restore the context.
     li(t0, Operand(StackHandler::ENTRY));
 
     // Save the current handler as the next handler.
-    LoadExternalReference(t2, ExternalReference(Top::k_handler_address));
+    LoadExternalReference(t2, ExternalReference(Isolate::k_handler_address));
     lw(t1, MemOperand(t2));
 
     addiu(sp, sp, -StackHandlerConstants::kSize);
     sw(ra, MemOperand(sp, 12));
     sw(zero_reg, MemOperand(sp, 8));
     sw(t0, MemOperand(sp, 4));
     sw(t1, MemOperand(sp, 0));
 
     // Link this handler as the new current one.
     sw(sp, MemOperand(t2));
@@ skipping 401 matching lines @@
 
   // Push debug marker.
   if (mode == ExitFrame::MODE_DEBUG) {
     Push(zero_reg);
   } else {
     li(t0, Operand(CodeObject()));
     Push(t0);
   }
 
   // Save the frame pointer and the context in top.
-  LoadExternalReference(t0, ExternalReference(Top::k_c_entry_fp_address));
+  LoadExternalReference(t0, ExternalReference(Isolate::k_c_entry_fp_address));
   sw(fp, MemOperand(t0));
-  LoadExternalReference(t0, ExternalReference(Top::k_context_address));
+  LoadExternalReference(t0, ExternalReference(Isolate::k_context_address));
   sw(cp, MemOperand(t0));
 
   // Setup argc and the builtin function in callee-saved registers.
   mov(hold_argc, a0);
   mov(hold_function, a1);
 }
 
 
 void MacroAssembler::LeaveExitFrame(ExitFrame::Mode mode) {
   // Clear top frame.
-  LoadExternalReference(t0, ExternalReference(Top::k_c_entry_fp_address));
+  LoadExternalReference(t0, ExternalReference(Isolate::k_c_entry_fp_address));
   sw(zero_reg, MemOperand(t0));
 
   // Restore current context from top and clear it in debug mode.
-  LoadExternalReference(t0, ExternalReference(Top::k_context_address));
+  LoadExternalReference(t0, ExternalReference(Isolate::k_context_address));
   lw(cp, MemOperand(t0));
 #ifdef DEBUG
   sw(a3, MemOperand(t0));
 #endif
 
   // Pop the arguments, restore registers, and return.
   mov(sp, fp);  // Respect ABI stack constraint.
   lw(fp, MemOperand(sp, 0));
   lw(ra, MemOperand(sp, 4));
   lw(sp, MemOperand(sp, 8));
@@ skipping 16 matching lines @@
       andi(t0, sp, activation_frame_alignment - 1);
       addiu(t0, t0, -4);
       Push(zero_reg, eq, t0, zero_reg);
     }
   }
 }
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_MIPS