A64: Synchronize with r19001.

src/a64/simulator-a64.cc

 // Copyright 2013 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 474 matching lines @@
     return new Redirection(external_function, type);
   }
 
   static Redirection* FromHltInstruction(Instruction* redirect_call) {
     char* addr_of_hlt = reinterpret_cast<char*>(redirect_call);
     char* addr_of_redirection =
         addr_of_hlt - OFFSET_OF(Redirection, redirect_call_);
     return reinterpret_cast<Redirection*>(addr_of_redirection);
   }
 
+  static void* ReverseRedirection(int64_t reg) {
+    Redirection* redirection =
+        FromHltInstruction(reinterpret_cast<Instruction*>(reg));
+    return redirection->external_function();
+  }
+
  private:
   void* external_function_;
   Instruction redirect_call_;
   ExternalReference::Type type_;
   Redirection* next_;
 };
 
 
 void* Simulator::RedirectExternalReference(void* external_function,
                                            ExternalReference::Type type) {
@@ skipping 2510 matching lines @@
                                            int64_t arg7);
 
 typedef int64_t (*SimulatorRuntimeCompareCall)(double arg1, double arg2);
 typedef double (*SimulatorRuntimeFPFPCall)(double arg1, double arg2);
 typedef double (*SimulatorRuntimeFPCall)(double arg1);
 typedef double (*SimulatorRuntimeFPIntCall)(double arg1, int32_t arg2);
 
 // This signature supports direct call in to API function native callback
 // (refer to InvocationCallback in v8.h).
 typedef void (*SimulatorRuntimeDirectApiCall)(int64_t arg0);
-typedef void (*SimulatorRuntimeProfilingApiCall)(int64_t arg0, int64_t arg1);
+typedef void (*SimulatorRuntimeProfilingApiCall)(int64_t arg0, void* arg1);
 
 // This signature supports direct call to accessor getter callback.
 typedef void (*SimulatorRuntimeDirectGetterCall)(int64_t arg0, int64_t arg1);
 typedef void (*SimulatorRuntimeProfilingGetterCall)(int64_t arg0, int64_t arg1,
-                                                    int64_t arg2);
+                                                    void* arg2);
 
 void Simulator::VisitException(Instruction* instr) {
   // Define some colour codes to use for log messages.
   // TODO(jbramley): Find a more elegant way of defining these.
   char const* const clr_normal        = (FLAG_log_colour) ? ("\033[m")
                                                           : ("");
   char const* const clr_debug_number  = (FLAG_log_colour) ? ("\033[1;33m")
                                                           : ("");
   char const* const clr_debug_message = (FLAG_log_colour) ? ("\033[0;33m")
                                                           : ("");
@@ skipping 125 matching lines @@
                      result.res0, result.res1);
 #ifdef DEBUG
             CorruptAllCallerSavedCPURegisters();
 #endif
             set_xreg(0, result.res0);
             set_xreg(1, result.res1);
             break;
           }
 
           case ExternalReference::DIRECT_API_CALL: {
-            // void f(v8::Arguments&)
+            // void f(v8::FunctionCallbackInfo&)
             TraceSim("Type: DIRECT_API_CALL\n");
             SimulatorRuntimeDirectApiCall target =
                 reinterpret_cast<SimulatorRuntimeDirectApiCall>(external);
             TraceSim("Arguments: 0x%016" PRIx64 "\n", xreg(0));
             target(xreg(0));
             TraceSim("No return value.");
 #ifdef DEBUG
             CorruptAllCallerSavedCPURegisters();
 #endif
             break;
@@ skipping 53 matching lines @@
             double result = target(dreg(0), wreg(0));
             TraceSim("Returned: %f\n", result);
 #ifdef DEBUG
             CorruptAllCallerSavedCPURegisters();
 #endif
             set_dreg(0, result);
             break;
           }
 
           case ExternalReference::DIRECT_GETTER_CALL: {
-            // void f(Local<String> property, AccessorInfo& info)
+            // void f(Local<String> property, PropertyCallbackInfo& info)
             TraceSim("Type: DIRECT_GETTER_CALL\n");
             SimulatorRuntimeDirectGetterCall target =
                 reinterpret_cast<SimulatorRuntimeDirectGetterCall>(external);
             TraceSim("Arguments: 0x%016" PRIx64 ", 0x%016" PRIx64 "\n",
                      xreg(0), xreg(1));
             target(xreg(0), xreg(1));
             TraceSim("No return value.");
 #ifdef DEBUG
             CorruptAllCallerSavedCPURegisters();
 #endif
             break;
           }
 
           case ExternalReference::PROFILING_API_CALL: {
-            // void f(v8::Arguments&, v8::FunctionCallback)
+            // void f(v8::FunctionCallbackInfo&, v8::FunctionCallback)
             TraceSim("Type: PROFILING_API_CALL\n");
             SimulatorRuntimeProfilingApiCall target =
                 reinterpret_cast<SimulatorRuntimeProfilingApiCall>(external);
-            TraceSim("Arguments: 0x%016" PRIx64 ", 0x%016" PRIx64 "\n",
-                     xreg(0), xreg(1));
-            target(xreg(0), xreg(1));
+            void* arg1 = Redirection::ReverseRedirection(xreg(1));
+            TraceSim("Arguments: 0x%016" PRIx64 ", %p\n", xreg(0), arg1);
+            target(xreg(0), arg1);
             TraceSim("No return value.");
 #ifdef DEBUG
             CorruptAllCallerSavedCPURegisters();
 #endif
             break;
           }
 
           case ExternalReference::PROFILING_GETTER_CALL: {
-            // void f(Local<String> property, AccessorInfo& info,
+            // void f(Local<String> property, PropertyCallbackInfo& info,
             //        AccessorGetterCallback callback)
             TraceSim("Type: PROFILING_GETTER_CALL\n");
             SimulatorRuntimeProfilingGetterCall target =
                 reinterpret_cast<SimulatorRuntimeProfilingGetterCall>(
                     external);
-            TraceSim("Arguments: "
-                     "0x%016" PRIx64 ", 0x%016" PRIx64 ", 0x%016" PRIx64 "\n",
-                     xreg(0), xreg(1), xreg(2));
-            target(xreg(0), xreg(1), xreg(2));
+            void* arg2 = Redirection::ReverseRedirection(xreg(2));
+            TraceSim("Arguments: 0x%016" PRIx64 ", 0x%016" PRIx64 ", %p\n",
+                     xreg(0), xreg(1), arg2);
+            target(xreg(0), xreg(1), arg2);
             TraceSim("No return value.");
 #ifdef DEBUG
             CorruptAllCallerSavedCPURegisters();
 #endif
             break;
           }
         }
 
         set_lr(return_address);
         set_pc(return_address);
@@ skipping 46 matching lines @@
     default:
       UNIMPLEMENTED();
   }
 }
 
 #endif  // USE_SIMULATOR
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_A64