diff options
author | Keith Seitz <keiths@redhat.com> | 2007-01-16 19:58:18 +0000 |
---|---|---|
committer | Keith Seitz <kseitz@gcc.gnu.org> | 2007-01-16 19:58:18 +0000 |
commit | 2797f081d474a208a74af9684d2c5c3dc0ff282d (patch) | |
tree | 8305e47dec72df2d41621e4ff227a308b7cdd102 | |
parent | f031b5d726721fa544501f29866a483845445d85 (diff) | |
download | gcc-2797f081d474a208a74af9684d2c5c3dc0ff282d.zip gcc-2797f081d474a208a74af9684d2c5c3dc0ff282d.tar.gz gcc-2797f081d474a208a74af9684d2c5c3dc0ff282d.tar.bz2 |
natevents.cc (FieldModificationCB): Use %#llx instead of %d for new_value.
* testsuite/libjava.jvmti/natevents.cc (FieldModificationCB): Use
%#llx instead of %d for new_value.
* testsuite/libjava.jvmti/events.out: Update expected output.
* testsuite/libjava.jvmti/events.jar: Regenerate.
From-SVN: r120834
-rw-r--r-- | libjava/ChangeLog | 7 | ||||
-rw-r--r-- | libjava/testsuite/libjava.jvmti/events.jar | bin | 702 -> 751 bytes | |||
-rw-r--r-- | libjava/testsuite/libjava.jvmti/events.out | 2 | ||||
-rw-r--r-- | libjava/testsuite/libjava.jvmti/natevents.cc | 2 |
4 files changed, 9 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index b3b0908..de8a123 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,12 @@ 2007-01-16 Keith Seitz <keiths@redhat.com> + * testsuite/libjava.jvmti/natevents.cc (FieldModificationCB): Use + %#llx instead of %d for new_value. + * testsuite/libjava.jvmti/events.out: Update expected output. + * testsuite/libjava.jvmti/events.jar: Regenerate. + +2007-01-16 Keith Seitz <keiths@redhat.com> + * gnu/classpath/jdwp/natVMVirtualMachine.cc (DEFINE_CALLBACK): New macro. (ENABLE_EVENT): New macro. diff --git a/libjava/testsuite/libjava.jvmti/events.jar b/libjava/testsuite/libjava.jvmti/events.jar Binary files differindex 121df82..48a69dc 100644 --- a/libjava/testsuite/libjava.jvmti/events.jar +++ b/libjava/testsuite/libjava.jvmti/events.jar diff --git a/libjava/testsuite/libjava.jvmti/events.out b/libjava/testsuite/libjava.jvmti/events.out index 0f6c0b0..7b51caf 100644 --- a/libjava/testsuite/libjava.jvmti/events.out +++ b/libjava/testsuite/libjava.jvmti/events.out @@ -41,7 +41,7 @@ SingleStepCB jni_env=0x1 thread=0x2 method=0x3 location=0x4 FramePopCB jni_env=0x1 thread=0x2 method=0x3 was_pooped_by_exception=1 BreakpointCB jni_env=0x1 thread=0x2 method=0x3 location=0x4 FieldAccessCB jni_env=0x1 thread=0x2 method=0x3 location=0x4 field_klass=0x5 object=0x6 field=0x7 -FieldModificationCB jni_env=0x1 thread=0x2 method=0x3 location=0x4 field_klass=0x5 object=0x6 field=0x7 signature_type=8 new_value=9 +FieldModificationCB jni_env=0x1 thread=0x2 method=0x3 location=0x4 field_klass=0x5 object=0x6 field=0x7 signature_type=8 new_value=0x9 MethodEntryCB jni_env=0x1 thread=0x2 method=0x3 MethodExitCB jni_env=0x1 thread=0x2 method=0x3 was_popped_by_exception=1 return_value=5 NativeMethodBindCB jni_env=0x1 thread=0x2 method=0x3 address=0x4 new_address_ptr=0x5 diff --git a/libjava/testsuite/libjava.jvmti/natevents.cc b/libjava/testsuite/libjava.jvmti/natevents.cc index 73c1449..a5d7bcc 100644 --- a/libjava/testsuite/libjava.jvmti/natevents.cc +++ b/libjava/testsuite/libjava.jvmti/natevents.cc @@ -200,7 +200,7 @@ FieldModificationCB (jvmtiEnv *env, JNIEnv *jni_env, jthread thread, 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=%#llx\n", new_value.l); } static void |