Mercurial > hg > graal-jvmci-8

changeset 22503:6fa5f9a1a371

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Stefan Anzinger <stefan.anzinger@oracle.com>
date Tue, 01 Sep 2015 18:58:12 +0200
parents 242e95e0617c (current diff) e2e9c39b7818 (diff)
children 943c2bf064fa
files
diffstat 5 files changed, 11 insertions(+), 31 deletions(-) [+]
line wrap: on
line diff
--- a/src/cpu/sparc/vm/sharedRuntime_sparc.cpp	Tue Sep 01 17:28:48 2015 +0200
+++ b/src/cpu/sparc/vm/sharedRuntime_sparc.cpp	Tue Sep 01 18:58:12 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;
--- a/src/os_cpu/solaris_sparc/vm/os_solaris_sparc.cpp	Tue Sep 01 17:28:48 2015 +0200
+++ b/src/os_cpu/solaris_sparc/vm/os_solaris_sparc.cpp	Tue Sep 01 18:58:12 2015 +0200
@@ -484,15 +484,6 @@
       }
 #endif  // COMPILER2
 
-#if INCLUDE_JVMCI
-      else if (sig == SIGILL && info->si_trapno == 0x100 + ST_RESERVED_FOR_USER_0) {
-        printf("SIGILL 0x%x 0x%x\n", info->si_trapno, ST_RESERVED_FOR_USER_0);
-        uc->uc_mcontext.gregs[REG_PC] = (greg_t)pc+4;
-        uc->uc_mcontext.gregs[REG_nPC] = (greg_t)npc + 4;
-        return true;
-      }
-#endif
-
       else if (sig == SIGSEGV && info->si_code > 0 && !MacroAssembler::needs_explicit_null_check((intptr_t)info->si_addr)) {
         // Determination of interpreter/vtable stub/compiled code null exception
         stub = SharedRuntime::continuation_for_implicit_exception(thread, pc, SharedRuntime::IMPLICIT_NULL);
--- a/src/share/vm/jvmci/jvmciRuntime.cpp	Tue Sep 01 17:28:48 2015 +0200
+++ b/src/share/vm/jvmci/jvmciRuntime.cpp	Tue Sep 01 18:58:12 2015 +0200
@@ -835,7 +835,9 @@
     *sep = '\0';
     const char* name = line;
     char* value = sep + 1;
-    Arguments::PropertyList_add(_plist, name, value);
+    if(Arguments::PropertyList_get_value(*_plist, name) == NULL) {
+      Arguments::PropertyList_add(_plist, name, value);
+    }
   }
 };
 
@@ -960,11 +962,7 @@
     if (file_handle != -1) {
       char* buffer = NEW_C_HEAP_ARRAY(char, st.st_size + 1, mtInternal);
       int num_read;
-      if(ThreadLocalStorage::thread() == NULL) { // Solaris needs a JavaThread for os::read, if no thread started yet, fallback.
-        num_read = (int) ::read(file_handle, (char*) buffer, st.st_size);
-      } else {
-        num_read = (int) os::read(file_handle, (char*) buffer, st.st_size);
-      }
+      num_read = (int) os::read(file_handle, (char*) buffer, st.st_size);
       if (num_read == -1) {
         warning("Error reading file %s due to %s", path, strerror(errno));
       } else if (num_read != st.st_size) {
--- a/src/share/vm/runtime/arguments.cpp	Tue Sep 01 17:28:48 2015 +0200
+++ b/src/share/vm/runtime/arguments.cpp	Tue Sep 01 18:58:12 2015 +0200
@@ -212,10 +212,6 @@
 
   // Set OS specific system properties values
   os::init_system_properties_values();
-
-#if INCLUDE_JVMCI
-  JVMCIRuntime::parse_properties(&_system_properties);
-#endif
 }
 
 
--- a/src/share/vm/runtime/thread.cpp	Tue Sep 01 17:28:48 2015 +0200
+++ b/src/share/vm/runtime/thread.cpp	Tue Sep 01 18:58:12 2015 +0200
@@ -3703,11 +3703,13 @@
   }
 
 #if INCLUDE_JVMCI
-  const char* jvmciCompiler = Arguments::PropertyList_get_value(Arguments::system_properties(), "jvmci.compiler");
+  SystemProperty *properties = Arguments::system_properties();
+  JVMCIRuntime::parse_properties(&properties);
+  const char* jvmciCompiler = Arguments::PropertyList_get_value(properties, "jvmci.compiler");
   if (jvmciCompiler != NULL) {
     JVMCIRuntime::save_compiler(jvmciCompiler);
   }
-  const char* jvmciOptions = Arguments::PropertyList_get_value(Arguments::system_properties(), "jvmci.options");
+  const char* jvmciOptions = Arguments::PropertyList_get_value(properties, "jvmci.options");
   if (jvmciOptions != NULL) {
     JVMCIRuntime::save_options(jvmciOptions);
   }