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

ppc64: fix compilation error

Browse Source 
Change-Id: I8a46ee0f64d6e9b7d71c7f494cac3eff817fbdda
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3582417
Reviewed-by: Milad Farazmand <mfarazma@redhat.com>
Commit-Queue: Junliang Yan <junyan@redhat.com>
Cr-Commit-Position: refs/heads/main@{#79923}
This commit is contained in:
Junliang Yan 2022-04-11 11:19:00 -04:00 committed by V8 LUCI CQ
parent a913a75b8c
commit d2491aed27
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/builtins/ppc/builtins-ppc.cc
View File

@ -79,6 +79,18 @@ void Generate_OSREntry(MacroAssembler* masm, Register entry_address,
__ Ret();
}
void ResetBytecodeAgeAndOsrState(MacroAssembler* masm, Register bytecode_array,
Register scratch) {
// Reset the bytecode age and OSR state (optimized to a single write).
static_assert(BytecodeArray::kOsrStateAndBytecodeAgeAreContiguous32Bits);
STATIC_ASSERT(BytecodeArray::kNoAgeBytecodeAge == 0);
__ mov(scratch, Operand(0));
__ StoreU32(scratch,
FieldMemOperand(bytecode_array,
BytecodeArray::kOsrUrgencyAndInstallTargetOffset),
r0);
}
// Restarts execution either at the current or next (in execution order)
// bytecode. If there is baseline code on the shared function info, converts an
// interpreter frame into a baseline frame and continues execution in baseline
@ -204,7 +216,8 @@ void Generate_BaselineOrInterpreterEntry(MacroAssembler* masm,
if (is_osr) {
Register scratch = ip;
ResetBytecodeAgeAndOsrState(masm, bytecodeArray, scratch);
ResetBytecodeAgeAndOsrState(masm, kInterpreterBytecodeArrayRegister,
scratch);
Generate_OSREntry(masm, code_obj, Code::kHeaderSize - kHeapObjectTag);
} else {
__ AddS64(code_obj, code_obj, Operand(Code::kHeaderSize - kHeapObjectTag));
@ -236,18 +249,6 @@ void Generate_BaselineOrInterpreterEntry(MacroAssembler* masm,
__ b(&start);
}
void ResetBytecodeAgeAndOsrState(MacroAssembler* masm, Register bytecode_array,
Register scratch) {
// Reset the bytecode age and OSR state (optimized to a single write).
static_assert(BytecodeArray::kOsrStateAndBytecodeAgeAreContiguous32Bits);
STATIC_ASSERT(BytecodeArray::kNoAgeBytecodeAge == 0);
__ mov(scratch, Operand(0));
__ StoreU32(scratch,
FieldMemOperand(bytecode_array,
BytecodeArray::kOsrUrgencyAndInstallTargetOffset),
r0);
}
} // namespace
void Builtins::Generate_Adaptor(MacroAssembler* masm, Address address) {
@ -1397,7 +1398,7 @@ void Builtins::Generate_InterpreterEntryTrampoline(MacroAssembler* masm) {
FrameScope frame_scope(masm, StackFrame::MANUAL);
__ PushStandardFrame(closure);
ResetBytecodeAgeAndOsrState(masm, bytecodeArray, r8);
ResetBytecodeAgeAndOsrState(masm, kInterpreterBytecodeArrayRegister, r8);
// Load initial bytecode offset.
__ mov(kInterpreterBytecodeOffsetRegister,