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

[mips][wasm-c-api] Correct the saved return address.

Browse Source 
port f5ab7d3 https://crrev.com/c/1627539.

Change-Id: Ibe721144301bff6d843b6d1861b5a20890a057bb
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1818004
Commit-Queue: Yu Yin <xwafish@gmail.com>
Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
Cr-Commit-Position: refs/heads/master@{#63937}
This commit is contained in:
Yu Yin 2019-09-23 20:52:14 +08:00 committed by Commit Bot
parent b12a07c29c
commit 663c7251a5
2 changed files with 42 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/compiler/backend/mips/code-generator-mips.cc
View File

@ -779,12 +779,24 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
break; break;
case kArchCallCFunction: { case kArchCallCFunction: {
int const num_parameters = MiscField::decode(instr->opcode()); int const num_parameters = MiscField::decode(instr->opcode());
Label return_location; Label start_call;
if (linkage()->GetIncomingDescriptor()->IsWasmCapiFunction()) { bool isWasmCapiFunction =
linkage()->GetIncomingDescriptor()->IsWasmCapiFunction();
int offset = 48;
#if V8_HOST_ARCH_MIPS
if (__ emit_debug_code()) {
offset += 16;
}
#endif
if (isWasmCapiFunction) {
// Put the return address in a stack slot. // Put the return address in a stack slot.
__ LoadAddress(kScratchReg, &return_location); __ mov(kScratchReg, ra);
__ sw(kScratchReg, __ bind(&start_call);
MemOperand(fp, WasmExitFrameConstants::kCallingPCOffset)); __ nal();
__ nop();
__ Addu(ra, ra, offset);
__ sw(ra, MemOperand(fp, WasmExitFrameConstants::kCallingPCOffset));
__ mov(ra, kScratchReg);
} }
if (instr->InputAt(0)->IsImmediate()) { if (instr->InputAt(0)->IsImmediate()) {
ExternalReference ref = i.InputExternalReference(0); ExternalReference ref = i.InputExternalReference(0);
@ -793,7 +805,10 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
Register func = i.InputRegister(0); Register func = i.InputRegister(0);
__ CallCFunction(func, num_parameters); __ CallCFunction(func, num_parameters);
} }
__ bind(&return_location); if (isWasmCapiFunction) {
CHECK_EQ(offset, __ SizeOfCodeGeneratedSince(&start_call));
}
RecordSafepoint(instr->reference_map(), Safepoint::kNoLazyDeopt); RecordSafepoint(instr->reference_map(), Safepoint::kNoLazyDeopt);
frame_access_state()->SetFrameAccessToDefault(); frame_access_state()->SetFrameAccessToDefault();
// Ideally, we should decrement SP delta to match the change of stack // Ideally, we should decrement SP delta to match the change of stack

27
src/compiler/backend/mips64/code-generator-mips64.cc
View File

@ -757,12 +757,24 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
break; break;
case kArchCallCFunction: { case kArchCallCFunction: {
int const num_parameters = MiscField::decode(instr->opcode()); int const num_parameters = MiscField::decode(instr->opcode());
Label return_location; Label start_call;
if (linkage()->GetIncomingDescriptor()->IsWasmCapiFunction()) { bool isWasmCapiFunction =
linkage()->GetIncomingDescriptor()->IsWasmCapiFunction();
int offset = 48;
#if V8_HOST_ARCH_MIPS64
if (__ emit_debug_code()) {
offset += 16;
}
#endif
if (isWasmCapiFunction) {
// Put the return address in a stack slot. // Put the return address in a stack slot.
__ LoadAddress(kScratchReg, &return_location); __ mov(kScratchReg, ra);
__ sd(kScratchReg, __ bind(&start_call);
MemOperand(fp, WasmExitFrameConstants::kCallingPCOffset)); __ nal();
__ nop();
__ Daddu(ra, ra, offset);
__ sd(ra, MemOperand(fp, WasmExitFrameConstants::kCallingPCOffset));
__ mov(ra, kScratchReg);
} }
if (instr->InputAt(0)->IsImmediate()) { if (instr->InputAt(0)->IsImmediate()) {
ExternalReference ref = i.InputExternalReference(0); ExternalReference ref = i.InputExternalReference(0);
@ -771,7 +783,10 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
Register func = i.InputRegister(0); Register func = i.InputRegister(0);
__ CallCFunction(func, num_parameters); __ CallCFunction(func, num_parameters);
} }
__ bind(&return_location); if (isWasmCapiFunction) {
CHECK_EQ(offset, __ SizeOfCodeGeneratedSince(&start_call));
}
RecordSafepoint(instr->reference_map(), Safepoint::kNoLazyDeopt); RecordSafepoint(instr->reference_map(), Safepoint::kNoLazyDeopt);
frame_access_state()->SetFrameAccessToDefault(); frame_access_state()->SetFrameAccessToDefault();
// Ideally, we should decrement SP delta to match the change of stack // Ideally, we should decrement SP delta to match the change of stack