changeset 22500:148664eacffa

Remove additional pad in deopt_blob when building with JVMCI; fix comment blocks in implicit_exception_uncommon_trap
author Stefan Anzinger <stefan.anzinger@oracle.com>
date Mon, 31 Aug 2015 17:37:55 +0200
parents a69a8d96ee6e
children d113a94d4fdd
files src/cpu/sparc/vm/sharedRuntime_sparc.cpp
diffstat 1 files changed, 3 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/src/cpu/sparc/vm/sharedRuntime_sparc.cpp	Thu Aug 27 12:19:43 2015 +0200
+++ b/src/cpu/sparc/vm/sharedRuntime_sparc.cpp	Mon Aug 31 17:37:55 2015 +0200
@@ -3468,11 +3468,8 @@
     pad += StackShadowPages*16 + 32;
   }
 #endif
-#if INCLUDE_JVMCI
-  pad += 1000; // Increase the buffer size when compiling for JVMCI
-#endif
 #ifdef _LP64
-  CodeBuffer buffer("deopt_blob", 2100+pad+1000, 512);
+  CodeBuffer buffer("deopt_blob", 2100+pad, 512);
 #else
   // Measured 8/7/03 at 1212 in 32bit debug build (no VerifyThread)
   // Measured 8/7/03 at 1396 in 32bit debug build (VerifyThread)
@@ -3539,7 +3536,7 @@
 
 
 #if INCLUDE_JVMCI
-  masm->block_comment("BEGIN JVMCI");
+  masm->block_comment("BEGIN implicit_exception_uncommon_trap");
   int implicit_exception_uncommon_trap_offset = __ offset() - start;
   __ ld_ptr(G2_thread, in_bytes(JavaThread::jvmci_implicit_exception_pc_offset()), O7);
   __ st(G0, Address(G2_thread, in_bytes(JavaThread::jvmci_implicit_exception_pc_offset())));
@@ -3548,12 +3545,8 @@
   int uncommon_trap_offset = __ offset() - start;
 
   // Save everything in sight.
-  masm->block_comment("save_live_regs");
   (void) RegisterSaver::save_live_registers(masm, 0, &frame_size_words);
-  masm->block_comment("/save_live_regs");
-  masm->block_comment("set_last_java_frame");
   __ set_last_Java_frame(SP, NULL);
-  masm->block_comment("/set_last_java_frame");
 
   __ ld(G2_thread, in_bytes(JavaThread::pending_deoptimization_offset()), O1);
   __ sub(G0, 1, L1);
@@ -3571,7 +3564,7 @@
   Label after_fetch_unroll_info_call;
   __ ba(after_fetch_unroll_info_call);
   __ delayed()->nop(); // Delay slot
-  masm->block_comment("END JVMCI");
+  masm->block_comment("END implicit_exception_uncommon_trap");
 #endif // INCLUDE_JVMCI
 
   int exception_offset = __ offset() - start;