Some fixes in ARM simulator:...

src/simulator-arm.cc

 // Copyright 2008 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 30 matching lines @@
 using ::v8::internal::Object;
 using ::v8::internal::PrintF;
 using ::v8::internal::OS;
 using ::v8::internal::ReadLine;
 using ::v8::internal::DeleteArray;
 
 // This macro provides a platform independent use of sscanf. The reason for
 // SScanF not beeing implemented in a platform independent was through
 // ::v8::internal::OS in the same way as SNPrintF is that the Windows C Run-Time
 // Library does not provide vsscanf.
-#ifdef WIN32
-#define SScanF sscanf_s
-#else
 #define SScanF sscanf  // NOLINT
-#endif
 
 // The Debugger class is used by the simulator while debugging simulated ARM
 // code.
 class Debugger {
  public:
   explicit Debugger(Simulator* sim);
   ~Debugger();
 
   void Stop(Instr* instr);
   void Debug();
@@ skipping 309 matching lines @@
   // allocated stack area. To be safe in potential stack underflows we leave
   // some buffer below.
   registers_[sp] = reinterpret_cast<int32_t>(stack_) + stack_size - 64;
   // The lr and pc are initialized to a known bad value that will cause an
   // access violation if the simulator ever tries to execute it.
   registers_[pc] = bad_lr;
   registers_[lr] = bad_lr;
 }
 
 
-// This is the Simulator singleton. Currently only one thread is supported by
-// V8. If we had multiple threads, then we should have a Simulator instance on
-// a per thread basis.
-static Simulator* the_sim = NULL;
+// Create one simulator per thread and keep it in thread local storage.
+static v8::internal::Thread::LocalStorageKey simulator_key =
+    v8::internal::Thread::CreateThreadLocalKey();
 
-
-// Get the active Simulator for the current thread. See comment above about
-// using a singleton currently.
+// Get the active Simulator for the current thread.
 Simulator* Simulator::current() {
-  if (the_sim == NULL) {
-    the_sim = new Simulator();
+  Simulator* sim = reinterpret_cast<Simulator*>(
+      v8::internal::Thread::GetThreadLocal(simulator_key));
+  if (sim == NULL) {
+    sim = new Simulator();
+    v8::internal::Thread::SetThreadLocal(simulator_key, sim);

[iposva, 2008/11/12 20:16:42]

Since there is no AttachCurrentThread/DetachCurrentThread in the API we will be
leaking these simulators and their associated thread states. I know that the
thread switching code tries to somehow deal with that. You should file a bug to
deal with this at some later point.

   }
-  return the_sim;
+  return sim;
 }
 
 
 // Sets the register in the architecture state. It will also deal with updating
 // Simulator internal state for special registers such as PC.
 void Simulator::set_register(int reg, int32_t value) {
   ASSERT((reg >= 0) && (reg < num_registers));
   if (reg == pc) {
     pc_modified_ = true;
   }
@@ skipping 1080 matching lines @@
       }
     }
   }
   if (!pc_modified_) {
     set_register(pc, reinterpret_cast<int32_t>(instr) + Instr::kInstrSize);
   }
 }
 
 
 //
-void Simulator::execute() {
+void Simulator::Execute() {
   // Get the PC to simulate. Cannot use the accessor here as we need the
   // raw PC value and not the one used as input to arithmetic instructions.
   int program_counter = get_pc();
 
   if (::v8::internal::FLAG_stop_sim_at == 0) {
     // Fast version of the dispatch loop without checking whether the simulator
     // should be stopping at a particular executed instruction.
     while (program_counter != end_sim_pc) {
       Instr* instr = reinterpret_cast<Instr*>(program_counter);
       icount_++;
@@ skipping 11 matching lines @@
         dbg.Debug();
       } else {
         InstructionDecode(instr);
       }
       program_counter = get_pc();
     }
   }
 }
 
 
-Object* Simulator::call(int32_t entry, int32_t p0, int32_t p1, int32_t p2,
+Object* Simulator::Call(int32_t entry, int32_t p0, int32_t p1, int32_t p2,
                            int32_t p3, int32_t p4) {
   // Setup parameters
   set_register(r0, p0);
   set_register(r1, p1);
   set_register(r2, p2);
   set_register(r3, p3);
   intptr_t* stack_pointer = reinterpret_cast<intptr_t*>(get_register(sp));
   *(--stack_pointer) = p4;
   set_register(sp, reinterpret_cast<int32_t>(stack_pointer));
 
@@ skipping 22 matching lines @@
   set_register(r4, callee_saved_value);
   set_register(r5, callee_saved_value);
   set_register(r6, callee_saved_value);
   set_register(r7, callee_saved_value);
   set_register(r8, callee_saved_value);
   set_register(r9, callee_saved_value);
   set_register(r10, callee_saved_value);
   set_register(r11, callee_saved_value);
 
   // Start the simulation
-  execute();
+  Execute();
 
   // Check that the callee-saved registers have been preserved.
   CHECK_EQ(get_register(r4), callee_saved_value);
   CHECK_EQ(get_register(r5), callee_saved_value);
   CHECK_EQ(get_register(r6), callee_saved_value);
   CHECK_EQ(get_register(r7), callee_saved_value);
   CHECK_EQ(get_register(r8), callee_saved_value);
   CHECK_EQ(get_register(r9), callee_saved_value);
   CHECK_EQ(get_register(r10), callee_saved_value);
   CHECK_EQ(get_register(r11), callee_saved_value);
 
   // Restore callee-saved registers with the original value.
   set_register(r4, r4_val);
   set_register(r5, r5_val);
   set_register(r6, r6_val);
   set_register(r7, r7_val);
   set_register(r8, r8_val);
   set_register(r9, r9_val);
   set_register(r10, r10_val);
   set_register(r11, r11_val);
 
   int result = get_register(r0);
   return reinterpret_cast<Object*>(result);
 }
 
 } }  // namespace assembler::arm
 
 #endif  // !defined(__arm__)