[mips] Fix kWasmInstanceOffset and clear an unused test
Fix a offset error, this is related to commit38fb148730
Delete cctest/test-run-machops/StackSlotAlignment, this is related to commita58f812c48
Change-Id: I3ef1b96d8a3bdba530200cbac4f7a062496ace59 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2994813 Reviewed-by: Bill Budge <bbudge@chromium.org> Reviewed-by: Zhao Jiazhong <zhaojiazhong-hf@loongson.cn> Commit-Queue: Zhao Jiazhong <zhaojiazhong-hf@loongson.cn> Auto-Submit: Liu yu <liuyu@loongson.cn> Cr-Commit-Position: refs/heads/master@{#75493}
This commit is contained in:
parent
7981dc33d5
commit
10e158862c
@ -1176,7 +1176,7 @@ void Builtins::Generate_BaselineOutOfLinePrologue(MacroAssembler* masm) {
|
|||||||
// o ra: return address
|
// o ra: return address
|
||||||
//
|
//
|
||||||
// The function builds an interpreter frame. See InterpreterFrameConstants in
|
// The function builds an interpreter frame. See InterpreterFrameConstants in
|
||||||
// frames.h for its layout.
|
// frame-constants.h for its layout.
|
||||||
void Builtins::Generate_InterpreterEntryTrampoline(MacroAssembler* masm) {
|
void Builtins::Generate_InterpreterEntryTrampoline(MacroAssembler* masm) {
|
||||||
Register closure = a1;
|
Register closure = a1;
|
||||||
Register feedback_vector = a2;
|
Register feedback_vector = a2;
|
||||||
|
@ -1188,7 +1188,7 @@ void Builtins::Generate_BaselineOutOfLinePrologue(MacroAssembler* masm) {
|
|||||||
// o ra: return address
|
// o ra: return address
|
||||||
//
|
//
|
||||||
// The function builds an interpreter frame. See InterpreterFrameConstants in
|
// The function builds an interpreter frame. See InterpreterFrameConstants in
|
||||||
// frames.h for its layout.
|
// frame-constants.h for its layout.
|
||||||
void Builtins::Generate_InterpreterEntryTrampoline(MacroAssembler* masm) {
|
void Builtins::Generate_InterpreterEntryTrampoline(MacroAssembler* masm) {
|
||||||
Register closure = a1;
|
Register closure = a1;
|
||||||
Register feedback_vector = a2;
|
Register feedback_vector = a2;
|
||||||
|
@ -27,8 +27,7 @@ class WasmCompileLazyFrameConstants : public TypedFrameConstants {
|
|||||||
|
|
||||||
// FP-relative.
|
// FP-relative.
|
||||||
// See Generate_WasmCompileLazy in builtins-mips64.cc.
|
// See Generate_WasmCompileLazy in builtins-mips64.cc.
|
||||||
static constexpr int kWasmInstanceOffset =
|
static constexpr int kWasmInstanceOffset = TYPED_FRAME_PUSHED_VALUE_OFFSET(6);
|
||||||
TYPED_FRAME_PUSHED_VALUE_OFFSET(kNumberOfSavedAllParamRegs);
|
|
||||||
|
|
||||||
static constexpr int kFixedFrameSizeFromFp =
|
static constexpr int kFixedFrameSizeFromFp =
|
||||||
TypedFrameConstants::kFixedFrameSizeFromFp +
|
TypedFrameConstants::kFixedFrameSizeFromFp +
|
||||||
|
@ -7208,34 +7208,6 @@ TEST(ParentFramePointer) {
|
|||||||
CHECK_EQ(1, r.Call(1));
|
CHECK_EQ(1, r.Call(1));
|
||||||
}
|
}
|
||||||
|
|
||||||
#if V8_HOST_ARCH_MIPS || V8_HOST_ARCH_MIPS64
|
|
||||||
|
|
||||||
TEST(StackSlotAlignment) {
|
|
||||||
RawMachineAssemblerTester<int32_t> r;
|
|
||||||
RawMachineLabel tlabel;
|
|
||||||
RawMachineLabel flabel;
|
|
||||||
RawMachineLabel merge;
|
|
||||||
|
|
||||||
int alignments[] = {4, 8, 16};
|
|
||||||
int alignment_count = arraysize(alignments);
|
|
||||||
|
|
||||||
Node* alignment_counter = r.Int32Constant(0);
|
|
||||||
for (int i = 0; i < alignment_count; i++) {
|
|
||||||
for (int j = 0; j < 5; j++) {
|
|
||||||
Node* stack_slot =
|
|
||||||
r.StackSlot(MachineRepresentation::kWord32, alignments[i]);
|
|
||||||
alignment_counter = r.Int32Add(
|
|
||||||
alignment_counter,
|
|
||||||
r.Word32And(stack_slot, r.Int32Constant(alignments[i] - 1)));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
r.Return(alignment_counter);
|
|
||||||
CHECK_EQ(0, r.Call());
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif // V8_HOST_ARCH_MIPS || V8_HOST_ARCH_MIPS64
|
|
||||||
|
|
||||||
#if V8_TARGET_ARCH_64_BIT
|
#if V8_TARGET_ARCH_64_BIT
|
||||||
|
|
||||||
TEST(Regression5923) {
|
TEST(Regression5923) {
|
||||||
|
Loading…
Reference in New Issue
Block a user