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

conflict

Browse Source 
Signed-off-by: songzhengchao <songzhengchao@huawei.com>
This commit is contained in:
songzhengchao 2021-10-29 17:03:38 +08:00
parent 753f285c6a
commit 15e6848c0e
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ecmascript/compiler/fast_stub.cpp
View File

@ -1174,9 +1174,8 @@ void FastMulGCStub::GenerateCircuit()
AddrShift x = Int64Argument(1);
AddrShift y = Int64Argument(2);
DEFVARIABLE(intX, MachineType::INT32_TYPE, 0);
DEFVARIABLE(intY, MachineType::INT32_TYPE, 0);
DEFVARIABLE(intZ, MachineType::INT32_TYPE, 0);
DEFVARIABLE(intX, MachineType::INT64_TYPE, 0);
DEFVARIABLE(intY, MachineType::INT64_TYPE, 0);
DEFVARIABLE(valuePtr, MachineType::INT64_TYPE, 0);
DEFVARIABLE(doubleX, MachineType::FLOAT64_TYPE, 0);
DEFVARIABLE(doubleY, MachineType::FLOAT64_TYPE, 0);
@ -1197,7 +1196,7 @@ void FastMulGCStub::GenerateCircuit()
Branch(TaggedIsInt(x), &xIsInt, &xNotInt);
Bind(&xIsInt);
{
intX = TaggedCastToInt32(x);
intX = TaggedCastToInt64(x);
doubleX = CastInt64ToFloat64(*intX);
Jump(&xIsNumberAndyIsNumber);
}
@ -1217,7 +1216,7 @@ void FastMulGCStub::GenerateCircuit()
Branch(TaggedIsInt(y), &yIsInt, &yNotInt);
Bind(&yIsInt);
{
intY = TaggedCastToInt32(y);
intY = TaggedCastToInt64(y);
doubleY = CastInt64ToFloat64(*intY);
Jump(&xIsDoubleAndyIsDouble);
}

2
ecmascript/compiler/stub_descriptor.cpp
View File

@ -168,6 +168,8 @@ CALL_STUB_INIT_DESCRIPTOR(SetElement)
descriptor->SetParameters(params.data());
}
CALL_STUB_INIT_DESCRIPTOR(SetPropertyByName) {}
CALL_STUB_INIT_DESCRIPTOR(GetPropertyByName)
{
// 3 : 3 input parameters