From 67b2a930fd4739ff67969f8ee645c9d6b5512ed4 Mon Sep 17 00:00:00 2001 From: Keith Seitz Date: Wed, 20 Jun 2007 20:32:20 +0000 Subject: [PATCH] VMVirtualMachine.java (executeMethod): Update from reference implementation. * gnu/classpath/jdwp/VMVirtualMachine.java (executeMethod): Update from reference implementation. * gnu/classpath/jdwp/natVMVirtualMachine.cc (executeMethod): Update parameter list to match new VMVirtualMachine interface. * classpath/lib/gnu/classpath/jdwp/processor/ClassTypeCommandSet.class: Regenerate. * classpath/lib/gnu/classpath/jdwp/processor/ ObjectReferenceCommandSet.class: Regenerate. * classpath/lib/gnu/classpath/jdwp/value/ObjectValue.class: Regenerate. * classpath/lib/gnu/classpath/jdwp/VMVirtualMachine.class: Regenerate. * classpath/lib/gnu/classpath/jdwp/util/MethodResult.class: Regenerate. From-SVN: r125896 --- libjava/ChangeLog | 14 ++++++++++++++ .../gnu/classpath/jdwp/VMVirtualMachine.class | Bin 4063 -> 4080 bytes .../jdwp/processor/ClassTypeCommandSet.class | Bin 5735 -> 5526 bytes .../processor/ObjectReferenceCommandSet.class | Bin 6671 -> 6519 bytes .../classpath/jdwp/util/MethodResult.class | Bin 1147 -> 785 bytes .../classpath/jdwp/value/ObjectValue.class | Bin 1009 -> 1081 bytes .../gnu/classpath/jdwp/VMVirtualMachine.java | 16 +++++++++------- .../gnu/classpath/jdwp/natVMVirtualMachine.cc | 6 +++--- 8 files changed, 26 insertions(+), 10 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 1a73a9b32c4..87c2fc5b2e8 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,17 @@ +2007-07-20 Keith Seitz + + * gnu/classpath/jdwp/VMVirtualMachine.java (executeMethod): + Update from reference implementation. + * gnu/classpath/jdwp/natVMVirtualMachine.cc (executeMethod): + Update parameter list to match new VMVirtualMachine interface. + * classpath/lib/gnu/classpath/jdwp/processor/ClassTypeCommandSet.class: + Regenerate. + * classpath/lib/gnu/classpath/jdwp/processor/ + ObjectReferenceCommandSet.class: Regenerate. + * classpath/lib/gnu/classpath/jdwp/value/ObjectValue.class: Regenerate. + * classpath/lib/gnu/classpath/jdwp/VMVirtualMachine.class: Regenerate. + * classpath/lib/gnu/classpath/jdwp/util/MethodResult.class: Regenerate. + 2007-06-18 Keith Seitz * gnu/gcj/jvmti/Breakpoint.java: Make abstract. diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/VMVirtualMachine.class b/libjava/classpath/lib/gnu/classpath/jdwp/VMVirtualMachine.class index f62976a99f52472e00030c64e3ad368ea7401af8..c3bedb71e3498e4df9f715c3c12bdbc03a3e2b9b 100644 GIT binary patch delta 46 zcmcaF|3Q936g%Ub$6gy-0DvD#LUTNfjbKbyUwy`IaB0l zGd51+IHz&6>^YWAWW?P--3y}qbI(2J{Lb(DINy6O%-vm* zHTv)1Nnkz~OgxHtS{XUJ)};59Ew$7^t*xTm`j$j|Q>3xouCiFpAwRFtqt9E_Q~Uh9 z&KruXsGVGCC%Y0cySX9K-eoIh%+eRFJl&I?HT{U6ep(din-Z-_yFL<)+RYZ5Iim1% zBoxK^Pb*i?v$D0}FU-FJrbw}?n@vtCX6g|$SXbNFW;Z2WfHY1iLNR+&s5RD^jKrGk zP-2`wC>D>E#@$kj3a+yl;!Qtq@vtIIh>jEV#5Z1s?nyUpxT<%R0LLBRbE2#*vN2NL z9*ITEg_s=?;_vdF$$7;T$Ed=Fni@OV5^whNJ|8Fyr>44Dv3Qn#Bv7DDm8qv#dAXO% z#KDjF#N=Z|k!ZSR#*#==GM;$Q&!>DQa7}VPX)j5{JH~ucROnqQ-{~PrBKSvl4O;#$|*(GlHJ!6XgMg)f(FvUvJlLNOtPKGuElw_3F%l%H@PuK{2(==5ESa$@SE86RW6V zHMepPcW|%F)^eYW5!TT}BOTa!S=Mt?*W;s|Oqu5sX9^p*mIP&VawA>ZJL#Xw%~J6Y z8FZ7&77E$QOtwkIqg1k;MLfox?BFgQr-7YEW2TPuX?y0@z3gYI4EU zGZZ+qMi_dMz;PE6gtmGvYg@sg~DHy3fjulngK$HcI-5FEI1WA-0Co zQWp3QkQq$N^U3Cib=!O@&zEODf9axIxroOkLxYl` z6T)nW84OESMVM!zQClt_$4~6R6!7`{%r9bhrNn

