openharmony/arkcompiler_ets_runtime
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkcompiler_ets_runtime synced 2024-10-07 08:03:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!2397 fix create object with method bug

Browse Source 
Merge pull request !2397 from 孙哲/c_isa_interpreter
This commit is contained in:
weng-changcheng 2022-09-19 06:37:25 +00:00 committed by Gitee
commit f0c9ac2237
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
5 changed files with 32 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ecmascript/compiler/interpreter_stub.cpp
View File

@ -5621,7 +5621,8 @@ DECLARE_ASM_HANDLER(HandleCreateobjectwithbufferImm8Id16)
{
GateRef imm = ZExtInt16ToInt32(ReadInst16_1(pc));
GateRef result = GetObjectLiteralFromConstPool(constpool, imm);
GateRef res = CallRuntime(glue, RTSTUB_ID(CreateObjectWithBuffer), { result });
GateRef currentEnv = GetEnvFromFrame(GetFrame(sp));
GateRef res = CallRuntime(glue, RTSTUB_ID(CreateObjectHavingMethod), { result, currentEnv });
CHECK_EXCEPTION_WITH_ACC(res, INT_PTR(CREATEOBJECTWITHBUFFER_IMM8_ID16));
}
@ -5629,7 +5630,8 @@ DECLARE_ASM_HANDLER(HandleCreateobjectwithbufferImm16Id16)
{
GateRef imm = ZExtInt16ToInt32(ReadInst16_2(pc));
GateRef result = GetObjectLiteralFromConstPool(constpool, imm);
GateRef res = CallRuntime(glue, RTSTUB_ID(CreateObjectWithBuffer), { result });
GateRef currentEnv = GetEnvFromFrame(GetFrame(sp));
GateRef res = CallRuntime(glue, RTSTUB_ID(CreateObjectHavingMethod), { result, currentEnv });
CHECK_EXCEPTION_WITH_ACC(res, INT_PTR(CREATEOBJECTWITHBUFFER_IMM16_ID16));
}
@ -6231,7 +6233,7 @@ DECLARE_ASM_HANDLER(HandleDeprecatedCreateobjecthavingmethodPrefImm16)
{
GateRef imm = ZExtInt16ToInt32(ReadInst16_1(pc));
GateRef result = GetObjectLiteralFromConstPool(constpool, imm);
GateRef res = CallRuntime(glue, RTSTUB_ID(CreateObjectHavingMethod), { result, acc, constpool });
GateRef res = CallRuntime(glue, RTSTUB_ID(CreateObjectHavingMethod), { result, acc });
CHECK_EXCEPTION_WITH_ACC(res, INT_PTR(DEPRECATED_CREATEOBJECTHAVINGMETHOD_PREF_IMM16));
}

46
ecmascript/compiler/stub_builder-inl.h
View File

