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

bugfix aot test262

Browse Source 
issue:https://gitee.com/openharmony/arkcompiler_ets_runtime/issues/I5VKLM

Signed-off-by: wanyanglan <wanyanglan1@huawei.com>
Change-Id: Id34a794be103db5db774620ecb1e8cc5e9e19191
This commit is contained in:
wanyanglan 2022-10-13 17:06:06 +08:00
parent ceba8e7e70
commit 7482e3afb8
4 changed files with 91 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ecmascript/compiler/bytecode_circuit_builder.cpp
View File

@ -1111,13 +1111,13 @@ BytecodeInfo BytecodeCircuitBuilder::GetBytecodeInfo(const uint8_t *pc)
break;
}
case EcmaOpcode::LDEXTERNALMODULEVAR_IMM8: {
uint16_t stringId = READ_INST_8_0();
info.inputs.emplace_back(StringId(stringId));
int32_t index = READ_INST_8_0();
info.inputs.emplace_back(Immediate(index));
break;
}
case EcmaOpcode::WIDE_LDEXTERNALMODULEVAR_PREF_IMM16: {
uint16_t stringId = READ_INST_16_1();
info.inputs.emplace_back(StringId(stringId));
int32_t index = READ_INST_16_1();
info.inputs.emplace_back(Immediate(index));
break;
}
case EcmaOpcode::STCONSTTOGLOBALRECORD_IMM16_ID16: {

75
ecmascript/compiler/slowpath_lowering.cpp
View File

@ -867,6 +867,11 @@ void SlowPathLowering::SaveFrameToContext(GateRef gate, GateRef glue, GateRef js
GateRef regsArrayOffset = builder_.IntPtr(GeneratorContext::GENERATOR_REGS_ARRAY_OFFSET);
builder_.Store(VariableType::JS_POINTER(), glue, context, regsArrayOffset, taggedArray);
// set this
GateRef thisOffset = builder_.IntPtr(GeneratorContext::GENERATOR_THIS_OFFSET);
GateRef thisObj = argAcc_.GetCommonArgGate(CommonArgIdx::THIS);
builder_.Store(VariableType::JS_ANY(), glue, context, thisOffset, thisObj);
// set method
GateRef methodOffset = builder_.IntPtr(GeneratorContext::GENERATOR_METHOD_OFFSET);
builder_.Store(VariableType::JS_ANY(), glue, context, methodOffset, jsFunc);
@ -2029,6 +2034,8 @@ void SlowPathLowering::LowerNewObjRange(GateRef gate, GateRef glue)
void SlowPathLowering::LowerConditionJump(GateRef gate, bool isEqualJump)
{
GateRef glue = argAcc_.GetCommonArgGate(CommonArgIdx::GLUE);
DebugPrintBC(gate, glue);
std::vector<GateRef> trueState;
GateRef value = acc_.GetValueIn(gate, 0);
// GET_ACC() == JSTaggedValue::False()
@ -3082,7 +3089,9 @@ void SlowPathLowering::LowerDefineFunc(GateRef gate, GateRef glue, GateRef jsFun
std::vector<GateRef> successControl;
std::vector<GateRef> failControl;
{
result = LowerCallRuntime(glue, RTSTUB_ID(DefineFunc), { *result });
GateRef method = GetObjectFromConstPool(glue, jsFunc, builder_.ZExtInt16ToInt32(methodId),
ConstPoolType::METHOD);
result = LowerCallRuntime(glue, RTSTUB_ID(DefineFunc), { method });
Label isException(&builder_);
Label notException(&builder_);
builder_.Branch(builder_.TaggedIsException(*result), &isException, &notException);
@ -3320,38 +3329,80 @@ void SlowPathLowering::LowerResumeGenerator(GateRef gate)
acc_.DeleteGate(item);
}
GateRef glue = argAcc_.GetCommonArgGate(CommonArgIdx::GLUE);
DebugPrintBC(gate, glue);
// 1: number of value inputs
ASSERT(acc_.GetNumValueIn(gate) == 1);
std::vector<GateRef> successControl;
std::vector<GateRef> failControl;
GateRef resumeResultOffset = builder_.IntPtr(JSGeneratorObject::GENERATOR_RESUME_RESULT_OFFSET);
GateRef result = builder_.Load(VariableType::JS_ANY(), obj, resumeResultOffset);
Label isAsyncGeneratorObj(&builder_);
Label notAsyncGeneratorObj(&builder_);
Label exit(&builder_);
DEFVAlUE(result, (&builder_), VariableType::JS_ANY(), builder_.HoleConstant());
builder_.Branch(builder_.TaggedIsAsyncGeneratorObject(obj), &isAsyncGeneratorObj, &notAsyncGeneratorObj);
builder_.Bind(&isAsyncGeneratorObj);
{
GateRef resumeResultOffset = builder_.IntPtr(JSAsyncGeneratorObject::GENERATOR_RESUME_RESULT_OFFSET);
result = builder_.Load(VariableType::JS_ANY(), obj, resumeResultOffset);
builder_.Jump(&exit);
}
builder_.Bind(&notAsyncGeneratorObj);
{
GateRef resumeResultOffset = builder_.IntPtr(JSGeneratorObject::GENERATOR_RESUME_RESULT_OFFSET);
result = builder_.Load(VariableType::JS_ANY(), obj, resumeResultOffset);
builder_.Jump(&exit);
}
builder_.Bind(&exit);
successControl.emplace_back(builder_.GetState());
successControl.emplace_back(builder_.GetDepend());
failControl.emplace_back(Circuit::NullGate());
failControl.emplace_back(Circuit::NullGate());
ReplaceHirToSubCfg(gate, result, successControl, failControl, true);
ReplaceHirToSubCfg(gate, *result, successControl, failControl, true);
}
void SlowPathLowering::LowerGetResumeMode(GateRef gate)
{
GateRef glue = argAcc_.GetCommonArgGate(CommonArgIdx::GLUE);
DebugPrintBC(gate, glue);
// 1: number of value inputs
ASSERT(acc_.GetNumValueIn(gate) == 1);
std::vector<GateRef> successControl;
std::vector<GateRef> failControl;
DEFVAlUE(result, (&builder_), VariableType::JS_ANY(), builder_.Undefined());
Label isAsyncGeneratorObj(&builder_);
Label notAsyncGeneratorObj(&builder_);
Label exit(&builder_);
GateRef obj = acc_.GetValueIn(gate, 0);
GateRef bitFieldOffset = builder_.IntPtr(JSGeneratorObject::BIT_FIELD_OFFSET);
GateRef bitField = builder_.Load(VariableType::INT32(), obj, bitFieldOffset);
auto bitfieldlsr = builder_.Int32LSR(bitField, builder_.Int32(JSGeneratorObject::ResumeModeBits::START_BIT));
GateRef resumeModeBits = builder_.Int32And(bitfieldlsr,
builder_.Int32((1LU << JSGeneratorObject::ResumeModeBits::SIZE) - 1));
auto resumeMode = builder_.SExtInt32ToInt64(resumeModeBits);
GateRef result = builder_.ToTaggedIntPtr(resumeMode);
builder_.Branch(builder_.TaggedIsAsyncGeneratorObject(obj), &isAsyncGeneratorObj, &notAsyncGeneratorObj);
builder_.Bind(&isAsyncGeneratorObj);
{
GateRef bitFieldOffset = builder_.IntPtr(JSAsyncGeneratorObject::BIT_FIELD_OFFSET);
GateRef bitField = builder_.Load(VariableType::INT32(), obj, bitFieldOffset);
auto bitfieldlsr = builder_.Int32LSR(bitField,
builder_.Int32(JSAsyncGeneratorObject::ResumeModeBits::START_BIT));
GateRef modeBits = builder_.Int32And(bitfieldlsr,
builder_.Int32((1LU << JSAsyncGeneratorObject::ResumeModeBits::SIZE) - 1));
auto resumeMode = builder_.SExtInt32ToInt64(modeBits);
result = builder_.ToTaggedIntPtr(resumeMode);
builder_.Jump(&exit);
}
builder_.Bind(&notAsyncGeneratorObj);
{
GateRef bitFieldOffset = builder_.IntPtr(JSGeneratorObject::BIT_FIELD_OFFSET);
GateRef bitField = builder_.Load(VariableType::INT32(), obj, bitFieldOffset);
auto bitfieldlsr = builder_.Int32LSR(bitField, builder_.Int32(JSGeneratorObject::ResumeModeBits::START_BIT));
GateRef modeBits = builder_.Int32And(bitfieldlsr,
builder_.Int32((1LU << JSGeneratorObject::ResumeModeBits::SIZE) - 1));
auto resumeMode = builder_.SExtInt32ToInt64(modeBits);
result = builder_.ToTaggedIntPtr(resumeMode);
builder_.Jump(&exit);
}
builder_.Bind(&exit);
successControl.emplace_back(builder_.GetState());
successControl.emplace_back(builder_.GetDepend());
failControl.emplace_back(Circuit::NullGate());
failControl.emplace_back(Circuit::NullGate());
ReplaceHirToSubCfg(gate, result, successControl, failControl, true);
ReplaceHirToSubCfg(gate, *result, successControl, failControl, true);
}
void SlowPathLowering::LowerDefineMethod(GateRef gate, GateRef glue, GateRef jsFunc)

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

@ -809,6 +809,7 @@ JSTaggedValue EcmaInterpreter::GeneratorReEnterAot(JSThread *thread, JSHandle<Ge
JSTaggedValue::Undefined().GetRawData());
args[0] = func.GetTaggedValue().GetRawData();
args[1] = genObject.GetRawData();
args[2] = context->GetThis().GetRawData(); // 2: this
JSTaggedValue env = func->GetLexicalEnv();
args[args.size() - 1] = env.GetRawData(); // last arg is env.
auto entry = thread->GetRTInterface(kungfu::RuntimeStubCSigns::ID_JSFunctionEntry);

32
ecmascript/stubs/runtime_stubs-inl.h
View File

@ -1187,7 +1187,8 @@ JSTaggedValue RuntimeStubs::RuntimeTryLdGlobalByName(JSThread *thread, const JSH
if (!res.GetPropertyMetaData().IsFound()) {
return RuntimeThrowReferenceError(thread, prop, " is not defined");
}
return res.GetValue().GetTaggedValue();
auto result = res.GetValue().GetTaggedValue();
return result;
}
JSTaggedValue RuntimeStubs::RuntimeTryUpdateGlobalRecord(JSThread *thread, JSTaggedValue prop,
@ -2199,16 +2200,29 @@ JSTaggedValue RuntimeStubs::RuntimeOptCopyRestArgs(JSThread *thread, uint32_t ac
JSTaggedValue RuntimeStubs::RuntimeOptSuspendGenerator(JSThread *thread, const JSHandle<JSTaggedValue> &genObj,
const JSHandle<JSTaggedValue> &value)
{
JSHandle<JSGeneratorObject> generatorObjectHandle(genObj);
// change state to SuspendedYield
if (generatorObjectHandle->IsExecuting()) {
generatorObjectHandle->SetGeneratorState(JSGeneratorState::SUSPENDED_YIELD);
if (genObj->IsAsyncGeneratorObject()) {
JSHandle<JSAsyncGeneratorObject> generatorObjectHandle(genObj);
// change state to SuspendedYield
if (generatorObjectHandle->IsExecuting()) {
generatorObjectHandle->SetAsyncGeneratorState(JSAsyncGeneratorState::SUSPENDED_YIELD);
RETURN_EXCEPTION_IF_ABRUPT_COMPLETION(thread);
return value.GetTaggedValue();
}
RETURN_EXCEPTION_IF_ABRUPT_COMPLETION(thread);
return value.GetTaggedValue();
return generatorObjectHandle.GetTaggedValue();
} else if (genObj->IsGeneratorObject()) {
JSHandle<JSGeneratorObject> generatorObjectHandle(genObj);
// change state to SuspendedYield
if (generatorObjectHandle->IsExecuting()) {
generatorObjectHandle->SetGeneratorState(JSGeneratorState::SUSPENDED_YIELD);
RETURN_EXCEPTION_IF_ABRUPT_COMPLETION(thread);
return value.GetTaggedValue();
}
RETURN_EXCEPTION_IF_ABRUPT_COMPLETION(thread);
return generatorObjectHandle.GetTaggedValue();
} else {
return RuntimeThrowTypeError(thread, "RuntimeSuspendGenerator failed");
}
RETURN_EXCEPTION_IF_ABRUPT_COMPLETION(thread);
return generatorObjectHandle.GetTaggedValue();
}
JSTaggedValue RuntimeStubs::RuntimeOptConstruct(JSThread *thread, JSHandle<JSTaggedValue> ctor,