Skip to content

R
riscv-gcc-1
Commit 4f0abdc9 by Andreas Tobler Committed by Andreas Tobler
Options

natevents.cc (do_callback_arg_tests): Replace formatting modifiers %p with %#llx… 

natevents.cc (do_callback_arg_tests): Replace formatting modifiers %p with %#llx and cast the arguments.

2006-10-25  Andreas Tobler  <a.tobler@schweiz.org>

	* testsuite/libjava.jvmti/natevents.cc (do_callback_arg_tests): Replace
	formatting modifiers %p with %#llx and cast the arguments.

From-SVN: r118040
parent 76f6e118
Showing with 97 additions and 60 deletions
libjava/ChangeLog
2006-10-25 Andreas Tobler <a.tobler@schweiz.org>
* testsuite/libjava.jvmti/natevents.cc (do_callback_arg_tests): Replace
formatting modifiers %p with %#llx and cast the arguments.
2006-10-20 Tom Tromey <tromey@redhat.com> 2006-10-20 Tom Tromey <tromey@redhat.com>
* testsuite/libjava.jvmti/natevents.cc (do_callback_arg_tests): * testsuite/libjava.jvmti/natevents.cc (do_callback_arg_tests):
......
libjava/testsuite/libjava.jvmti/natevents.cc
...@@ -56,25 +56,28 @@ print_events () ...@@ -56,25 +56,28 @@ print_events ()
static void static void
VMInitCB (jvmtiEnv *env, JNIEnv *jni_env, jthread thread) VMInitCB (jvmtiEnv *env, JNIEnv *jni_env, jthread thread)
{ {
printf ("VMInitCB jni_env=%p thread=%p\n", jni_env, thread); printf ("VMInitCB jni_env=%#llx thread=%#llx\n",
(unsigned long long) jni_env, (unsigned long long) thread);
} }
static void static void
VMDeathCB (jvmtiEnv *env, JNIEnv *jni_env) VMDeathCB (jvmtiEnv *env, JNIEnv *jni_env)
{ {
printf ("VMDeathCB jni_env=%p\n", jni_env); printf ("VMDeathCB jni_env=%#llx\n", (unsigned long long) jni_env);
} }
static void static void
ThreadStartCB (jvmtiEnv *env, JNIEnv *jni_env, jthread thread) ThreadStartCB (jvmtiEnv *env, JNIEnv *jni_env, jthread thread)
{ {
printf ("ThreadStartCB jni_env=%p thread=%p\n", jni_env, thread); printf ("ThreadStartCB jni_env=%#llx thread=%#llx\n",
(unsigned long long) jni_env, (unsigned long long) thread);
} }
static void static void
ThreadEndCB (jvmtiEnv *env, JNIEnv *jni_env, jthread thread) ThreadEndCB (jvmtiEnv *env, JNIEnv *jni_env, jthread thread)
{ {
printf ("ThreadEndCB jni_env=%p thread=%p\n", jni_env, thread); printf ("ThreadEndCB jni_env=%#llx thread=%#llx\n",
(unsigned long long) jni_env, (unsigned long long) thread);
} }
static void static void
...@@ -84,32 +87,37 @@ ClassFileLoadHookCB (jvmtiEnv *env, JNIEnv *jni_env, ...@@ -84,32 +87,37 @@ ClassFileLoadHookCB (jvmtiEnv *env, JNIEnv *jni_env,
jint class_data_len, const unsigned char *class_data, jint class_data_len, const unsigned char *class_data,
jint *new_class_data_len, unsigned char **new_class_data) jint *new_class_data_len, unsigned char **new_class_data)
{ {
printf ("ClassFileLoadHookCB jni_env=%p class_being_redefined=%p loader=%p", printf ("ClassFileLoadHookCB jni_env=%#llx class_being_redefined=%#llx"
jni_env, class_being_redefined, loader); " loader=%#llx", (unsigned long long) jni_env, (unsigned long long)
printf (" name=%s protection_domain=%p class_data_len=%d class_data=%p", class_being_redefined, (unsigned long long) loader);
name, protection_domain, (int) class_data_len, class_data); printf (" name=%s protection_domain=%#llx class_data_len=%d class_data=%#llx",
printf (" new_class_data_len=%p new_class_data=%p\n", new_class_data_len, name, (unsigned long long) protection_domain, (int) class_data_len,
(unsigned long long) class_data);
printf (" new_class_data_len=%#llx new_class_data=%#llx\n",
(unsigned long long) new_class_data_len, (unsigned long long)
new_class_data); new_class_data);
} }
static void static void
ClassLoadCB (jvmtiEnv *env, JNIEnv *jni_env, jthread thread, jclass klass) ClassLoadCB (jvmtiEnv *env, JNIEnv *jni_env, jthread thread, jclass klass)
{ {
printf ("ClassLoadCB jni_env=%p thread=%p klass=%p\n", jni_env, thread, printf ("ClassLoadCB jni_env=%#llx thread=%#llx klass=%#llx\n",
klass); (unsigned long long) jni_env, (unsigned long long) thread,
(unsigned long long) klass);
} }
static void static void
ClassPrepareCB (jvmtiEnv *env, JNIEnv *jni_env, jthread thread, jclass klass) ClassPrepareCB (jvmtiEnv *env, JNIEnv *jni_env, jthread thread, jclass klass)
{ {
printf ("ClassPrepareCB jni_env=%p thread=%p klass=%p\n", jni_env, printf ("ClassPrepareCB jni_env=%#llx thread=%#llx klass=%#llx\n",
thread, klass); (unsigned long long)jni_env, (unsigned long long) thread,
(unsigned long long) klass);
} }
static void static void
VMStartCB (jvmtiEnv *env, JNIEnv *jni_env) VMStartCB (jvmtiEnv *env, JNIEnv *jni_env)
{ {
printf ("VMStartCB jni_env=%p\n", jni_env); printf ("VMStartCB jni_env=%#llx\n", (unsigned long long) jni_env);
} }
static void static void
...@@ -117,35 +125,42 @@ ExceptionCB (jvmtiEnv *env, JNIEnv *jni_env, jthread thread, jmethodID method, ...@@ -117,35 +125,42 @@ ExceptionCB (jvmtiEnv *env, JNIEnv *jni_env, jthread thread, jmethodID method,
jlocation location, jobject exception, jmethodID catch_method, jlocation location, jobject exception, jmethodID catch_method,
jlocation catch_location) jlocation catch_location)
{ {
printf ("ExceptionCB jni_env=%p thread=%p method=%p location=%#llx", jni_env, printf ("ExceptionCB jni_env=%#llx thread=%#llx method=%#llx location=%#llx",
thread, method, (unsigned long long) location); (unsigned long long) jni_env, (unsigned long long) thread,
printf (" exception=%p catch_method=%p catch_location=%#llx\n", exception, (unsigned long long) method, (unsigned long long) location);
catch_method, (unsigned long long) catch_location); printf (" exception=%#llx catch_method=%#llx catch_location=%#llx\n",
(unsigned long long) exception, (unsigned long long) catch_method,
(unsigned long long) catch_location);
} }
static void static void
ExceptionCatchCB (jvmtiEnv *env, JNIEnv *jni_env, jthread thread, ExceptionCatchCB (jvmtiEnv *env, JNIEnv *jni_env, jthread thread,
jmethodID method, jlocation location, jobject exception) jmethodID method, jlocation location, jobject exception)
{ {
printf ("ExceptionCatchCB jni_env=%p thread=%p method=%p location=%#llx", printf ("ExceptionCatchCB jni_env=%#llx thread=%#llx method=%#llx"
jni_env, thread, method, (unsigned long long) location); " location=%#llx",
printf (" exception=%p\n", exception); (unsigned long long) jni_env, (unsigned long long) thread,
(unsigned long long) method, (unsigned long long) location);
printf (" exception=%#llx\n", (unsigned long long) exception);
} }
static void static void
SingleStepCB (jvmtiEnv *env, JNIEnv *jni_env, jthread thread, jmethodID method, SingleStepCB (jvmtiEnv *env, JNIEnv *jni_env, jthread thread, jmethodID method,
jlocation location) jlocation location)
{ {
printf ("SingleStepCB jni_env=%p thread=%p method=%p location=%#llx\n", printf ("SingleStepCB jni_env=%#llx thread=%#llx method=%#llx"
jni_env, thread, method, (unsigned long long) location); " location=%#llx\n",
(unsigned long long) jni_env, (unsigned long long) thread,
(unsigned long long) method, (unsigned long long) location);
} }
static void static void
FramePopCB (jvmtiEnv *env, JNIEnv *jni_env, jthread thread, jmethodID method, FramePopCB (jvmtiEnv *env, JNIEnv *jni_env, jthread thread, jmethodID method,
jboolean was_popped_by_exception) jboolean was_popped_by_exception)
{ {
printf ("FramePopCB jni_env=%p thread=%p method=%p", jni_env, thread, printf ("FramePopCB jni_env=%#llx thread=%#llx method=%#llx",
method); (unsigned long long) jni_env, (unsigned long long) thread,
(unsigned long long) method);
printf (" was_pooped_by_exception=%d\n", (was_popped_by_exception ? printf (" was_pooped_by_exception=%d\n", (was_popped_by_exception ?
1 : 0)); 1 : 0));
} }
...@@ -154,8 +169,10 @@ static void ...@@ -154,8 +169,10 @@ static void
BreakpointCB (jvmtiEnv *env, JNIEnv *jni_env, jthread thread, jmethodID method, BreakpointCB (jvmtiEnv *env, JNIEnv *jni_env, jthread thread, jmethodID method,
jlocation location) jlocation location)
{ {
printf ("BreakpointCB jni_env=%p thread=%p method=%p location=%#llx\n", printf ("BreakpointCB jni_env=%#llx thread=%#llx method=%#llx"
jni_env, thread, method, (unsigned long long) location); " location=%#llx\n", (unsigned long long) jni_env,
(unsigned long long) thread, (unsigned long long) method,
(unsigned long long) location);
} }
static void static void
...@@ -163,9 +180,11 @@ FieldAccessCB (jvmtiEnv *env, JNIEnv *jni_env, jthread thread, ...@@ -163,9 +180,11 @@ FieldAccessCB (jvmtiEnv *env, JNIEnv *jni_env, jthread thread,
jmethodID method, jlocation location, jclass field_klass, jmethodID method, jlocation location, jclass field_klass,
jobject object, jfieldID field) jobject object, jfieldID field)
{ {
printf ("FieldAccessCB jni_env=%p thread=%p method=%p location=%#llx", printf ("FieldAccessCB jni_env=%#llx thread=%#llx method=%#llx"
jni_env, thread, method, (unsigned long long) location); " location=%#llx", (unsigned long long) jni_env, (unsigned long long)
printf (" field_klass=%p object=%p field=%p\n", field_klass, object, field); thread, (unsigned long long) method, (unsigned long long) location);
printf (" field_klass=%#llx object=%#llx field=%#llx\n", (unsigned long long)
field_klass, (unsigned long long) object, (unsigned long long) field);
} }
static void static void
...@@ -175,10 +194,12 @@ FieldModificationCB (jvmtiEnv *env, JNIEnv *jni_env, jthread thread, ...@@ -175,10 +194,12 @@ FieldModificationCB (jvmtiEnv *env, JNIEnv *jni_env, jthread thread,
jvalue new_value) jvalue new_value)
{ {
printf ("FieldModificationCB jni_env=%p thread=%p method=%p location=%#llx", printf ("FieldModificationCB jni_env=%#llx thread=%#llx method=%#llx"
jni_env, thread, method, (unsigned long long) location); " location=%#llx", (unsigned long long) jni_env, (unsigned long long)
printf (" field_klass=%p object=%p field=%p signature_type=%c", field_klass, thread, (unsigned long long) method, (unsigned long long) location);
object, field, signature_type); printf (" field_klass=%#llx object=%#llx field=%#llx signature_type=%c",
(unsigned long long) field_klass, (unsigned long long) object,
(unsigned long long) field, signature_type);
printf (" new_value=%d\n", (int) new_value.i); printf (" new_value=%d\n", (int) new_value.i);
} }
...@@ -186,8 +207,9 @@ static void ...@@ -186,8 +207,9 @@ static void
MethodEntryCB (jvmtiEnv *env, JNIEnv *jni_env, jthread thread, MethodEntryCB (jvmtiEnv *env, JNIEnv *jni_env, jthread thread,
jmethodID method) jmethodID method)
{ {
printf ("MethodEntryCB jni_env=%p thread=%p method=%p\n", jni_env, thread, printf ("MethodEntryCB jni_env=%#llx thread=%#llx method=%#llx\n",
method); (unsigned long long) jni_env, (unsigned long long) thread,
(unsigned long long) method);
} }
static void static void
...@@ -195,8 +217,9 @@ MethodExitCB (jvmtiEnv *env, JNIEnv *jni_env, jthread thread, ...@@ -195,8 +217,9 @@ MethodExitCB (jvmtiEnv *env, JNIEnv *jni_env, jthread thread,
jmethodID method, jboolean was_popped_by_exception, jmethodID method, jboolean was_popped_by_exception,
jvalue return_value) jvalue return_value)
{ {
printf ("MethodExitCB jni_env=%p thread=%p method=%p", jni_env, thread, printf ("MethodExitCB jni_env=%#llx thread=%#llx method=%#llx",
method); (unsigned long long) jni_env, (unsigned long long) thread,
(unsigned long long) method);
printf (" was_popped_by_exception=%d return_value=%d\n", printf (" was_popped_by_exception=%d return_value=%d\n",
(was_popped_by_exception) ? 1 : 0, (int) return_value.i); (was_popped_by_exception) ? 1 : 0, (int) return_value.i);
} }
...@@ -205,9 +228,11 @@ static void ...@@ -205,9 +228,11 @@ static void
NativeMethodBindCB (jvmtiEnv *env, JNIEnv *jni_env, jthread thread, NativeMethodBindCB (jvmtiEnv *env, JNIEnv *jni_env, jthread thread,
jmethodID method, void *address, void **new_address_ptr) jmethodID method, void *address, void **new_address_ptr)
{ {
printf ("NativeMethodBindCB jni_env=%p thread=%p method=%p", jni_env, printf ("NativeMethodBindCB jni_env=%#llx thread=%#llx method=%#llx",
thread, method); (unsigned long long) jni_env, (unsigned long long) thread,
printf (" address=%p new_address_ptr=%p\n", address, new_address_ptr); (unsigned long long) method);
printf (" address=%#llx new_address_ptr=%#llx\n", (unsigned long long)
address, (unsigned long long) new_address_ptr);
} }
static void static void
...@@ -216,25 +241,26 @@ CompiledMethodLoadCB (jvmtiEnv *env, jmethodID method, jint code_size, ...@@ -216,25 +241,26 @@ CompiledMethodLoadCB (jvmtiEnv *env, jmethodID method, jint code_size,
const jvmtiAddrLocationMap *map, const jvmtiAddrLocationMap *map,
const void *compile_info) const void *compile_info)
{ {
printf ("CompiledMethodLoadCB method=%p code_size=%#x code_addr=%p", printf ("CompiledMethodLoadCB method=%#llx code_size=%#llx code_addr=%#llx",
method, (unsigned) code_size, code_addr); (unsigned long long) method, (unsigned long long) code_size,
printf (" map_length=%d map=%p compile_info=%p\n", (int) map_length, map, (unsigned long long) code_addr);
compile_info); printf (" map_length=%d map=%#llx compile_info=%#llx\n", (int) map_length,
(unsigned long long) map, (unsigned long long) compile_info);
} }
static void static void
CompiledMethodUnloadCB (jvmtiEnv *env, jmethodID method, const void *code_addr) CompiledMethodUnloadCB (jvmtiEnv *env, jmethodID method, const void *code_addr)
{ {
printf ("CompiledMethodUnloadCB method=%p code_addr=%p\n", method, printf ("CompiledMethodUnloadCB method=%#llx code_addr=%#llx\n",
code_addr); (unsigned long long) method, (unsigned long long) code_addr);
} }
static void static void
DynamicCodeGeneratedCB (jvmtiEnv *env, const char *name, const void *address, DynamicCodeGeneratedCB (jvmtiEnv *env, const char *name, const void *address,
jint length) jint length)
{ {
printf ("DynamicCodeGeneratedCB name=%s address=%p length=%d\n", name, printf ("DynamicCodeGeneratedCB name=%s address=%#llx length=%d\n", name,
address, (int) length); (unsigned long long) address, (int) length);
} }
static void static void
...@@ -247,32 +273,36 @@ static void ...@@ -247,32 +273,36 @@ static void
MonitorWaitCB (jvmtiEnv *env, JNIEnv *jni_env, jthread thread, jobject object, MonitorWaitCB (jvmtiEnv *env, JNIEnv *jni_env, jthread thread, jobject object,
jlong timeout) jlong timeout)
{ {
printf ("MonitorWaitCB jni_env=%p thread=%p object=%p timeout=%ld\n", printf ("MonitorWaitCB jni_env=%#llx thread=%#llx object=%#llx timeout=%ld\n",
jni_env, thread, object, (long) timeout); (unsigned long long) jni_env, (unsigned long long) thread,
(unsigned long long) object, (long) timeout);
} }
static void static void
MonitorWaitedCB (jvmtiEnv *env, JNIEnv *jni_env, jthread thread, MonitorWaitedCB (jvmtiEnv *env, JNIEnv *jni_env, jthread thread,
jobject object, jboolean timed_out) jobject object, jboolean timed_out)
{ {
printf ("MonitorWaitedCB jni_env=%p thread=%p object=%p timed_out=%d\n", printf ("MonitorWaitedCB jni_env=%#llx thread=%#llx object=%#llx"
jni_env, thread, object, (timed_out) ? 1 : 0); " timed_out=%d\n", (unsigned long long) jni_env, (unsigned long long)
thread, (unsigned long long) object, (timed_out) ? 1 : 0);
} }
static void static void
MonitorContendedEnterCB (jvmtiEnv *env, JNIEnv *jni_env, jthread thread, MonitorContendedEnterCB (jvmtiEnv *env, JNIEnv *jni_env, jthread thread,
jobject object) jobject object)
{ {
printf ("MonitorContendedEnterCB jni_env=%p thread=%p object=%p\n", printf ("MonitorContendedEnterCB jni_env=%#llx thread=%#llx object=%#llx\n",
jni_env, thread, object); (unsigned long long) jni_env, (unsigned long long) thread,
(unsigned long long) object);
} }
static void static void
MonitorContendedEnteredCB (jvmtiEnv *env, JNIEnv *jni_env, jthread thread, MonitorContendedEnteredCB (jvmtiEnv *env, JNIEnv *jni_env, jthread thread,
jobject object) jobject object)
{ {
printf ("MonitorContendedEnteredCB jni_env=%p thread=%p object=%p\n", printf ("MonitorContendedEnteredCB jni_env=%#llx thread=%#llx object=%#llx\n",
jni_env, thread, object); (unsigned long long) jni_env, (unsigned long long) thread,
(unsigned long long) object);
} }
static void static void
...@@ -297,9 +327,11 @@ static void ...@@ -297,9 +327,11 @@ static void
VMObjectAllocCB (jvmtiEnv *env, JNIEnv *jni_env, jthread thread, VMObjectAllocCB (jvmtiEnv *env, JNIEnv *jni_env, jthread thread,
jobject object, jclass object_klass, jlong size) jobject object, jclass object_klass, jlong size)
{ {
printf ("VMObjectAllocCB jni_env=%p thread=%p object=%p", jni_env, printf ("VMObjectAllocCB jni_env=%#llx thread=%#llx object=%#llx",
thread, object); (unsigned long long) jni_env, (unsigned long long) thread,
printf (" object_klass=%p size=%ld\n", object_klass, (long) size); (unsigned long long) object);
printf (" object_klass=%#llx size=%ld\n", (unsigned long long) object_klass,
(long) size);
} }
static void static void
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment