openharmony/arkcompiler_ets_runtime
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkcompiler_ets_runtime synced 2024-11-23 10:09:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!10257 Bugfix for baselinejit in arm64

Browse Source 
Merge pull request !10257 from huangyan/baseline_bugfix_for_arm64
This commit is contained in:
openharmony_ci 2024-11-21 15:57:21 +00:00 committed by Gitee
commit 7076c4d1bc
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ecmascript/compiler/trampoline/aarch64/asm_interpreter_call.cpp
View File

@ -1631,7 +1631,12 @@ void AsmInterpreterCall::PushVregs(ExtendedAssembler *assembler,
__ Cmp(tempRegister, Immediate(JSTaggedValue::VALUE_HOLE)); __ Cmp(tempRegister, Immediate(JSTaggedValue::VALUE_HOLE));
__ B(Condition::EQ, &baselineCodeUndefined); __ B(Condition::EQ, &baselineCodeUndefined);
__ Ldr(tempRegister, MemoryOperand(tempRegister, MachineCode::FUNCADDR_OFFSET)); if (MachineCode::FUNCADDR_OFFSET % 8 == 0) { // 8: imm in 64-bit ldr insn must be a multiple of 8
__ Ldr(tempRegister, MemoryOperand(tempRegister, MachineCode::FUNCADDR_OFFSET));
} else {
ASSERT(MachineCode::FUNCADDR_OFFSET < 256); // 256: imm in ldur insn must be in the range -256 to 255
__ Ldur(tempRegister, MemoryOperand(tempRegister, MachineCode::FUNCADDR_OFFSET));
}
if (glue != X19) { if (glue != X19) {
__ Mov(X19, glue); __ Mov(X19, glue);
} }

2
ecmascript/mem/heap-inl.h
View File

@ -496,7 +496,7 @@ TaggedObject *Heap::AllocateMachineCodeObject(JSHClass *hclass, size_t size, Mac
// Jit Fort enabled // Jit Fort enabled
ASSERT(GetEcmaVM()->GetJSOptions().GetEnableJitFort()); ASSERT(GetEcmaVM()->GetJSOptions().GetEnableJitFort());
if (!GetEcmaVM()->GetJSOptions().GetEnableAsyncCopyToFort() || !desc->isAsyncCompileMode) { if (!GetEcmaVM()->GetJSOptions().GetEnableAsyncCopyToFort()) {
desc->instructionsAddr = 0; desc->instructionsAddr = 0;
if (size <= MAX_REGULAR_HEAP_OBJECT_SIZE) { if (size <= MAX_REGULAR_HEAP_OBJECT_SIZE) {
// for non huge code cache obj, allocate fort space before allocating the code object // for non huge code cache obj, allocate fort space before allocating the code object