[aarch64-port-dev ] RFR: Remove duplicate volatile encodings in aarch64.ad

[Edward Nevill]

Hi,

The following patch removes a number of encodings in aarch64.ad which are simply duplicated. It looks like a chunk of the file just got cut and pasted unto itself.

OK to push?

Ed.

--- CUT HERE ---
# HG changeset patch
# User Edward Nevill edward.nevill at linaro.org
# Date 1393603955 0
#      Fri Feb 28 16:12:35 2014 +0000
# Node ID 5de1ad9a1b973bfcba746462d38113260026f676
# Parent  b20841396279b2494107d8bbda67970d59260101
Remove duplicate volatile encodings in aarch64.ad

diff -r b20841396279 -r 5de1ad9a1b97 src/cpu/aarch64/vm/aarch64.ad
--- a/src/cpu/aarch64/vm/aarch64.ad	Fri Feb 28 15:56:32 2014 +0000
+++ b/src/cpu/aarch64/vm/aarch64.ad	Fri Feb 28 16:12:35 2014 +0000
@@ -2119,80 +2119,6 @@
 
   // volatile loads and stores
 
-  enc_class aarch64_enc_ldarsbw(iRegI dst, memory mem) %{
-    Register dst_reg = as_Register($dst$$reg);
-    MOV_VOLATILE(dst_reg, $mem$$base, $mem$$index, $mem$$scale, $mem$$disp,
-	     rscratch1, ldarb);
-    __ sxtbw(dst_reg, dst_reg);
-  %}
-
-  enc_class aarch64_enc_ldarsb(iRegL dst, memory mem) %{
-    Register dst_reg = as_Register($dst$$reg);
-    MOV_VOLATILE(dst_reg, $mem$$base, $mem$$index, $mem$$scale, $mem$$disp,
-	     rscratch1, ldarb);
-    __ sxtb(dst_reg, dst_reg);
-  %}
-
-  enc_class aarch64_enc_ldarbw(iRegI dst, memory mem) %{
-    MOV_VOLATILE(as_Register($dst$$reg), $mem$$base, $mem$$index, $mem$$scale, $mem$$disp,
-	     rscratch1, ldarb);
-  %}
-
-  enc_class aarch64_enc_ldarb(iRegL dst, memory mem) %{
-    MOV_VOLATILE(as_Register($dst$$reg), $mem$$base, $mem$$index, $mem$$scale, $mem$$disp,
-	     rscratch1, ldarb);
-  %}
-
-  enc_class aarch64_enc_ldarshw(iRegI dst, memory mem) %{
-    Register dst_reg = as_Register($dst$$reg);
-    MOV_VOLATILE(dst_reg, $mem$$base, $mem$$index, $mem$$scale, $mem$$disp,
-	     rscratch1, ldarh);
-    __ sxthw(dst_reg, dst_reg);
-  %}
-
-  enc_class aarch64_enc_ldarsh(iRegL dst, memory mem) %{
-    Register dst_reg = as_Register($dst$$reg);
-    MOV_VOLATILE(dst_reg, $mem$$base, $mem$$index, $mem$$scale, $mem$$disp,
-	     rscratch1, ldarh);
-    __ sxth(dst_reg, dst_reg);
-  %}
-
-  enc_class aarch64_enc_ldarhw(iRegI dst, memory mem) %{
-    MOV_VOLATILE(as_Register($dst$$reg), $mem$$base, $mem$$index, $mem$$scale, $mem$$disp,
-	     rscratch1, ldarh);
-  %}
-
-  enc_class aarch64_enc_ldarh(iRegL dst, memory mem) %{
-    MOV_VOLATILE(as_Register($dst$$reg), $mem$$base, $mem$$index, $mem$$scale, $mem$$disp,
-	     rscratch1, ldarh);
-  %}
-
-  enc_class aarch64_enc_ldarw(iRegI dst, memory mem) %{
-    MOV_VOLATILE(as_Register($dst$$reg), $mem$$base, $mem$$index, $mem$$scale, $mem$$disp,
-	     rscratch1, ldarw);
-  %}
-
-  enc_class aarch64_enc_ldarw(iRegL dst, memory mem) %{
-    MOV_VOLATILE(as_Register($dst$$reg), $mem$$base, $mem$$index, $mem$$scale, $mem$$disp,
-	     rscratch1, ldarw);
-  %}
-
-  enc_class aarch64_enc_ldar(iRegL dst, memory mem) %{
-    MOV_VOLATILE(as_Register($dst$$reg), $mem$$base, $mem$$index, $mem$$scale, $mem$$disp,
-	     rscratch1, ldar);
-  %}
-
-  enc_class aarch64_enc_fldars(vRegF dst, memory mem) %{
-    MOV_VOLATILE(rscratch1, $mem$$base, $mem$$index, $mem$$scale, $mem$$disp,
-	     rscratch1, ldarw);
-    __ fmovs(as_FloatRegister($dst$$reg), rscratch1);
-  %}
-
-  enc_class aarch64_enc_fldard(vRegD dst, memory mem) %{
-    MOV_VOLATILE(rscratch1, $mem$$base, $mem$$index, $mem$$scale, $mem$$disp,
-	     rscratch1, ldar);
-    __ fmovd(as_FloatRegister($dst$$reg), rscratch1);
-  %}
   enc_class aarch64_enc_stlrb(iRegI src, memory mem) %{
     MOV_VOLATILE(as_Register($src$$reg), $mem$$base, $mem$$index, $mem$$scale, $mem$$disp,
 		 rscratch1, stlrb);
--- CUT HERE ---