@ -512,8 +512,7 @@ inline GateRef StubBuilder::BinaryOp(GateRef x, GateRef y)
inline GateRef StubBuilder::TaggedIsInt(GateRef x)
{
return Int64Equal(Int64And(x, Int64(JSTaggedValue::TAG_MARK)),
Int64(JSTaggedValue::TAG_INT));
return env_->GetBuilder()->TaggedIsInt(x);
}
inline GateRef StubBuilder::TaggedIsDouble(GateRef x)
@ -523,8 +522,7 @@ inline GateRef StubBuilder::TaggedIsDouble(GateRef x)
inline GateRef StubBuilder::TaggedIsObject(GateRef x)
{
return Int64Equal(Int64And(x, Int64(JSTaggedValue::TAG_MARK)),
Int64(JSTaggedValue::TAG_OBJECT));
return env_->GetBuilder()->TaggedIsObject(x);
}
inline GateRef StubBuilder::TaggedIsString(GateRef obj)
@ -556,33 +554,32 @@ inline GateRef StubBuilder::TaggedIsNumeric(GateRef x)
inline GateRef StubBuilder::TaggedIsHole(GateRef x)
{
return Int64Equal(x, Int64(JSTaggedValue::VALUE_HOLE));
return env_->GetBuilder()->TaggedIsHole(x);
}
inline GateRef StubBuilder::TaggedIsNotHole(GateRef x)
{
return Int64NotEqual(x, Int64(JSTaggedValue::VALUE_HOLE));
return env_->GetBuilder()->TaggedIsNotHole(x);
}
inline GateRef StubBuilder::TaggedIsUndefined(GateRef x)
{
return Int64Equal(x, Int64(JSTaggedValue::VALUE_UNDEFINED));
return env_->GetBuilder()->TaggedIsUndefined(x);
}
inline GateRef StubBuilder::TaggedIsException(GateRef x)
{
return Int64Equal(x, Int64(JSTaggedValue::VALUE_EXCEPTION));
return env_->GetBuilder()->TaggedIsException(x);
}
inline GateRef StubBuilder::TaggedIsSpecial(GateRef x)
{
return BoolOr(Int64Equal(Int64And(x, Int64(JSTaggedValue::TAG_SPECIAL_MASK)),
Int64(JSTaggedValue::TAG_SPECIAL)), TaggedIsHole(x));
return env_->GetBuilder()->TaggedIsSpecial(x);
}
inline GateRef StubBuilder::TaggedIsHeapObject(GateRef x)
{
return Int64Equal(Int64And(x, Int64(JSTaggedValue::TAG_HEAPOBJECT_MASK)), Int64(0));
return env_->GetBuilder()->TaggedIsHeapObject(x);
}
inline GateRef StubBuilder::TaggedIsGeneratorObject(GateRef x)
@ -640,23 +637,22 @@ inline GateRef StubBuilder::DoubleIsINF(GateRef x)
inline GateRef StubBuilder::TaggedIsNull(GateRef x)
{
return Int64Equal(x, Int64(JSTaggedValue::VALUE_NULL));
return env_->GetBuilder()->TaggedIsNull(x);
}
inline GateRef StubBuilder::TaggedIsUndefinedOrNull(GateRef x)
{
return Int64Equal(Int64And(x, Int64(JSTaggedValue::TAG_HEAPOBJECT_MASK)),
Int64(JSTaggedValue::TAG_SPECIAL));
return env_->GetBuilder()->TaggedIsUndefinedOrNull(x);
}
inline GateRef StubBuilder::TaggedIsTrue(GateRef x)
{
return Int64Equal(x, Int64(JSTaggedValue::VALUE_TRUE));
return env_->GetBuilder()->TaggedIsTrue(x);
}
inline GateRef StubBuilder::TaggedIsFalse(GateRef x)
{
return Int64Equal(x, Int64(JSTaggedValue::VALUE_FALSE));
return env_->GetBuilder()->TaggedIsFalse(x);
}
inline GateRef StubBuilder::TaggedIsBoolean(GateRef x)
@ -666,7 +662,7 @@ inline GateRef StubBuilder::TaggedIsBoolean(GateRef x)
inline GateRef StubBuilder::TaggedGetInt(GateRef x)
{
return TruncInt64ToInt32(Int64And(x, Int64(~JSTaggedValue::TAG_MARK)));
return env_->GetBuilder()->TaggedGetInt(x);
}
inline GateRef StubBuilder::Int8ToTaggedInt(GateRef x)
@ -695,8 +691,7 @@ inline GateRef StubBuilder::IntToTaggedInt(GateRef x)
inline GateRef StubBuilder::DoubleToTaggedDoublePtr(GateRef x)
{
GateRef val = CastDoubleToInt64(x);
return Int64ToTaggedPtr(Int64Add(val, Int64(JSTaggedValue::DOUBLE_ENCODE_OFFSET)));
return env_->GetBuilder()->DoubleToTaggedDoublePtr(x);
}
inline GateRef StubBuilder::CastDoubleToInt64(GateRef x)
@ -706,12 +701,12 @@ inline GateRef StubBuilder::CastDoubleToInt64(GateRef x)
inline GateRef StubBuilder::TaggedTrue()
{
return Int64(JSTaggedValue::VALUE_TRUE);
return env_->GetBuilder()->TaggedTrue();
}
inline GateRef StubBuilder::TaggedFalse()
{
return Int64(JSTaggedValue::VALUE_FALSE);
return env_->GetBuilder()->TaggedFalse();
}
// compare operation
@ -1463,8 +1458,7 @@ inline GateRef StubBuilder::GetPropertiesAddrFromLayoutInfo(GateRef layout)
inline GateRef StubBuilder::TaggedCastToInt64(GateRef x)
{
GateRef tagged = ChangeTaggedPointerToInt64(x);
return Int64And(tagged, Int64(~JSTaggedValue::TAG_MARK));
return env_->GetBuilder()->TaggedCastToInt64(x);
}
inline GateRef StubBuilder::TaggedCastToInt32(GateRef x)
@ -1479,9 +1473,7 @@ inline GateRef StubBuilder::TaggedCastToIntPtr(GateRef x)
inline GateRef StubBuilder::TaggedCastToDouble(GateRef x)
{
GateRef tagged = ChangeTaggedPointerToInt64(x);
GateRef val = Int64Sub(tagged, Int64(JSTaggedValue::DOUBLE_ENCODE_OFFSET));
return CastInt64ToFloat64(val);
return env_->GetBuilder()->TaggedCastToDouble(x);
}
inline GateRef StubBuilder::LoadObjectFromWeakRef(GateRef x)
@ -1905,7 +1897,7 @@ inline GateRef StubBuilder::HasPendingException(GateRef glue)
{
GateRef exceptionOffset = IntPtr(JSThread::GlueData::GetExceptionOffset(env_->IsArch32Bit()));
GateRef exception = Load(VariableType::JS_ANY(), glue, exceptionOffset);
return Int64NotEqual(exception, Int64(JSTaggedValue::VALUE_HOLE));
return TaggedIsNotHole(exception);
}
inline GateRef StubBuilder::DispatchBuiltins(GateRef glue, GateRef builtinsId,

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

@ -491,8 +491,8 @@ void AsmInterpreterCall::JSCallCommonSlowPath(ExtendedAssembler *assembler, JSCa
__ Bind(&noExtraEntry);
{
if (argc == 0) {
Register op1 = __ CallDispatcherArgument(kungfu::CallDispatchInputs::ARG0);
Register op2 = __ CallDispatcherArgument(kungfu::CallDispatchInputs::ARG1);
Register op1 = __ CallDispatcherArgument(kungfu::CallDispatchInputs::ARG1);
Register op2 = __ CallDispatcherArgument(kungfu::CallDispatchInputs::ARG2);
PushUndefinedWithArgcAndCheckStack(assembler, glueRegister, declaredNumArgsRegister, op1, op2,
stackOverflow);
__ Jmp(fastPathEntry);

6
ecmascript/interpreter/interpreter-inl.h
View File

@ -4354,7 +4354,8 @@ NO_UB_SANITIZE void EcmaInterpreter::RunInternal(JSThread *thread, const uint8_t
JSObject *result = JSObject::Cast(GET_LITERA_FROM_CACHE(imm, ConstPoolType::OBJECT_LITERAL).GetTaggedObject());
SAVE_PC();
JSTaggedValue res = SlowRuntimeStub::CreateObjectWithBuffer(thread, factory, result);
InterpretedFrame *state = GET_FRAME(sp);
JSTaggedValue res = SlowRuntimeStub::CreateObjectHavingMethod(thread, factory, result, state->env);
INTERPRETER_RETURN_IF_ABRUPT(res);
SET_ACC(res);
DISPATCH(CREATEOBJECTWITHBUFFER_IMM8_ID16);
@ -4367,7 +4368,8 @@ NO_UB_SANITIZE void EcmaInterpreter::RunInternal(JSThread *thread, const uint8_t
JSObject *result = JSObject::Cast(GET_LITERA_FROM_CACHE(imm, ConstPoolType::OBJECT_LITERAL).GetTaggedObject());
SAVE_PC();
JSTaggedValue res = SlowRuntimeStub::CreateObjectWithBuffer(thread, factory, result);
InterpretedFrame *state = GET_FRAME(sp);
JSTaggedValue res = SlowRuntimeStub::CreateObjectHavingMethod(thread, factory, result, state->env);
INTERPRETER_RETURN_IF_ABRUPT(res);
SET_ACC(res);
DISPATCH(CREATEOBJECTWITHBUFFER_IMM16_ID16);

4
ecmascript/interpreter/interpreter_assembly.cpp
View File

@ -6702,7 +6702,7 @@ void InterpreterAssembly::HandleCreateobjectwithbufferImm16Id16(
EcmaVM *ecmaVm = thread->GetEcmaVM();
ObjectFactory *factory = ecmaVm->GetFactory();
SAVE_PC();
JSTaggedValue res = SlowRuntimeStub::CreateObjectWithBuffer(thread, factory, result);
JSTaggedValue res = SlowRuntimeStub::CreateObjectHavingMethod(thread, factory, result, state->env);
INTERPRETER_RETURN_IF_ABRUPT(res);
SET_ACC(res);
DISPATCH(CREATEOBJECTWITHBUFFER_IMM16_ID16);
@ -6723,7 +6723,7 @@ void InterpreterAssembly::HandleCreateobjectwithbufferImm8Id16(
EcmaVM *ecmaVm = thread->GetEcmaVM();
ObjectFactory *factory = ecmaVm->GetFactory();
SAVE_PC();
JSTaggedValue res = SlowRuntimeStub::CreateObjectWithBuffer(thread, factory, result);
JSTaggedValue res = SlowRuntimeStub::CreateObjectHavingMethod(thread, factory, result, state->env);
INTERPRETER_RETURN_IF_ABRUPT(res);
SET_ACC(res);
DISPATCH(CREATEOBJECTWITHBUFFER_IMM8_ID16);