commit 69a503050fb8a7b3a79b2cd2cdc2d8fbc594575d
author Zheng Xu <zheng.xu@arm.com> Tue Apr 14 20:04:41 2015 +0800
committer Vladimir Marko <vmarko@google.com> Tue Apr 14 17:29:08 2015 +0100
tree b7f99172f921d7100959ab48210097906794d043
parent e015a31e509c3f4de8a90b57b77329ba6609ce2f

ARM64: Remove suspend register.

It also clean up build/remove frame used by JNI compiler and generates
stp/ldp instead of str/ldr. Also x19 has been unblocked in both quick and
optimizing compiler.

Change-Id: Idbeac0942265f493266b2ef9b7a65bb4054f0e2d

compiler/optimizing/code_generator_arm64.cc

diff --git a/compiler/optimizing/code_generator_arm64.cc b/compiler/optimizing/code_generator_arm64.cc
index 33eacba..263f83f 100644
--- a/compiler/optimizing/code_generator_arm64.cc
+++ b/compiler/optimizing/code_generator_arm64.cc
@@ -466,8 +466,10 @@
     //      sp[0]                     : current method.
     __ Str(kArtMethodRegister, MemOperand(sp, -frame_size, PreIndex));
     GetAssembler()->cfi().AdjustCFAOffset(frame_size);
-    SpillRegisters(GetFramePreservedCoreRegisters(), frame_size - GetCoreSpillSize());
-    SpillRegisters(GetFramePreservedFPRegisters(), frame_size - FrameEntrySpillSize());
+    GetAssembler()->SpillRegisters(GetFramePreservedCoreRegisters(),
+        frame_size - GetCoreSpillSize());
+    GetAssembler()->SpillRegisters(GetFramePreservedFPRegisters(),
+        frame_size - FrameEntrySpillSize());
   }
 }
 
@@ -475,8 +477,10 @@
   GetAssembler()->cfi().RememberState();
   if (!HasEmptyFrame()) {
     int frame_size = GetFrameSize();
-    UnspillRegisters(GetFramePreservedFPRegisters(), frame_size - FrameEntrySpillSize());
-    UnspillRegisters(GetFramePreservedCoreRegisters(), frame_size - GetCoreSpillSize());
+    GetAssembler()->UnspillRegisters(GetFramePreservedFPRegisters(),
+        frame_size - FrameEntrySpillSize());
+    GetAssembler()->UnspillRegisters(GetFramePreservedCoreRegisters(),
+        frame_size - GetCoreSpillSize());
     __ Drop(frame_size);
     GetAssembler()->cfi().AdjustCFAOffset(-frame_size);
   }
@@ -485,51 +489,6 @@
   GetAssembler()->cfi().DefCFAOffset(GetFrameSize());
 }
 
-static inline dwarf::Reg DWARFReg(CPURegister reg) {
-  if (reg.IsFPRegister()) {
-    return dwarf::Reg::Arm64Fp(reg.code());
-  } else {
-    DCHECK_LT(reg.code(), 31u);  // X0 - X30.
-    return dwarf::Reg::Arm64Core(reg.code());
-  }
-}
-
-void CodeGeneratorARM64::SpillRegisters(vixl::CPURegList registers, int offset) {
-  int size = registers.RegisterSizeInBytes();
-  while (registers.Count() >= 2) {
-    const CPURegister& dst0 = registers.PopLowestIndex();
-    const CPURegister& dst1 = registers.PopLowestIndex();
-    __ Stp(dst0, dst1, MemOperand(__ StackPointer(), offset));
-    GetAssembler()->cfi().RelOffset(DWARFReg(dst0), offset);
-    GetAssembler()->cfi().RelOffset(DWARFReg(dst1), offset + size);
-    offset += 2 * size;
-  }
-  if (!registers.IsEmpty()) {
-    const CPURegister& dst0 = registers.PopLowestIndex();
-    __ Str(dst0, MemOperand(__ StackPointer(), offset));
-    GetAssembler()->cfi().RelOffset(DWARFReg(dst0), offset);
-  }
-  DCHECK(registers.IsEmpty());
-}
-
-void CodeGeneratorARM64::UnspillRegisters(vixl::CPURegList registers, int offset) {
-  int size = registers.RegisterSizeInBytes();
-  while (registers.Count() >= 2) {
-    const CPURegister& dst0 = registers.PopLowestIndex();
-    const CPURegister& dst1 = registers.PopLowestIndex();
-    __ Ldp(dst0, dst1, MemOperand(__ StackPointer(), offset));
-    GetAssembler()->cfi().Restore(DWARFReg(dst0));
-    GetAssembler()->cfi().Restore(DWARFReg(dst1));
-    offset += 2 * size;
-  }
-  if (!registers.IsEmpty()) {
-    const CPURegister& dst0 = registers.PopLowestIndex();
-    __ Ldr(dst0, MemOperand(__ StackPointer(), offset));
-    GetAssembler()->cfi().Restore(DWARFReg(dst0));
-  }
-  DCHECK(registers.IsEmpty());
-}
-
 void CodeGeneratorARM64::Bind(HBasicBlock* block) {
   __ Bind(GetLabelOf(block));
 }

compiler/optimizing/code_generator_arm64.h

diff --git a/compiler/optimizing/code_generator_arm64.h b/compiler/optimizing/code_generator_arm64.h
index 9430e31..07c6dd0 100644
--- a/compiler/optimizing/code_generator_arm64.h
+++ b/compiler/optimizing/code_generator_arm64.h
@@ -46,14 +46,11 @@
 
 const vixl::Register tr = vixl::x18;                        // Thread Register
 static const vixl::Register kArtMethodRegister = vixl::w0;  // Method register on invoke.
-const vixl::Register kQuickSuspendRegister = vixl::x19;
 
 const vixl::CPURegList vixl_reserved_core_registers(vixl::ip0, vixl::ip1);
 const vixl::CPURegList vixl_reserved_fp_registers(vixl::d31);
 
-// TODO: When the runtime does not use kQuickSuspendRegister as a suspend
-// counter remove it from the reserved registers list.
-const vixl::CPURegList runtime_reserved_core_registers(tr, kQuickSuspendRegister, vixl::lr);
+const vixl::CPURegList runtime_reserved_core_registers(tr, vixl::lr);
 
 // Callee-saved registers defined by AAPCS64.
 const vixl::CPURegList callee_saved_core_registers(vixl::CPURegister::kRegister,
@@ -227,8 +224,6 @@
 
   void GenerateFrameEntry() OVERRIDE;
   void GenerateFrameExit() OVERRIDE;
-  void SpillRegisters(vixl::CPURegList registers, int offset);
-  void UnspillRegisters(vixl::CPURegList registers, int offset);
 
   vixl::CPURegList GetFramePreservedCoreRegisters() const {
     return vixl::CPURegList(vixl::CPURegister::kRegister, vixl::kXRegSize,