Commit db1e370d authored by Martyn Capewell's avatar Martyn Capewell Committed by Commit Bot

[arm64] Remove remaining instances of csp

Remove final csp instances, missed in the earlier patch due to being outside
the arm64 tree.

Bug: v8:6644
Change-Id: I2b5a2716568949740991c368b64c0a06105e4ff2
Reviewed-on: https://chromium-review.googlesource.com/874310Reviewed-by: 's avatarBenedikt Meurer <bmeurer@chromium.org>
Commit-Queue: Martyn Capewell <martyn.capewell@arm.com>
Cr-Commit-Position: refs/heads/master@{#50698}
parent f2f3a685
...@@ -55,8 +55,6 @@ namespace internal { ...@@ -55,8 +55,6 @@ namespace internal {
"Should not directly enter OSR-compiled function") \ "Should not directly enter OSR-compiled function") \
V(kStackAccessBelowStackPointer, "Stack access below stack pointer") \ V(kStackAccessBelowStackPointer, "Stack access below stack pointer") \
V(kStackFrameTypesMustMatch, "Stack frame types must match") \ V(kStackFrameTypesMustMatch, "Stack frame types must match") \
V(kTheCurrentStackPointerIsBelowCsp, \
"The current stack pointer is below csp") \
V(kTheStackWasCorruptedByMacroAssemblerCall, \ V(kTheStackWasCorruptedByMacroAssemblerCall, \
"The stack was corrupted by MacroAssembler::Call()") \ "The stack was corrupted by MacroAssembler::Call()") \
V(kUnalignedCellInWriteBarrier, "Unaligned cell in write barrier") \ V(kUnalignedCellInWriteBarrier, "Unaligned cell in write barrier") \
......
...@@ -816,8 +816,6 @@ enum CpuFeature { ...@@ -816,8 +816,6 @@ enum CpuFeature {
MIPSr2, MIPSr2,
MIPSr6, MIPSr6,
MIPS_SIMD, // MSA instructions MIPS_SIMD, // MSA instructions
// ARM64
ALWAYS_ALIGN_CSP,
// PPC // PPC
FPR_GPR_MOV, FPR_GPR_MOV,
LWSYNC, LWSYNC,
......
...@@ -286,7 +286,7 @@ void Clobber(MacroAssembler* masm, RegList reg_list, uint64_t const value) { ...@@ -286,7 +286,7 @@ void Clobber(MacroAssembler* masm, RegList reg_list, uint64_t const value) {
for (unsigned i = 0; i < kNumberOfRegisters; i++) { for (unsigned i = 0; i < kNumberOfRegisters; i++) {
if (reg_list & (1UL << i)) { if (reg_list & (1UL << i)) {
Register xn = Register::Create(i, kXRegSizeInBits); Register xn = Register::Create(i, kXRegSizeInBits);
// We should never write into csp here. // We should never write into sp here.
CHECK(!xn.Is(sp)); CHECK(!xn.Is(sp));
if (!xn.IsZero()) { if (!xn.IsZero()) {
if (!first.IsValid()) { if (!first.IsValid()) {
...@@ -366,7 +366,7 @@ void RegisterDump::Dump(MacroAssembler* masm) { ...@@ -366,7 +366,7 @@ void RegisterDump::Dump(MacroAssembler* masm) {
// Load the address where we will dump the state. // Load the address where we will dump the state.
__ Mov(dump_base, reinterpret_cast<uint64_t>(&dump_)); __ Mov(dump_base, reinterpret_cast<uint64_t>(&dump_));
// Dump the stack pointer (csp and wcsp). // Dump the stack pointer (sp and wsp).
// The stack pointer cannot be stored directly; it needs to be moved into // The stack pointer cannot be stored directly; it needs to be moved into
// another register first. Also, we pushed four X registers, so we need to // another register first. Also, we pushed four X registers, so we need to
// compensate here. // compensate here.
......
...@@ -52,8 +52,7 @@ class RegisterDump { ...@@ -52,8 +52,7 @@ class RegisterDump {
RegisterDump() : completed_(false) {} RegisterDump() : completed_(false) {}
// The Dump method generates code to store a snapshot of the register values. // The Dump method generates code to store a snapshot of the register values.
// It needs to be able to use the stack temporarily, and requires that the // It needs to be able to use the stack temporarily.
// current stack pointer is csp, and is properly aligned.
// //
// The dumping code is generated though the given MacroAssembler. No registers // The dumping code is generated though the given MacroAssembler. No registers
// are corrupted in the process, but the stack is used briefly. The flags will // are corrupted in the process, but the stack is used briefly. The flags will
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment