Fix the remaining GetValues/SetValues tests.
Add some missing checks and weaken some others. I'd like to strengthen these up at some
point, but for now let's just pass the tests. The JDWP so-called specification is typically
useless about what should/shouldn't be allowed.
Change-Id: Ia7390e0f18c4ac4a1697feac3d418767bdf7ebef
diff --git a/src/jdwp/jdwp_event.cc b/src/jdwp/jdwp_event.cc
index b92884f..6476c3c 100644
--- a/src/jdwp/jdwp_event.cc
+++ b/src/jdwp/jdwp_event.cc
@@ -839,7 +839,7 @@
if (match_count != 0) {
VLOG(jdwp) << "EVENT: " << matchList[0]->eventKind << "(" << match_count << " total) "
- << "thread=" << (void*) basket.threadId << ")";
+ << StringPrintf("thread=%#llx", basket.threadId) << ")";
suspendPolicy = scanSuspendPolicy(matchList, match_count);
VLOG(jdwp) << " suspendPolicy=" << suspendPolicy;
@@ -932,8 +932,8 @@
FindMatchingEvents(EK_EXCEPTION, &basket, matchList, &match_count);
if (match_count != 0) {
VLOG(jdwp) << "EVENT: " << matchList[0]->eventKind << "(" << match_count << " total)"
- << " thread=" << (void*) basket.threadId
- << " exceptId=" << (void*) exceptionId
+ << StringPrintf(" thread=%#llx", basket.threadId)
+ << StringPrintf(" exceptId=%#llx", exceptionId)
<< " caught=" << basket.caught << ")"
<< " throw: " << *pThrowLoc;
if (pCatchLoc->classId == 0) {
@@ -1012,7 +1012,7 @@
FindMatchingEvents(EK_CLASS_PREPARE, &basket, matchList, &match_count);
if (match_count != 0) {
VLOG(jdwp) << "EVENT: " << matchList[0]->eventKind << "(" << match_count << " total) "
- << "thread=" << (void*) basket.threadId << ") " << signature;
+ << StringPrintf("thread=%#llx", basket.threadId) << ") " << signature;
suspendPolicy = scanSuspendPolicy(matchList, match_count);
VLOG(jdwp) << " suspendPolicy=" << suspendPolicy;