Commit 2986eca
deps: V8: cherry-pick 6b1b9bca2a8
Origin commit message:
[loong64][codegen] Avoid memory access under stack pointer
According to LoongArch ABI doc chapter 8.2:
"Procedures must not assume the persistence on-stack data of which
the addresses lie below the stack pointer."
Change-Id: I92735e052227495ac9884c4290b57eaffbf905e1
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/6786372
Auto-Submit: Zhao Jiazhong <zhaojiazhong-hf@loongson.cn>
Reviewed-by: Matthias Liedtke <mliedtke@chromium.org>
Commit-Queue: Matthias Liedtke <mliedtke@chromium.org>
Cr-Commit-Position: refs/heads/main@{#101634}
Refs: v8/v8@6b1b9bc
Backport-PR-URL: #59663
PR-URL: #59283
Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com>1 parent 5b83e1e commit 2986eca
2 files changed
Lines changed: 12 additions & 10 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -38,7 +38,7 @@ | |||
| 38 | 38 | ||
| 39 | 39 | # Reset this number to 0 on major V8 upgrades. | |
| 40 | 40 | # Increment by one for each non-official patch applied to deps/v8. | |
| 41 | - 'v8_embedder_string': '-node.29', | ||
| 41 | + 'v8_embedder_string': '-node.30', | ||
| 42 | 42 | ||
| 43 | 43 | ##### V8 defaults for Node.js ##### | |
| 44 | 44 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1526,21 +1526,24 @@ void MacroAssembler::li(Register rd, Operand j, LiFlags mode) { | |||
| 1526 | 1526 | } | |
| 1527 | 1527 | ||
| 1528 | 1528 | void MacroAssembler::MultiPush(RegList regs) { | |
| 1529 | - int16_t stack_offset = 0; | ||
| 1529 | + int16_t num_to_push = regs.Count(); | ||
| 1530 | + int16_t stack_offset = num_to_push * kSystemPointerSize; | ||
| 1530 | 1531 | ||
| 1532 | + Sub_d(sp, sp, Operand(stack_offset)); | ||
| 1531 | 1533 | for (int16_t i = kNumRegisters - 1; i >= 0; i--) { | |
| 1532 | 1534 | if ((regs.bits() & (1 << i)) != 0) { | |
| 1533 | 1535 | stack_offset -= kSystemPointerSize; | |
| 1534 | 1536 | St_d(ToRegister(i), MemOperand(sp, stack_offset)); | |
| 1535 | 1537 | } | |
| 1536 | 1538 | } | |
| 1537 | - addi_d(sp, sp, stack_offset); | ||
| 1538 | 1539 | } | |
| 1539 | 1540 | ||
| 1540 | 1541 | void MacroAssembler::MultiPush(RegList regs1, RegList regs2) { | |
| 1541 | 1542 | DCHECK((regs1 & regs2).is_empty()); | |
| 1542 | - int16_t stack_offset = 0; | ||
| 1543 | + int16_t num_to_push = regs1.Count() + regs2.Count(); | ||
| 1544 | + int16_t stack_offset = num_to_push * kSystemPointerSize; | ||
| 1543 | 1545 | ||
| 1546 | + Sub_d(sp, sp, Operand(stack_offset)); | ||
| 1544 | 1547 | for (int16_t i = kNumRegisters - 1; i >= 0; i--) { | |
| 1545 | 1548 | if ((regs1.bits() & (1 << i)) != 0) { | |
| 1546 | 1549 | stack_offset -= kSystemPointerSize; | |
@@ -1553,15 +1556,16 @@ void MacroAssembler::MultiPush(RegList regs1, RegList regs2) { | |||
| 1553 | 1556 | St_d(ToRegister(i), MemOperand(sp, stack_offset)); | |
| 1554 | 1557 | } | |
| 1555 | 1558 | } | |
| 1556 | - addi_d(sp, sp, stack_offset); | ||
| 1557 | 1559 | } | |
| 1558 | 1560 | ||
| 1559 | 1561 | void MacroAssembler::MultiPush(RegList regs1, RegList regs2, RegList regs3) { | |
| 1560 | 1562 | DCHECK((regs1 & regs2).is_empty()); | |
| 1561 | 1563 | DCHECK((regs1 & regs3).is_empty()); | |
| 1562 | 1564 | DCHECK((regs2 & regs3).is_empty()); | |
| 1563 | - int16_t stack_offset = 0; | ||
| 1565 | + int16_t num_to_push = regs1.Count() + regs2.Count() + regs3.Count(); | ||
| 1566 | + int16_t stack_offset = num_to_push * kSystemPointerSize; | ||
| 1564 | 1567 | ||
| 1568 | + Sub_d(sp, sp, Operand(stack_offset)); | ||
| 1565 | 1569 | for (int16_t i = kNumRegisters - 1; i >= 0; i--) { | |
| 1566 | 1570 | if ((regs1.bits() & (1 << i)) != 0) { | |
| 1567 | 1571 | stack_offset -= kSystemPointerSize; | |
@@ -1580,7 +1584,6 @@ void MacroAssembler::MultiPush(RegList regs1, RegList regs2, RegList regs3) { | |||
| 1580 | 1584 | St_d(ToRegister(i), MemOperand(sp, stack_offset)); | |
| 1581 | 1585 | } | |
| 1582 | 1586 | } | |
| 1583 | - addi_d(sp, sp, stack_offset); | ||
| 1584 | 1587 | } | |
| 1585 | 1588 | ||
| 1586 | 1589 | void MacroAssembler::MultiPop(RegList regs) { | |
@@ -3898,9 +3901,8 @@ void MacroAssembler::EnterFrame(StackFrame::Type type) { | |||
| 3898 | 3901 | ||
| 3899 | 3902 | void MacroAssembler::LeaveFrame(StackFrame::Type type) { | |
| 3900 | 3903 | ASM_CODE_COMMENT(this); | |
| 3901 | - addi_d(sp, fp, 2 * kSystemPointerSize); | ||
| 3902 | - Ld_d(ra, MemOperand(fp, 1 * kSystemPointerSize)); | ||
| 3903 | - Ld_d(fp, MemOperand(fp, 0 * kSystemPointerSize)); | ||
| 3904 | + Move(sp, fp); | ||
| 3905 | + Pop(ra, fp); | ||
| 3904 | 3906 | } | |
| 3905 | 3907 | ||
| 3906 | 3908 | void MacroAssembler::EnterExitFrame(int stack_space, | |
0 commit comments