Mercurial > hg > release > icedtea7-forest-2.4 > hotspot

changeset 5047:fef21600239c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Changes for HSX23
author chrisphi
date Fri, 12 Jul 2013 20:56:23 +0100
parents f541c1d41ba7
children 60dbdc6b0859
files src/cpu/zero/vm/asm_helper.cpp src/share/vm/prims/jvmtiExport.hpp src/share/vm/utilities/vmError.cpp src/share/vm/utilities/vmError.hpp
diffstat 4 files changed, 10 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/src/cpu/zero/vm/asm_helper.cpp	Tue May 28 19:43:58 2013 +0200
+++ b/src/cpu/zero/vm/asm_helper.cpp	Fri Jul 12 20:56:23 2013 +0100
@@ -590,7 +590,7 @@
   nl();
   print_def("JNIHANDLEBLOCK_TOP", offset_of(JNIHandleBlock, _top));
   nl();
-  print_def("KLASS_PART", klassOopDesc::klass_part_offset_in_bytes());
+  print_def("KLASS_PART", sizeof(klassOopDesc));
   print_def("KLASS_ACCESSFLAGS", offset_of(Klass, _access_flags));
   print_def("KLASS_JAVA_MIRROR", offset_of(Klass, _java_mirror));
   print_def("INSTANCEKLASS_INITSTATE", offset_of(instanceKlass, _init_state));
--- a/src/share/vm/prims/jvmtiExport.hpp	Tue May 28 19:43:58 2013 +0200
+++ b/src/share/vm/prims/jvmtiExport.hpp	Fri Jul 12 20:56:23 2013 +0100
@@ -143,12 +143,6 @@
   static void post_compiled_method_load(JvmtiEnv* env, const jmethodID method, const jint length,
                                         const void *code_begin, const jint map_length,
                                         const jvmtiAddrLocationMap* map);
-#ifdef __arm__
-  static void post_compiled_method_load(const methodOop method, const jint length,
-					const void *code_begin, const jint map_length,
-					const jvmtiAddrLocationMap* map,
-					const void *compile_info) KERNEL_RETURN;
-#endif // __arm__
   static void post_dynamic_code_generated(JvmtiEnv* env, const char *name, const void *code_begin,
                                           const void *code_end);
 
@@ -287,6 +281,12 @@
                                         jint *cached_length_ptr);
   static void post_native_method_bind(methodOop method, address* function_ptr);
   static void post_compiled_method_load(nmethod *nm);
+#ifdef __arm__
+  static void post_compiled_method_load(const methodOop method, const jint length,
+					const void *code_begin, const jint map_length,
+					const jvmtiAddrLocationMap* map,
+					const void *compile_info) KERNEL_RETURN;
+#endif // __arm__
   static void post_dynamic_code_generated(const char *name, const void *code_begin, const void *code_end);
 
   // used to post a CompiledMethodUnload event
--- a/src/share/vm/utilities/vmError.cpp	Tue May 28 19:43:58 2013 +0200
+++ b/src/share/vm/utilities/vmError.cpp	Fri Jul 12 20:56:23 2013 +0100
@@ -257,7 +257,7 @@
 }
 
 #ifdef PRODUCT
-extern "C" void ps() {
+extern "C" void _ps() {
   fdStream out(defaultStream::output_fd());
   JavaThread* thread = JavaThread::active();
   char *buf = new char[1024*1024];
--- a/src/share/vm/utilities/vmError.hpp	Tue May 28 19:43:58 2013 +0200
+++ b/src/share/vm/utilities/vmError.hpp	Fri Jul 12 20:56:23 2013 +0100
@@ -31,7 +31,7 @@
 class VM_ReportJavaOutOfMemory;
 
 #ifdef PRODUCT
-extern "C" void ps();
+extern "C" void _ps();
 #endif // PRODUCT
 
 class VMError : public StackObj {
@@ -103,7 +103,7 @@
   bool should_report_bug(unsigned int id) { return id != oom_error; }
 
 #ifdef PRODUCT
-  friend void ps();
+  friend void _ps();
 #endif // PRODUCT
 
 public: