More JDWP robustness.
We pass a lot more JDWP tests with this (fewer total failures than dalvik,
because although dalvik implements more requests, it assumes that the debuggers
only send it valid input).
I've also added some of the missing constants (there are tests of modifier 12,
SourceNameMatch, which was added in Java 6).
Change-Id: I502e87b50fb305c5c8b061421339c8ceab104640
diff --git a/src/jdwp/jdwp_event.cc b/src/jdwp/jdwp_event.cc
index 22d3c24..a405c9b 100644
--- a/src/jdwp/jdwp_event.cc
+++ b/src/jdwp/jdwp_event.cc
@@ -128,7 +128,7 @@
for (int i = 0; i < pEvent->modCount; i++) {
const JdwpEventMod* pMod = &pEvent->mods[i];
- LOG(INFO) << " " << static_cast<JdwpModKind>(pMod->modKind);
+ LOG(INFO) << " " << pMod->modKind;
/* TODO - show details */
}
}
@@ -451,8 +451,7 @@
}
break;
default:
- LOG(ERROR) << "unhandled mod kind " << pMod->modKind;
- CHECK(false);
+ LOG(FATAL) << "unknown mod kind " << pMod->modKind;
break;
}
}
@@ -544,7 +543,6 @@
SetWaitForEventThread(Dbg::GetThreadSelfId());
/* leave pReq->invoke_needed_ raised so we can check reentrancy */
- LOG(VERBOSE) << "invoking method...";
Dbg::ExecuteMethod(pReq);
pReq->error = ERR_NONE;