From db1e370decbd4d2acd4b5c2ebfee76b3c24c5cae Mon Sep 17 00:00:00 2001
From: Martyn Capewell <martyn.capewell@arm.com>
Date: Thu, 18 Jan 2018 17:00:33 +0000
Subject: [PATCH] [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/874310
Reviewed-by: Benedikt Meurer <bmeurer@chromium.org>
Commit-Queue: Martyn Capewell <martyn.capewell@arm.com>
Cr-Commit-Position: refs/heads/master@{#50698}
---
 src/bailout-reason.h            | 2 --
 src/globals.h                   | 2 --
 test/cctest/test-utils-arm64.cc | 4 ++--
 test/cctest/test-utils-arm64.h  | 3 +--
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/bailout-reason.h b/src/bailout-reason.h
index c8e81c69d4..6f111eddbf 100644
--- a/src/bailout-reason.h
+++ b/src/bailout-reason.h
@@ -55,8 +55,6 @@ namespace internal {
     "Should not directly enter OSR-compiled function")                         \
   V(kStackAccessBelowStackPointer, "Stack access below stack pointer")         \
   V(kStackFrameTypesMustMatch, "Stack frame types must match")                 \
-  V(kTheCurrentStackPointerIsBelowCsp,                                         \
-    "The current stack pointer is below csp")                                  \
   V(kTheStackWasCorruptedByMacroAssemblerCall,                                 \
     "The stack was corrupted by MacroAssembler::Call()")                       \
   V(kUnalignedCellInWriteBarrier, "Unaligned cell in write barrier")           \
diff --git a/src/globals.h b/src/globals.h
index 4e25cd5a16..ea0bf11068 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -816,8 +816,6 @@ enum CpuFeature {
   MIPSr2,
   MIPSr6,
   MIPS_SIMD,  // MSA instructions
-  // ARM64
-  ALWAYS_ALIGN_CSP,
   // PPC
   FPR_GPR_MOV,
   LWSYNC,
diff --git a/test/cctest/test-utils-arm64.cc b/test/cctest/test-utils-arm64.cc
index 237eb50641..ac647c5c64 100644
--- a/test/cctest/test-utils-arm64.cc
+++ b/test/cctest/test-utils-arm64.cc
@@ -286,7 +286,7 @@ void Clobber(MacroAssembler* masm, RegList reg_list, uint64_t const value) {
   for (unsigned i = 0; i < kNumberOfRegisters; i++) {
     if (reg_list & (1UL << i)) {
       Register xn = Register::Create(i, kXRegSizeInBits);
-      // We should never write into csp here.
+      // We should never write into sp here.
       CHECK(!xn.Is(sp));
       if (!xn.IsZero()) {
         if (!first.IsValid()) {
@@ -366,7 +366,7 @@ void RegisterDump::Dump(MacroAssembler* masm) {
   // Load the address where we will dump the state.
   __ 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
   // another register first. Also, we pushed four X registers, so we need to
   // compensate here.
diff --git a/test/cctest/test-utils-arm64.h b/test/cctest/test-utils-arm64.h
index 78b266cb0b..e5b91fb280 100644
--- a/test/cctest/test-utils-arm64.h
+++ b/test/cctest/test-utils-arm64.h
@@ -52,8 +52,7 @@ class RegisterDump {
   RegisterDump() : completed_(false) {}
 
   // 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
-  // current stack pointer is csp, and is properly aligned.
+  // It needs to be able to use the stack temporarily.
   //
   // 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