YZ;yxP5C*tK&0T!HL5EjCq)#Unw@Kf@P@Ycg8#vVyf( zr#H(3^TyAv)xxp*P_SIaby%-p176YFq@F-k%rOt1$uQyBiii&l9f!-VzWa0ckemhq_GXe z4-|Ze{Q_Ckp9VZ5sc`T_vs|z~R5DgyDrCLD>2V#zAqgJ|^fwI9=VauJI1GnCk7zs^ z)`I>qfk2ukD&ruIC^(8^Y_2w2tBuFBG>pJQX16*r)S>?cTz+$Ub5miOsC=e=+U{Yy z@)Enzso>LY+YH~+wzcB8g3s{<_lz17amG-Aye>Ir#c=^&G+JIb!+`u!!B>Wa>|A0hePMu0$2eF#}_8Bd$R; zreh{<<{MF`?zgwP*%U>G78ftY?Y`>(PVX55WT%tapV zL2ulP0UVNHn2$2tkI{Gl6YwA=;$iOgC~m?+)G#jqUC+vSEYSfAoIIr?hZJqX%E?2M zSnaiOUE{S6*@z0&o1WBBS8zNL@3;~Z*c<$OK0G1yaQe?=*#X{kj*L%K6_vkqhO5-XfsvW3{`e&O04lZ%!tE?NUGhC zWlB6x+-lZ-flM!=Ctf1Q8WOCfxOEiQc0qCfr|n%V8%uFLk&pK%DJ{;BnHFcrG{ilR zRp*Nnoy;0}(Shpp85gR)Rf^Z&<}fyhrdYzN0b4 zJW<~><{)Yde!!13W)!0Mi90%pJuZNsaf;e1IEafGl*v8`znE`f4*0M5jUWr)F-Kb= RU=EM{4gv}MPBaVt_y^jX!=C^E diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/processor/ObjectReferenceCommandSet.class b/libjava/classpath/lib/gnu/classpath/jdwp/processor/ObjectReferenceCommandSet.class index 8004557e409925938c09e4abf9785b9829f403cc..093ff57353e201b6a1b990c18c7ac2e18bda0ca2 100644 GIT binary patch delta 1315 zcmZXT4NO&K7{~wb{pQ|t?>Qjn*1;7iVJ>h^B-$>vHJKkE=pw|#ksr)yH@N^kFsEk2(YZ{mO(ZwXAcjx#FD%FK9uG_2qt z-WG7h%$jguE z?_ZEPh*Jtq<8#v1nelQn-V%$L;mVrE7E@sAbf(XeC4re`*1?=K2|wY-`c`M+~S!6l5!PBqVsKk%0uf64)MniE$PjL8u-(Q8IS;qA){;F^{R-lH$b+qooJy^|u&8S5?!dQoU@dQ0j zaob6Rh`!J(_QC~?PrplM2J<@%PtG3f52fTJ zu(rUfd-q{`$Y(E5dY~FUU7_=xJ2xsqS9I^QWS|^|7Ca}#=xeoPG&jv5oDmDl>%0dQN$gvI>e4kl3ju|+?37upmr`V9w zD8>*c^983egjG0$dVGaOe9eiRMVxj!zQKB&!(;fCpWAoXj`Q#_^~*@*+64uE?v_=8 zMG#4=6lKIn!4||gRXYJX9%r%^IEb-taeN#+V{j+&yoFr9}yt5hM%aWI>?hPMKE0| zMlj>TM4tl011?bKB5w}MImT=`dTma|&;Jb>VaO$hj54G;55Fbw`ysd;J#g3y9J#t9 kfy)zD(pV{QnOCkL17o-WiFF>sRf&3|Yqux8BN5j2i#-xZ*ljuFnNKCE| zNmz`HGCsy90^YEZsMNz@BQ(5v3R47nnz}Rp*38|j=lvvX!e?%57U*IjnX6=f=@z&I za^uN(gAolq5Q$Vyjv0C=Zl!LO@ddsVP>g9tO)_CzMHZNAuFbm5JS%I(8H9hc>o>MM z6S@XI#_Y&a&CXtbHwo*oUB*`kvo^VpFcQgFv~qfbAz>$WyRl24YnotZZ*GN*J=n{{ zxRn@BMiN${Kwgg8#JxP zXh_u7M`_FBI3lA1-Hzx|_n8M|SLSFEVdi2f%ige+{rZZ7rqaSNw# zyM@a<;O*`d*|LyKr|)*Nhp$=;Fz5PCjUI|p3_}o)pg$hPKs<&AQGs$)VmPWWl7^1L zXpF}g=op7Ek*8n+8ZZ%YRAV}7FcSt|!6Yo?+KgJffjYFH!Q7Q=s*T9TRCqBBotS$E zX5cP7-8R$j7K5H;=sAX-hl&?*3uZI?5=!tg?qRw6@hS#j9tLwQ$7>|AfK(Qe#3Dj2 zCd6zOUedNXP$ceto2A}isTP)MWvLY?#7dOmUEGWJFa)bG6m3-W0Ts2Ac`G%1X!caw zoEu=rMzcd5BH0YMcpW%y_U%;K)a!kWC`_R$n5|`}Fm4^z1ttE^DD$YEwWtZo_A;dv zUQJe&!gg$^ctH`WqI#BIIhD>*RK@X3Gu)0=IP7IPYECm;?f6txoS9Rv=FnVPmL{=? zw;i7ceVR{`QrMQljwa2Q!oFaxwHyrkEjF4zg>QlZEq!*h9cD03%PUHuSqt#{-D*;| zLE?7~?&NnHJ=soAc0l7(>Vn-U=JPAXKHP`>^yDBreu%an##kIdh-(x_k-#xD^2sz! zuj4noiPLxsXRwU>75JUjp2ZrR!+QLMtvFAJ3oLh$6)wR; zDu>y8`U)8eS8F#E4@0DPk%>JF= zB)O?%HJMID7WK5^C+1~S)e`(nk`lEoBH?9(AIahQ6{iS3iZohyrV!vMQnz-qI83K0 zC5OU>QOX$-Siz|&`GcB#R8@%ONFtZox>Dhv@RO8AopA)HQ(^K-Ih@U~#IT3qzUJQiUVQ{o!m;W4;5dp@M@nR6uKDQ;gpb#9 ZQ6T*2ECOav?u@o diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/util/MethodResult.class b/libjava/classpath/lib/gnu/classpath/jdwp/util/MethodResult.class index 1e077c6a48cbe4223de597b92394e12c3afc506b..6ceb5fd9a1f23e187614f982501a3b587e52c64b 100644 GIT binary patch literal 785 zcmah{TT22_5dMyrOj|Q8yI(9K)S{)gpor-9k`sj?@6%;`a{eXT{ zG-nmcT8M=?GiT=eX6D=T@%i=+U=M3Cgcvp(wx=5w?{wN+HuYA$*Va90TKbicO{ZQK z9nX?6L>Q)8yvucq+YSAu))IzfNV-CLt}W_SZh3+sR|;V3s+{gu95AG0({+0GdEXFi zX*xDTw)9P0QAu921XYe5nzkvA820o3(FQUUstl1+r!Eo*BdH;dNrrH~P>q9@(GbO$ z@-iA?7^lHXrY)|$hnjFJY68lX9D`d`?wTqdUPffo>@aKvjr2!1+Cm#hbnmM`{YBrP z?hPT!qtb2U3qh2l;$;ZuOY~E}IYI_2n7DO3*AN$`+9v(;hwdr>)@l7Py@e2cq=xU2 z7IcOw6GwvV1Vwk0S9Pi4E41SF3pqP4NI&_2X|fqa$R3kDA=oJfgc6r6R^mI`@uw1QNosmtFTCC;QHcC z{9!D@As>6%PT+8F#6wq|mzQNZb0dbs!T&T)vh}HuXRB?ty1k6QB#h%tFzi^^K!rHb z8mHY|r>HiXRDPHbXlF$rjYw(SvS8v05lLf>xSLf;c}l3J`%u$NBHmunNJ3Wi?_1bJ zmGHWU6yM60PT+bBQV*k#|Ub!mwM)vJIR!;)=sB(#(T?vMYh`tQfhTchzc9Re^ zM_OxivT0|uZyf!=wXYghr?sLlpP)hC3Q7Ppu}wQe3vF6g$=}fVLO%_pxbhv$eG(Fb zKMNDLzK0KB+#4r#>t@c(IbUYxOMfxUkDu2!0DIUSn>q4~u8hya!Hp!$yR}w7ybb+9 zIPCiEPG3fGlaOWNZ%|D-C@&G_5~?@yPus_Lk-Uz3qoIis$~som168zDtf?p3H%h43 z*ubXxrjyJTYC2rb3(6B#+J=J#btUd8r9MSKqz*OLX(7kY*&wcIdxduHr!asUWIL+E%zd!-J$BfYmnO7p1a4%;V%?AFNyc5+ zNV;xhgEYWU)(0{O>*TcSDY05hZ)~<+S)5YqcG^?+CkhSAnwS0;ZYXd|kvk2j&Lv8$ V=%hMLT6(mAN1KkC!hv$b;UB&$DUSdE diff --git a/libjava/gnu/classpath/jdwp/VMVirtualMachine.java b/libjava/gnu/classpath/jdwp/VMVirtualMachine.java index 91e9965d0e2..4431e0f6a47 100644 --- a/libjava/gnu/classpath/jdwp/VMVirtualMachine.java +++ b/libjava/gnu/classpath/jdwp/VMVirtualMachine.java @@ -46,8 +46,8 @@ import gnu.classpath.jdwp.exception.InvalidMethodException; import gnu.classpath.jdwp.exception.JdwpException; import gnu.classpath.jdwp.util.MethodResult; import gnu.classpath.jdwp.util.MonitorInfo; +import gnu.classpath.jdwp.value.Value; -import java.lang.reflect.Method; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.Collection; @@ -296,21 +296,23 @@ public class VMVirtualMachine throws JdwpException; /** - * Executes a method in the virtual machine + * Executes a method in the virtual machine. The thread must already + * be suspended by a previous event. When the method invocation is + * complete, the thread (or all threads if INVOKE_SINGLE_THREADED is + * not set in options) must be suspended before this method returns. * * @param obj instance in which to invoke method (null for static) * @param thread the thread in which to invoke the method * @param clazz the class in which the method is defined * @param method the method to invoke * @param values arguments to pass to method - * @param nonVirtual "otherwise, normal virtual invoke - * (instance methods only) " + * @param options invocation options * @return a result object containing the results of the invocation */ public static native MethodResult executeMethod (Object obj, Thread thread, - Class clazz, Method method, - Object[] values, - boolean nonVirtual) + Class clazz, VMMethod method, + Value[] values, + int options) throws JdwpException; /** diff --git a/libjava/gnu/classpath/jdwp/natVMVirtualMachine.cc b/libjava/gnu/classpath/jdwp/natVMVirtualMachine.cc index db33781378e..ba123539e17 100644 --- a/libjava/gnu/classpath/jdwp/natVMVirtualMachine.cc +++ b/libjava/gnu/classpath/jdwp/natVMVirtualMachine.cc @@ -695,9 +695,9 @@ getLoadRequests (MAYBE_UNUSED ClassLoader *cl) MethodResult * gnu::classpath::jdwp::VMVirtualMachine:: executeMethod (MAYBE_UNUSED jobject obj, MAYBE_UNUSED Thread *thread, - MAYBE_UNUSED jclass clazz, MAYBE_UNUSED reflect::Method *method, - MAYBE_UNUSED jobjectArray values, - MAYBE_UNUSED jboolean nonVirtual) + MAYBE_UNUSED jclass clazz, MAYBE_UNUSED VMMethod *method, + MAYBE_UNUSED JArray *values, + MAYBE_UNUSED jint options) { return NULL; } -- 2.30.2