From 2797f081d474a208a74af9684d2c5c3dc0ff282d Mon Sep 17 00:00:00 2001
From: Keith Seitz <keiths@redhat.com>
Date: Tue, 16 Jan 2007 19:58:18 +0000
Subject: [PATCH] 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
---
 libjava/ChangeLog                            |   7 +++++++
 libjava/testsuite/libjava.jvmti/events.jar   | Bin 702 -> 751 bytes
 libjava/testsuite/libjava.jvmti/events.out   |   2 +-
 libjava/testsuite/libjava.jvmti/natevents.cc |   2 +-
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index b3b0908d566..de8a12326e6 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,10 @@
+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):
diff --git a/libjava/testsuite/libjava.jvmti/events.jar b/libjava/testsuite/libjava.jvmti/events.jar
index 121df82381999b14e850b5e24f5acfae21226540..48a69dc7ef2a6a5ff1921f29792788c3f57d322b 100644
GIT binary patch
delta 492
zcmdnT`ks|Hz?+$civa{Ww(3vhRbd8ECeif`TlLMR#_Vh=XJlY-XJTOB0jfwXOU)}O
z)=SPwEH2Is@by3BAW-Ygy>uy4(*yHI;Y@NW^9*Brd`x~!bl6d$;2l}Wxn-G-%0C_3
z6(1k)e{h#vu6u081vTT}Y0vjoTF2j)pU>b|kfCsFf`IYERh^7;6|J8b$4M8K2kd^y
z+giW)#jlWEL8cO0ytW=*Fu$@k(XlyGxsSzpnPzOEt?c)f`_J}HOgLd`+um<=XFB6N
z@zSpf>O3dYOxF4x*>}CyA-uD5k$3HxrKbbd+%f%Mvt^3@UB|t*3@0A$YW!nAeeLp2
zp=4=Rk&_F}RS&mz=<L0vYbg4WRsQ<qh-8h}vURt_>z@{6-TXRb&vd@<OU0)bGILAc
zFxqf(LcBs^va~AOV?&MJ6X^>#omj@&wyC#dgY?|r%vIra2dgF4Of&x~Td3Fkb;%-M
z8TQ&6s+_zBmtXAM=5tXYWbqk|<Nfz0)GTx65j*M<ab?1y40qls(;3p(%s6JBP_P!y
z6wrRLF@D3G=-Q*2zpTstZMpO?LD<u2<%j=Qx178tm)iDs!|w;|0p5&ETnz9yo6N#w
Z0*bWB)=c(%sIfM=gUNtR4H$V03;;5f&ddM+

delta 450
zcmaFQx{sANz?+$civa|JoRuf?sxX5nljwRNWoF*Rc-xJUf#E(7^8i((mZj#E6ze7D
zBo-Iv2E=+ZIf~dmUiEt2>{-idqi)Z3Q?Zra%i@?Qzu?EE<{qn)9oE9{G`?(pwQx~;
zorAsBuH9@x7R<%_pWP{b_xIn=KTHK&_uZNlb)PxSyx=xzp~17_dov15v+jI7o|Len
zzD8}T$#b5twf9mz;$AE)NIdv)g3~O;`;)xxoNL-QqpYG{NyGTcUf1*U1Q&90iWIDr
z(AwI5ZPJ3=WkJ2OzOHMwxt1&P@8b6P&dN;uu2VXq&U<)PGEUo7=<nfNaj-d!Ew%0M
z>vz7-PxVLEF72(E!ko7xtZvPLqiWl7a}1}1ZTV2Yp*fcAx2Bh`NBYifUdy=KR<-At
zY`J}H^Gk=AQyKT(B;A<I(d_&yRnbbUa*JYBZr7?5$(vU$S{vy<2@tNjTzDzT@5*!=
zcDZZ+6pniw34JfR^U*PBE%_VKO2vk~%{;D=ySA`&30wSN4e(}U;$ncufEhR{7#Jqo
bGU<S#VsZ|XJs)aZOy0?4!1fgwB@7GzYP-6h

diff --git a/libjava/testsuite/libjava.jvmti/events.out b/libjava/testsuite/libjava.jvmti/events.out
index 0f6c0b0e41c..7b51cafe80e 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 73c1449541f..a5d7bcce94b 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