Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(117)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: src/a64/simulator-a64.cc

Issue 141363005: A64: Synchronize with r15204. (Closed) Base URL: https://v8.googlecode.com/svn/branches/experimental/a64
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/a64/macro-assembler-a64.cc ('k') | src/a64/stub-cache-a64.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/a64/simulator-a64.cc
diff --git a/src/a64/simulator-a64.cc b/src/a64/simulator-a64.cc
index 5a0dcf819b2f5e41f3b909937aedd1e0514dc3a2..b47c5bf7985c13a6502719e1f008cc133dd9ee25 100644
--- a/src/a64/simulator-a64.cc
+++ b/src/a64/simulator-a64.cc
@@ -472,7 +472,10 @@ class Redirection {
Isolate* isolate = Isolate::Current();
Redirection* current = isolate->simulator_redirection();
for (; current != NULL; current = current->next_) {
- if (current->external_function_ == external_function) return current;
+ if (current->external_function_ == external_function) {
+ ASSERT_EQ(current->type(), type);
+ return current;
+ }
}
return new Redirection(external_function, type);
}
@@ -3009,11 +3012,18 @@ typedef double (*SimulatorRuntimeFPIntCall)(double arg1, int32_t arg2);
// (refer to InvocationCallback in v8.h).
typedef v8::Handle<v8::Value> (*SimulatorRuntimeDirectApiCall)(int64_t arg0);
typedef void (*SimulatorRuntimeDirectApiCallNew)(int64_t arg0);
+typedef v8::Handle<v8::Value> (*SimulatorRuntimeProfilingApiCall)(int64_t arg0,
+ int64_t arg1);
+typedef void (*SimulatorRuntimeProfilingApiCallNew)(int64_t arg0, int64_t arg1);
// This signature supports direct call to accessor getter callback.
typedef v8::Handle<v8::Value> (*SimulatorRuntimeDirectGetterCall)(int64_t arg0,
int64_t arg1);
typedef void (*SimulatorRuntimeDirectGetterCallNew)(int64_t arg0, int64_t arg1);
+typedef v8::Handle<v8::Value> (*SimulatorRuntimeProfilingGetterCall)(
+ int64_t arg0, int64_t arg1, int64_t arg2);
+typedef void (*SimulatorRuntimeProfilingGetterCallNew)(
+ int64_t arg0, int64_t arg1, int64_t arg2);
void Simulator::VisitException(Instruction* instr) {
// Define some colour codes to use for log messages.
@@ -3129,12 +3139,70 @@ void Simulator::VisitException(Instruction* instr) {
switch (redirection->type()) {
default:
- TraceSim(" with unrecognized redirection type.");
+ TraceSim("Type: Unknown.\n");
UNREACHABLE();
break;
+ case ExternalReference::BUILTIN_CALL: {
+ // MaybeObject* f(v8::internal::Arguments).
+ TraceSim("Type: BUILTIN_CALL\n");
+ SimulatorRuntimeCall target =
+ reinterpret_cast<SimulatorRuntimeCall>(external);
+
+ // We don't know how many arguments are being passed, but we can
+ // pass 8 without touching the stack. They will be ignored by the
+ // host function if they aren't used.
+ TraceSim("Arguments: "
+ "0x%016" PRIx64 ", 0x%016" PRIx64 ", "
+ "0x%016" PRIx64 ", 0x%016" PRIx64 ", "
+ "0x%016" PRIx64 ", 0x%016" PRIx64 ", "
+ "0x%016" PRIx64 ", 0x%016" PRIx64,
+ xreg(0), xreg(1), xreg(2), xreg(3),
+ xreg(4), xreg(5), xreg(6), xreg(7));
+ ObjectPair result = target(xreg(0), xreg(1), xreg(2), xreg(3),
+ xreg(4), xreg(5), xreg(6), xreg(7));
+ TraceSim("Returned: {0x%" PRIx64 ", 0x%" PRIx64"}\n",
+ result.res0, result.res1);
+#ifdef DEBUG
+ CorruptAllCallerSavedCPURegisters();
+#endif
+ set_xreg(0, result.res0);
+ set_xreg(1, result.res1);
+ break;
+ }
+
+ case ExternalReference::DIRECT_API_CALL: {
+ // Handle<Value> f(v8::Arguments&)
+ TraceSim("Type: DIRECT_API_CALL\n");
+ SimulatorRuntimeDirectApiCall target =
+ reinterpret_cast<SimulatorRuntimeDirectApiCall>(external);
+ TraceSim("Arguments: 0x%016" PRIx64 "\n", xreg(0));
+ v8::Handle<v8::Value> result = target(xreg(0));
+ TraceSim("Returned %p\n", reinterpret_cast<void *>(*result));
+#ifdef DEBUG
+ CorruptAllCallerSavedCPURegisters();
+#endif
+ set_reg(0, *result);
+ break;
+ }
+
+ case ExternalReference::DIRECT_API_CALL_NEW: {
+ // void f(v8::Arguments&)
+ TraceSim("Type: DIRECT_API_CALL_NEW\n");
+ SimulatorRuntimeDirectApiCallNew target =
+ reinterpret_cast<SimulatorRuntimeDirectApiCallNew>(external);
+ TraceSim("Arguments: 0x%016" PRIx64 "\n", xreg(0));
+ target(xreg(0));
+ TraceSim("No return value.");
+#ifdef DEBUG
+ CorruptAllCallerSavedCPURegisters();
+#endif
+ break;
+ }
+
case ExternalReference::BUILTIN_COMPARE_CALL: {
// int f(double, double)
+ TraceSim("Type: BUILTIN_COMPARE_CALL\n");
SimulatorRuntimeCompareCall target =
reinterpret_cast<SimulatorRuntimeCompareCall>(external);
TraceSim("Arguments: %f, %f\n", dreg(0), dreg(1));
@@ -3147,12 +3215,13 @@ void Simulator::VisitException(Instruction* instr) {
break;
}
- case ExternalReference::BUILTIN_FP_FP_CALL: {
- // double f(double, double)
- SimulatorRuntimeFPFPCall target =
- reinterpret_cast<SimulatorRuntimeFPFPCall>(external);
- TraceSim("Arguments: %f, %f\n", dreg(0), dreg(1));
- double result = target(dreg(0), dreg(1));
+ case ExternalReference::BUILTIN_FP_CALL: {
+ // double f(double)
+ TraceSim("Type: BUILTIN_FP_CALL\n");
+ SimulatorRuntimeFPCall target =
+ reinterpret_cast<SimulatorRuntimeFPCall>(external);
+ TraceSim("Argument: %f\n", dreg(0));
+ double result = target(dreg(0));
TraceSim("Returned: %f\n", result);
#ifdef DEBUG
CorruptAllCallerSavedCPURegisters();
@@ -3161,12 +3230,13 @@ void Simulator::VisitException(Instruction* instr) {
break;
}
- case ExternalReference::BUILTIN_FP_CALL: {
- // double f(double)
- SimulatorRuntimeFPCall target =
- reinterpret_cast<SimulatorRuntimeFPCall>(external);
- TraceSim("Argument: %f\n", dreg(0));
- double result = target(dreg(0));
+ case ExternalReference::BUILTIN_FP_FP_CALL: {
+ // double f(double, double)
+ TraceSim("Type: BUILTIN_FP_FP_CALL\n");
+ SimulatorRuntimeFPFPCall target =
+ reinterpret_cast<SimulatorRuntimeFPFPCall>(external);
+ TraceSim("Arguments: %f, %f\n", dreg(0), dreg(1));
+ double result = target(dreg(0), dreg(1));
TraceSim("Returned: %f\n", result);
#ifdef DEBUG
CorruptAllCallerSavedCPURegisters();
@@ -3177,6 +3247,7 @@ void Simulator::VisitException(Instruction* instr) {
case ExternalReference::BUILTIN_FP_INT_CALL: {
// double f(double, int)
+ TraceSim("Type: BUILTIN_FP_INT_CALL\n");
SimulatorRuntimeFPIntCall target =
reinterpret_cast<SimulatorRuntimeFPIntCall>(external);
TraceSim("Arguments: %f, %d\n", dreg(0), wreg(0));
@@ -3189,13 +3260,15 @@ void Simulator::VisitException(Instruction* instr) {
break;
}
- case ExternalReference::DIRECT_API_CALL: {
- // Handle<Value> f(v8::Arguments&)
- SimulatorRuntimeDirectApiCall target =
- reinterpret_cast<SimulatorRuntimeDirectApiCall>(external);
- TraceSim("Arguments: 0x%016" PRIx64 "\n", xreg(0));
- v8::Handle<v8::Value> result = target(xreg(0));
- TraceSim("Returned %p\n", reinterpret_cast<void *>(*result));
+ case ExternalReference::DIRECT_GETTER_CALL: {
+ // Handle<value> f(Local<String> property, AccessorInfo& 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));
+ v8::Handle<v8::Value> result = target(xreg(0), xreg(1));
+ TraceSim("Returned: %p\n", reinterpret_cast<void *>(*result));
#ifdef DEBUG
CorruptAllCallerSavedCPURegisters();
#endif
@@ -3203,20 +3276,26 @@ void Simulator::VisitException(Instruction* instr) {
break;
}
- case ExternalReference::DIRECT_API_CALL_NEW: {
- // void f(v8::Arguments&)
- SimulatorRuntimeDirectApiCallNew target =
- reinterpret_cast<SimulatorRuntimeDirectApiCallNew>(external);
- TraceSim("Arguments: 0x%016" PRIx64 "\n", xreg(0));
- target(xreg(0));
+ case ExternalReference::DIRECT_GETTER_CALL_NEW: {
+ // void f(Local<String> property, AccessorInfo& info)
+ TraceSim("Type: DIRECT_GETTER_CALL_NEW\n");
+ SimulatorRuntimeDirectGetterCallNew target =
+ reinterpret_cast<SimulatorRuntimeDirectGetterCallNew>(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::DIRECT_GETTER_CALL: {
- // Handle<value> f(Local<String> property, AccessorInfo& info)
- SimulatorRuntimeDirectGetterCall target =
- reinterpret_cast<SimulatorRuntimeDirectGetterCall>(external);
+ case ExternalReference::PROFILING_API_CALL: {
+ TraceSim("Type: PROFILING_API_CALL\n");
+ // Handle<Value> f(v8::Arguments&, v8::InvocationCallback)
+ SimulatorRuntimeProfilingApiCall target =
+ reinterpret_cast<SimulatorRuntimeProfilingApiCall>(external);
TraceSim("Arguments: 0x%016" PRIx64 ", 0x%016" PRIx64 "\n",
xreg(0), xreg(1));
v8::Handle<v8::Value> result = target(xreg(0), xreg(1));
@@ -3228,41 +3307,54 @@ void Simulator::VisitException(Instruction* instr) {
break;
}
- case ExternalReference::DIRECT_GETTER_CALL_NEW: {
- // void f(Local<String> property, AccessorInfo& info)
- SimulatorRuntimeDirectGetterCallNew target =
- reinterpret_cast<SimulatorRuntimeDirectGetterCallNew>(external);
+ case ExternalReference::PROFILING_API_CALL_NEW: {
+ // void f(v8::Arguments&, v8::FunctionCallback)
+ TraceSim("Type: PROFILING_API_CALL_NEW\n");
+ SimulatorRuntimeProfilingApiCallNew target =
+ reinterpret_cast<SimulatorRuntimeProfilingApiCallNew>(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::BUILTIN_CALL: {
- // MaybeObject* f(v8::internal::Arguments).
- SimulatorRuntimeCall target =
- reinterpret_cast<SimulatorRuntimeCall>(external);
+ case ExternalReference::PROFILING_GETTER_CALL: {
+ // Handle<value> f(Local<String> property, AccessorInfo& info,
+ // AccessorGetter getter)
+ 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));
+ v8::Handle<v8::Value> result = target(xreg(0), xreg(1), xreg(2));
+ TraceSim("Returned: %p\n", reinterpret_cast<void *>(*result));
+#ifdef DEBUG
+ CorruptAllCallerSavedCPURegisters();
+#endif
+ set_reg(0, *result);
+ break;
+ }
- // We don't know how many arguments are being passed, but we can
- // pass 8 without touching the stack. They will be ignored by the
- // host function if they aren't used.
+ case ExternalReference::PROFILING_GETTER_CALL_NEW: {
+ // void f(Local<String> property, AccessorInfo& info,
+ // AccessorGetterCallback callback)
+ TraceSim("Type: PROFILING_GETTER_CALL_NEW\n");
+ SimulatorRuntimeProfilingGetterCallNew target =
+ reinterpret_cast<SimulatorRuntimeProfilingGetterCallNew>(
+ external);
TraceSim("Arguments: "
- "0x%016" PRIx64 ", 0x%016" PRIx64 ", "
- "0x%016" PRIx64 ", 0x%016" PRIx64 ", "
- "0x%016" PRIx64 ", 0x%016" PRIx64 ", "
- "0x%016" PRIx64 ", 0x%016" PRIx64,
- xreg(0), xreg(1), xreg(2), xreg(3),
- xreg(4), xreg(5), xreg(6), xreg(7));
- ObjectPair result = target(xreg(0), xreg(1), xreg(2), xreg(3),
- xreg(4), xreg(5), xreg(6), xreg(7));
- TraceSim("Returned: {0x%" PRIx64 ", 0x%" PRIx64"}\n",
- result.res0, result.res1);
+ "0x%016" PRIx64 ", 0x%016" PRIx64 ", 0x%016" PRIx64 "\n",
+ xreg(0), xreg(1), xreg(2));
+ target(xreg(0), xreg(1), xreg(2));
+ TraceSim("No return value.");
#ifdef DEBUG
CorruptAllCallerSavedCPURegisters();
#endif
- set_xreg(0, result.res0);
- set_xreg(1, result.res1);
break;
}
}
« no previous file with comments | « src/a64/macro-assembler-a64.cc ('k') | src/a64/stub-cache-a64.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698