AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

[loong64][mips] Increase the number of args supported by the simulator to 20

Browse Source 
Port commit 4de20cb1de

Change-Id: I753c9e02b517d73caf12e12104196f1a5b82847c
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3258452
Auto-Submit: Zhao Jiazhong <zhaojiazhong-hf@loongson.cn>
Reviewed-by: Liu yu <liuyu@loongson.cn>
Commit-Queue: Liu yu <liuyu@loongson.cn>
Cr-Commit-Position: refs/heads/main@{#77669}
This commit is contained in:
Zhao Jiazhong 2021-11-03 11:07:21 +08:00 committed by V8 LUCI CQ
parent 4c998e0098
commit 4eca28b35e
3 changed files with 74 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/execution/loong64/simulator-loong64.cc
View File

@ -2014,11 +2014,11 @@ void Simulator::Format(Instruction* instr, const char* format) {
// 64 bits of result. If they don't, the v1 result register contains a bogus
// value, which is fine because it is caller-saved.
using SimulatorRuntimeCall = ObjectPair (*)(int64_t arg0, int64_t arg1,
int64_t arg2, int64_t arg3,
int64_t arg4, int64_t arg5,
int64_t arg6, int64_t arg7,
int64_t arg8, int64_t arg9);
using SimulatorRuntimeCall = ObjectPair (*)(
int64_t arg0, int64_t arg1, int64_t arg2, int64_t arg3, int64_t arg4,
int64_t arg5, int64_t arg6, int64_t arg7, int64_t arg8, int64_t arg9,
int64_t arg10, int64_t arg11, int64_t arg12, int64_t arg13, int64_t arg14,
int64_t arg15, int64_t arg16, int64_t arg17, int64_t arg18, int64_t arg19);
// These prototypes handle the four types of FP calls.
using SimulatorRuntimeCompareCall = int64_t (*)(double darg0, double darg1);
@ -2058,7 +2058,17 @@ void Simulator::SoftwareInterrupt() {
int64_t arg7 = get_register(a7);
int64_t arg8 = stack_pointer[0];
int64_t arg9 = stack_pointer[1];
STATIC_ASSERT(kMaxCParameters == 10);
int64_t arg10 = stack_pointer[2];
int64_t arg11 = stack_pointer[3];
int64_t arg12 = stack_pointer[4];
int64_t arg13 = stack_pointer[5];
int64_t arg14 = stack_pointer[6];
int64_t arg15 = stack_pointer[7];
int64_t arg16 = stack_pointer[8];
int64_t arg17 = stack_pointer[9];
int64_t arg18 = stack_pointer[10];
int64_t arg19 = stack_pointer[11];
STATIC_ASSERT(kMaxCParameters == 20);
bool fp_call =
(redirection->type() == ExternalReference::BUILTIN_FP_FP_CALL) ||
@ -2227,12 +2237,17 @@ void Simulator::SoftwareInterrupt() {
"Call to host function at %p "
"args %08" PRIx64 " , %08" PRIx64 " , %08" PRIx64 " , %08" PRIx64
" , %08" PRIx64 " , %08" PRIx64 " , %08" PRIx64 " , %08" PRIx64
" , %08" PRIx64 " , %08" PRIx64 " \n",
" , %08" PRIx64 " , %08" PRIx64 " , %08" PRIx64 " , %08" PRIx64
" , %08" PRIx64 " , %08" PRIx64 " , %08" PRIx64 " , %08" PRIx64
" , %08" PRIx64 " , %08" PRIx64 " , %08" PRIx64 " , %08" PRIx64
" \n",
reinterpret_cast<void*>(FUNCTION_ADDR(target)), arg0, arg1, arg2,
arg3, arg4, arg5, arg6, arg7, arg8, arg9);
arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12,
arg13, arg14, arg15, arg16, arg17, arg18, arg19);
}
ObjectPair result =
target(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
ObjectPair result = target(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7,
arg8, arg9, arg10, arg11, arg12, arg13, arg14,
arg15, arg16, arg17, arg18, arg19);
set_register(v0, (int64_t)(result.x));
set_register(v1, (int64_t)(result.y));
}

34
src/execution/mips/simulator-mips.cc
View File

@ -2187,11 +2187,11 @@ void Simulator::Format(Instruction* instr, const char* format) {
// 64-bit value. With the code below we assume that all runtime calls return
// 64 bits of result. If they don't, the v1 result register contains a bogus
// value, which is fine because it is caller-saved.
using SimulatorRuntimeCall = int64_t (*)(int32_t arg0, int32_t arg1,
int32_t arg2, int32_t arg3,
int32_t arg4, int32_t arg5,
int32_t arg6, int32_t arg7,
int32_t arg8, int32_t arg9);
using SimulatorRuntimeCall = int64_t (*)(
int32_t arg0, int32_t arg1, int32_t arg2, int32_t arg3, int32_t arg4,
int32_t arg5, int32_t arg6, int32_t arg7, int32_t arg8, int32_t arg9,
int32_t arg10, int32_t arg11, int32_t arg12, int32_t arg13, int32_t arg14,
int32_t arg15, int32_t arg16, int32_t arg17, int32_t arg18, int32_t arg19);
// These prototypes handle the four types of FP calls.
using SimulatorRuntimeCompareCall = int64_t (*)(double darg0, double darg1);
@ -2234,7 +2234,17 @@ void Simulator::SoftwareInterrupt() {
int32_t arg7 = stack_pointer[7];
int32_t arg8 = stack_pointer[8];
int32_t arg9 = stack_pointer[9];
STATIC_ASSERT(kMaxCParameters == 10);
int32_t arg10 = stack_pointer[10];
int32_t arg11 = stack_pointer[11];
int32_t arg12 = stack_pointer[12];
int32_t arg13 = stack_pointer[13];
int32_t arg14 = stack_pointer[14];
int32_t arg15 = stack_pointer[15];
int32_t arg16 = stack_pointer[16];
int32_t arg17 = stack_pointer[17];
int32_t arg18 = stack_pointer[18];
int32_t arg19 = stack_pointer[19];
STATIC_ASSERT(kMaxCParameters == 20);
bool fp_call =
(redirection->type() == ExternalReference::BUILTIN_FP_FP_CALL) ||
@ -2415,12 +2425,16 @@ void Simulator::SoftwareInterrupt() {
if (::v8::internal::FLAG_trace_sim) {
PrintF(
"Call to host function at %p "
"args %08x, %08x, %08x, %08x, %08x, %08x, %08x, %08x, %08x, %08x\n",
"args %08x, %08x, %08x, %08x, %08x, %08x, %08x, %08x, %08x, %08xi, "
"%08xi, %08xi, %08xi, %08xi, %08xi, %08xi, %08xi, %08xi, %08xi, "
"%08xi\n",
reinterpret_cast<void*>(FUNCTION_ADDR(target)), arg0, arg1, arg2,
arg3, arg4, arg5, arg6, arg7, arg8, arg9);
arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12,
arg13, arg14, arg15, arg16, arg17, arg18, arg19);
}
int64_t result =
target(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
int64_t result = target(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7,
arg8, arg9, arg10, arg11, arg12, arg13, arg14,
arg15, arg16, arg17, arg18, arg19);
set_register(v0, static_cast<int32_t>(result));
set_register(v1, static_cast<int32_t>(result >> 32));
}

36
src/execution/mips64/simulator-mips64.cc
View File

@ -2207,12 +2207,11 @@ void Simulator::Format(Instruction* instr, const char* format) {
// 64-bit value. With the code below we assume that all runtime calls return
// 64 bits of result. If they don't, the v1 result register contains a bogus
// value, which is fine because it is caller-saved.
using SimulatorRuntimeCall = ObjectPair (*)(int64_t arg0, int64_t arg1,
int64_t arg2, int64_t arg3,
int64_t arg4, int64_t arg5,
int64_t arg6, int64_t arg7,
int64_t arg8, int64_t arg9);
using SimulatorRuntimeCall = ObjectPair (*)(
int64_t arg0, int64_t arg1, int64_t arg2, int64_t arg3, int64_t arg4,
int64_t arg5, int64_t arg6, int64_t arg7, int64_t arg8, int64_t arg9,
int64_t arg10, int64_t arg11, int64_t arg12, int64_t arg13, int64_t arg14,
int64_t arg15, int64_t arg16, int64_t arg17, int64_t arg18, int64_t arg19);
// These prototypes handle the four types of FP calls.
using SimulatorRuntimeCompareCall = int64_t (*)(double darg0, double darg1);
@ -2254,7 +2253,17 @@ void Simulator::SoftwareInterrupt() {
int64_t arg7 = get_register(a7);
int64_t arg8 = stack_pointer[0];
int64_t arg9 = stack_pointer[1];
STATIC_ASSERT(kMaxCParameters == 10);
int64_t arg10 = stack_pointer[2];
int64_t arg11 = stack_pointer[3];
int64_t arg12 = stack_pointer[4];
int64_t arg13 = stack_pointer[5];
int64_t arg14 = stack_pointer[6];
int64_t arg15 = stack_pointer[7];
int64_t arg16 = stack_pointer[8];
int64_t arg17 = stack_pointer[9];
int64_t arg18 = stack_pointer[10];
int64_t arg19 = stack_pointer[11];
STATIC_ASSERT(kMaxCParameters == 20);
bool fp_call =
(redirection->type() == ExternalReference::BUILTIN_FP_FP_CALL) ||
@ -2423,12 +2432,17 @@ void Simulator::SoftwareInterrupt() {
"Call to host function at %p "
"args %08" PRIx64 " , %08" PRIx64 " , %08" PRIx64 " , %08" PRIx64
" , %08" PRIx64 " , %08" PRIx64 " , %08" PRIx64 " , %08" PRIx64
" , %08" PRIx64 " , %08" PRIx64 " \n",
" , %08" PRIx64 " , %08" PRIx64 " , %08" PRIx64 " , %08" PRIx64
" , %08" PRIx64 " , %08" PRIx64 " , %08" PRIx64 " , %08" PRIx64
" , %08" PRIx64 " , %08" PRIx64 " , %08" PRIx64 " , %08" PRIx64
" \n",
reinterpret_cast<void*>(FUNCTION_ADDR(target)), arg0, arg1, arg2,
arg3, arg4, arg5, arg6, arg7, arg8, arg9);
arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12,
arg13, arg14, arg15, arg16, arg17, arg18, arg19);
}
ObjectPair result =
target(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
ObjectPair result = target(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7,
arg8, arg9, arg10, arg11, arg12, arg13, arg14,
arg15, arg16, arg17, arg18, arg19);
set_register(v0, (int64_t)(result.x));
set_register(v1, (int64_t)(result.y));
}