[aarch64-port-dev ] Cleanups only: no code changes.

[Andrew Haley]

Andrew.

changeset:   6877:ed1a3a21d7cf
tag:         tip
user:        aph
date:        Thu Aug 21 11:58:48 2014 -0400
summary:     Cleanups only: no code changes.

diff -r a01a5c5cdc10 -r ed1a3a21d7cf src/cpu/aarch64/vm/aarch64.ad
--- a/src/cpu/aarch64/vm/aarch64.ad     Thu Aug 21 11:58:03 2014 -0400
+++ b/src/cpu/aarch64/vm/aarch64.ad     Thu Aug 21 11:58:48 2014 -0400
@@ -2860,7 +2860,7 @@
       Label retaddr;
       __ adr(rscratch2, retaddr);
       __ lea(rscratch1, RuntimeAddress(entry));
-      // Leave a breadcrumb for the stack-walking code.
+      // Leave a breadcrumb for JavaThread::pd_last_frame().
       __ stp(zr, rscratch2, Address(__ pre(sp, -2 * wordSize)));
       __ blrt(rscratch1, gpcnt, fpcnt, rtype);
       __ bind(retaddr);
@@ -6638,7 +6638,12 @@
   effect(KILL flags);

   ins_cost(INSN_COST * 6);
-  format %{ "CmpL3 $dst, $src1, $src2" %}
+  format %{
+      "cmp $src1, $src2"
+      "csetw $dst, ne"
+      "cnegw $dst, lt"
+  %}
+  // format %{ "CmpL3 $dst, $src1, $src2" %}
   ins_encode %{
     __ cmp($src1$$Register, $src2$$Register);
     __ csetw($dst$$Register, Assembler::NE);
@@ -6654,7 +6659,11 @@
   effect(KILL flags);

   ins_cost(INSN_COST * 6);
-  format %{ "CmpL3 $dst, $src1, $src2" %}
+  format %{
+      "cmp $src1, $src2"
+      "csetw $dst, ne"
+      "cnegw $dst, lt"
+  %}
   ins_encode %{
     int32_t con = (int32_t)$src2$$constant;
      if (con < 0) {
diff -r a01a5c5cdc10 -r ed1a3a21d7cf src/cpu/aarch64/vm/runtime_aarch64.cpp
--- a/src/cpu/aarch64/vm/runtime_aarch64.cpp    Thu Aug 21 11:58:03 2014 -0400
+++ b/src/cpu/aarch64/vm/runtime_aarch64.cpp    Thu Aug 21 11:58:48 2014 -0400
@@ -41,8 +41,3 @@
 #endif


-// This file should really contain the code for generating the OptoRuntime
-// exception_blob. However that code uses SimpleRuntimeFrame which only
-// exists in sharedRuntime_x86_64.cpp. When there is a sharedRuntime_<arch>.hpp
-// file and SimpleRuntimeFrame is able to move there then the exception_blob
-// code will move here where it belongs.
diff -r a01a5c5cdc10 -r ed1a3a21d7cf src/os_cpu/linux_aarch64/vm/thread_linux_aarch64.cpp
--- a/src/os_cpu/linux_aarch64/vm/thread_linux_aarch64.cpp      Thu Aug 21 11:58:03 2014 -0400
+++ b/src/os_cpu/linux_aarch64/vm/thread_linux_aarch64.cpp      Thu Aug 21 11:58:48 2014 -0400
@@ -68,7 +68,6 @@
     frame ret_frame(ret_sp, ret_fp, addr.pc());
     if (!ret_frame.safe_for_sender(jt)) {
 #ifdef COMPILER2
-      // C2 uses ebp as a general register see if NULL fp helps
       frame ret_frame2(ret_sp, NULL, addr.pc());
       if (!ret_frame2.safe_for_sender(jt)) {
         // nothing else to try if the frame isn't good