openharmony/arkcompiler_ets_runtime
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkcompiler_ets_runtime synced 2025-02-25 14:53:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!8254 repair board alarm

Browse Source 
Merge pull request !8254 from yy/master
This commit is contained in:
openharmony_ci 2024-07-20 22:25:07 +00:00 committed by Gitee
commit 89a83f6fc4
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ecmascript/compiler/aot_file/elf_builder.cpp
View File

@ -177,7 +177,7 @@ uint32_t ElfBuilder::GetShIndex(ElfSecName section) const
}
idx++;
}
return -1;
return 0;
}
int ElfBuilder::GetSecNum() const

3
ecmascript/compiler/trampoline/x64/asm_interpreter_call.cpp
View File

@ -1227,7 +1227,8 @@ void AsmInterpreterCall::ResumeRspAndReturn(ExtendedAssembler *assembler)
__ BindAssemblerStub(RTSTUB_ID(ResumeRspAndReturn));
Register currentSp = r12;
Register fpRegister = r10;
intptr_t offset = AsmInterpretedFrame::GetFpOffset(false) - AsmInterpretedFrame::GetSize(false);
intptr_t offset = AsmInterpretedFrame::GetFpOffsetAsIntptr(false) -
AsmInterpretedFrame::GetSizeAsIntptr(false);
__ Movq(Operand(currentSp, static_cast<int32_t>(offset)), fpRegister);
__ Movq(fpRegister, rsp);
// return

10
ecmascript/frames.h
View File

@ -1089,6 +1089,16 @@ struct AsmInterpretedFrame : public base::AlignedStruct<JSTaggedValue::TaggedTyp
return isArch32 ? AsmInterpretedFrame::SizeArch32 : AsmInterpretedFrame::SizeArch64;
}
static intptr_t GetFpOffsetAsIntptr(bool isArch32)
{
return static_cast<intptr_t>(GetFpOffset(isArch32));
}
static intptr_t GetSizeAsIntptr(bool isArch32)
{
return static_cast<intptr_t>(GetSize(isArch32));
}
static uint32_t NumOfMembers()
{
return sizeof(AsmInterpretedFrame) / JSTaggedValue::TaggedTypeSize();

3
ecmascript/stackmap/llvm/llvm_stackmap_parser.h
View File

@ -56,6 +56,9 @@ public:
dataInfo_ = nullptr;
funAddr_.clear();
fun2FpDelta_.clear();
llvmStackMap_.head.stackmapversion = 0;
llvmStackMap_.head.reserved0 = 0;
llvmStackMap_.head.reserved1 = 0;
}
~LLVMStackMapParser()
{