Commit 8829ef30 by Geoffrey Keating Committed by Geoffrey Keating

natevents.cc (env): Delete.

	* testsuite/libjava.jvmti/natevents.cc (env): Delete.
	(ExceptionCB): Fix types for printf arguments.
	(ExceptionCatchCB): Likewise.
	(SingleStepCB): Likewise.
	(BreakpointCB): Likewise.
	(FieldAccessCB): Likewise.
	(FieldModificationCB): Likewise.
	(CompiledMethodLoadCB): Likewise.

From-SVN: r117817
parent ed1cf8ff
2006-10-16 Geoffrey Keating <geoffk@apple.com>
* testsuite/libjava.jvmti/natevents.cc (env): Delete.
(ExceptionCB): Fix types for printf arguments.
(ExceptionCatchCB): Likewise.
(SingleStepCB): Likewise.
(BreakpointCB): Likewise.
(FieldAccessCB): Likewise.
(FieldModificationCB): Likewise.
(CompiledMethodLoadCB): Likewise.
2006-10-14 Keith Seitz <keiths@redhat.com> 2006-10-14 Keith Seitz <keiths@redhat.com>
* include/java-insns.h (enum java_code): Add op_breakpoint. * include/java-insns.h (enum java_code): Add op_breakpoint.
......
...@@ -7,8 +7,6 @@ ...@@ -7,8 +7,6 @@
#include "jvmti-int.h" #include "jvmti-int.h"
#include "events.h" #include "events.h"
static jvmtiEnv *env = NULL;
void void
print_events () print_events ()
{ {
...@@ -119,18 +117,18 @@ ExceptionCB (jvmtiEnv *env, JNIEnv *jni_env, jthread thread, jmethodID method, ...@@ -119,18 +117,18 @@ 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=%p", jni_env, printf ("ExceptionCB jni_env=%p thread=%p method=%p location=%#llx", jni_env,
thread, method, location); thread, method, (unsigned long long) location);
printf (" exception=%p catch_method=%p catch_location=%p\n", exception, printf (" exception=%p catch_method=%p catch_location=%#llx\n", exception,
catch_method, catch_location); 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=%p", printf ("ExceptionCatchCB jni_env=%p thread=%p method=%p location=%#llx",
jni_env, thread, method, location); jni_env, thread, method, (unsigned long long) location);
printf (" exception=%p\n", exception); printf (" exception=%p\n", exception);
} }
...@@ -138,8 +136,8 @@ static void ...@@ -138,8 +136,8 @@ 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=%p\n", printf ("SingleStepCB jni_env=%p thread=%p method=%p location=%#llx\n",
jni_env, thread, method, location); jni_env, thread, method, (unsigned long long) location);
} }
static void static void
...@@ -156,8 +154,8 @@ static void ...@@ -156,8 +154,8 @@ 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=%p\n", printf ("BreakpointCB jni_env=%p thread=%p method=%p location=%#llx\n",
jni_env, thread, method, location); jni_env, thread, method, (unsigned long long) location);
} }
static void static void
...@@ -165,8 +163,8 @@ FieldAccessCB (jvmtiEnv *env, JNIEnv *jni_env, jthread thread, ...@@ -165,8 +163,8 @@ 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=%p", printf ("FieldAccessCB jni_env=%p thread=%p method=%p location=%#llx",
jni_env, thread, method, location); jni_env, thread, method, (unsigned long long) location);
printf (" field_klass=%p object=%p field=%p\n", field_klass, object, field); printf (" field_klass=%p object=%p field=%p\n", field_klass, object, field);
} }
...@@ -177,8 +175,8 @@ FieldModificationCB (jvmtiEnv *env, JNIEnv *jni_env, jthread thread, ...@@ -177,8 +175,8 @@ FieldModificationCB (jvmtiEnv *env, JNIEnv *jni_env, jthread thread,
jvalue new_value) jvalue new_value)
{ {
printf ("FieldModificationCB jni_env=%p thread=%p method=%p location=%p", printf ("FieldModificationCB jni_env=%p thread=%p method=%p location=%#llx",
jni_env, thread, method, location); jni_env, thread, method, (unsigned long long) location);
printf (" field_klass=%p object=%p field=%p signature_type=%c", field_klass, printf (" field_klass=%p object=%p field=%p signature_type=%c", field_klass,
object, field, signature_type); object, field, signature_type);
printf (" new_value=%d\n", (int) new_value.i); printf (" new_value=%d\n", (int) new_value.i);
...@@ -218,8 +216,8 @@ CompiledMethodLoadCB (jvmtiEnv *env, jmethodID method, jint code_size, ...@@ -218,8 +216,8 @@ 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=%p code_addr=%p", printf ("CompiledMethodLoadCB method=%p code_size=%#x code_addr=%p",
method, code_size, code_addr); method, (unsigned) code_size, code_addr);
printf (" map_length=%d map=%p compile_info=%p\n", (int) map_length, map, printf (" map_length=%d map=%p compile_info=%p\n", (int) map_length, map,
compile_info); compile_info);
} }
......
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