Direct call api functions (arm implementation)

src/arm/simulator-arm.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 30 matching lines @@
 
 // Only build the simulator if not compiling for real ARM hardware.
 namespace assembler {
 namespace arm {
 
 using ::v8::internal::Object;
 using ::v8::internal::PrintF;
 using ::v8::internal::OS;
 using ::v8::internal::ReadLine;
 using ::v8::internal::DeleteArray;
+using ::v8::internal::ExternalReference;
 
 // This macro provides a platform independent use of sscanf. The reason for
 // SScanF not being implemented in a platform independent way through
 // ::v8::internal::OS in the same way as SNPrintF is that the
 // Windows C Run-Time Library does not provide vsscanf.
 #define SScanF sscanf  // NOLINT
 
 // The Debugger class is used by the simulator while debugging simulated ARM
 // code.
 class Debugger {
@@ skipping 677 matching lines @@
 
 // When the generated code calls an external reference we need to catch that in
 // the simulator.  The external reference will be a function compiled for the
 // host architecture.  We need to call that function instead of trying to
 // execute it with the simulator.  We do that by redirecting the external
 // reference to a svc (Supervisor Call) instruction that is handled by
 // the simulator.  We write the original destination of the jump just at a known
 // offset from the svc instruction so the simulator knows what to call.
 class Redirection {
  public:
-  Redirection(void* external_function, bool fp_return)
+  Redirection(void* external_function, bool fp_return,
+              ExternalReference::Type type)
       : external_function_(external_function),
         swi_instruction_((AL << 28) | (0xf << 24) | call_rt_redirected),
         fp_return_(fp_return),
+        type_(type),
         next_(list_) {
     Simulator::current()->
         FlushICache(reinterpret_cast<void*>(&swi_instruction_),
                       Instr::kInstrSize);
     list_ = this;
   }
 
   void* address_of_swi_instruction() {
     return reinterpret_cast<void*>(&swi_instruction_);
   }
 
   void* external_function() { return external_function_; }
   bool fp_return() { return fp_return_; }
+  ExternalReference::Type type() { return type_; }
 
-  static Redirection* Get(void* external_function, bool fp_return) {
+  static Redirection* Get(void* external_function, bool fp_return,
+                          ExternalReference::Type type) {
     Redirection* current;
     for (current = list_; current != NULL; current = current->next_) {
       if (current->external_function_ == external_function) return current;
     }
-    return new Redirection(external_function, fp_return);
+    return new Redirection(external_function, fp_return, type);
   }
 
   static Redirection* FromSwiInstruction(Instr* swi_instruction) {
     char* addr_of_swi = reinterpret_cast<char*>(swi_instruction);
     char* addr_of_redirection =
         addr_of_swi - OFFSET_OF(Redirection, swi_instruction_);
     return reinterpret_cast<Redirection*>(addr_of_redirection);
   }
 
  private:
   void* external_function_;
   uint32_t swi_instruction_;
   bool fp_return_;
+  ExternalReference::Type type_;
   Redirection* next_;
   static Redirection* list_;
 };
 
 
 Redirection* Redirection::list_ = NULL;
 
 
-void* Simulator::RedirectExternalReference(void* external_function,
-                                           bool fp_return) {
-  Redirection* redirection = Redirection::Get(external_function, fp_return);
+void* Simulator::RedirectExternalReference(
+    void* external_function, bool fp_return, ExternalReference::Type type) {

[Erik Corry, 2011/01/21 14:28:40]

You shouldn't need both the bool for the fp_return and the external reference
type.  They can both be folded into the external reference type.

[Zaheer, 2011/01/24 09:43:31]

Done.

+  Redirection* redirection = Redirection::Get(
+      external_function, fp_return, type);
   return redirection->address_of_swi_instruction();
 }
 
 
 // Get the active Simulator for the current thread.
 Simulator* Simulator::current() {
   Initialize();
   Simulator* sim = reinterpret_cast<Simulator*>(
       v8::internal::Thread::GetThreadLocal(simulator_key));
   if (sim == NULL) {
@@ skipping 720 matching lines @@
 typedef int64_t (*SimulatorRuntimeCall)(int32_t arg0,
                                         int32_t arg1,
                                         int32_t arg2,
                                         int32_t arg3,
                                         int32_t arg4);
 typedef double (*SimulatorRuntimeFPCall)(int32_t arg0,
                                          int32_t arg1,
                                          int32_t arg2,
                                          int32_t arg3);
 
+// This signature supports direct call in to js function native callback

[antonm, 2011/01/21 17:56:36]

I'd use API function instead of js function here

[Zaheer, 2011/01/24 09:43:31]

Done.

+// (refer to InvocationCallback in v8.h).
+typedef v8::Handle<v8::Value> (*SimulatorRuntimeApiCall)(int32_t arg0);
 
 // Software interrupt instructions are used by the simulator to call into the
 // C-based V8 runtime.
 void Simulator::SoftwareInterrupt(Instr* instr) {
   int svc = instr->SvcField();
   switch (svc) {
     case call_rt_redirected: {
       // Check if stack is aligned. Error if not aligned is reported below to
       // include information on the function called.
       bool stack_aligned =
@@ skipping 21 matching lines @@
                  FUNCTION_ADDR(target), x, y);
           if (!stack_aligned) {
             PrintF(" with unaligned stack %08x\n", get_register(sp));
           }
           PrintF("\n");
         }
         CHECK(stack_aligned);
         double result = target(arg0, arg1, arg2, arg3);
         SetFpResult(result);
       } else {
-        intptr_t external =
-            reinterpret_cast<int32_t>(redirection->external_function());
-        SimulatorRuntimeCall target =
-            reinterpret_cast<SimulatorRuntimeCall>(external);
-        if (::v8::internal::FLAG_trace_sim || !stack_aligned) {
-          PrintF(
-              "Call to host function at %p args %08x, %08x, %08x, %08x, %0xc",
-              FUNCTION_ADDR(target),
-              arg0,
-              arg1,
-              arg2,
-              arg3,
-              arg4);
-          if (!stack_aligned) {
-            PrintF(" with unaligned stack %08x\n", get_register(sp));
+        if (redirection->type() == ExternalReference::DIRECT_CALL) {
+          intptr_t external =
+              reinterpret_cast<int32_t>(redirection->external_function());
+          SimulatorRuntimeApiCall target =

[antonm, 2011/01/21 17:56:36]

please, consider refactoring the common logic of logging and stack alignment
checks

[Zaheer, 2011/01/24 09:43:31]

The log is unique to each case, the stack alignment check refactoring also has a
problem - moving it down will mean it will print after executing function,
moving it before will impact readability of log. Any ideas.

[antonm, 2011/01/26 11:36:37]

Ok, let's leave it as you have it now.

+              reinterpret_cast<SimulatorRuntimeApiCall>(external);
+          if (::v8::internal::FLAG_trace_sim || !stack_aligned) {
+            PrintF(
+                "Call to host function at %p args %08x",
+                FUNCTION_ADDR(target),
+                arg0);
+            if (!stack_aligned) {
+              PrintF(" with unaligned stack %08x\n", get_register(sp));
+            }
+            PrintF("\n");
           }
-          PrintF("\n");
+          CHECK(stack_aligned);
+          v8::Handle<v8::Value> result = target(arg0);
+          if (::v8::internal::FLAG_trace_sim) {
+            PrintF("Returned %p\n", reinterpret_cast<void *>(*result));
+          }
+          set_register(r0, (int32_t) *result);
+        } else {
+          intptr_t external =
+              reinterpret_cast<int32_t>(redirection->external_function());
+          SimulatorRuntimeCall target =
+              reinterpret_cast<SimulatorRuntimeCall>(external);
+          if (::v8::internal::FLAG_trace_sim || !stack_aligned) {
+            PrintF(
+                "Call to host function at %p args %08x, %08x, %08x, %08x, %0xc",
+                FUNCTION_ADDR(target),
+                arg0,
+                arg1,
+                arg2,
+                arg3,
+                arg4);
+            if (!stack_aligned) {
+              PrintF(" with unaligned stack %08x\n", get_register(sp));
+            }
+            PrintF("\n");
+          }
+          CHECK(stack_aligned);
+          int64_t result = target(arg0, arg1, arg2, arg3, arg4);
+          int32_t lo_res = static_cast<int32_t>(result);
+          int32_t hi_res = static_cast<int32_t>(result >> 32);
+          if (::v8::internal::FLAG_trace_sim) {
+            PrintF("Returned %08x\n", lo_res);
+          }
+          set_register(r0, lo_res);
+          set_register(r1, hi_res);
         }
-        CHECK(stack_aligned);
-        int64_t result = target(arg0, arg1, arg2, arg3, arg4);
-        int32_t lo_res = static_cast<int32_t>(result);
-        int32_t hi_res = static_cast<int32_t>(result >> 32);
-        if (::v8::internal::FLAG_trace_sim) {
-          PrintF("Returned %08x\n", lo_res);
-        }
-        set_register(r0, lo_res);
-        set_register(r1, hi_res);
       }
       set_register(lr, saved_lr);
       set_pc(get_register(lr));
       break;
     }
     case break_point: {
       Debugger dbg(this);
       dbg.Debug();
       break;
     }
@@ skipping 1430 matching lines @@
   uintptr_t address = *stack_slot;
   set_register(sp, current_sp + sizeof(uintptr_t));
   return address;
 }
 
 } }  // namespace assembler::arm
 
 #endif  // USE_SIMULATOR
 
 #endif  // V8_TARGET_ARCH_ARM