Improve -verbose:jdwp.
Move toward automated logging instead of ad hoc logging in every command.
Change-Id: I55427022374390745209677bae4e0b3146a9d126
diff --git a/src/jdwp/jdwp.h b/src/jdwp/jdwp.h
index d8e5981..6cac0f6 100644
--- a/src/jdwp/jdwp.h
+++ b/src/jdwp/jdwp.h
@@ -47,17 +47,8 @@
typedef uint64_t RefTypeId; /* like ObjectID, but unique for Class objects */
typedef uint64_t FrameId; /* short-lived stack frame ID */
-/*
- * Match these with the type sizes. This way we don't have to pass
- * a value and a length.
- */
-static inline FieldId ReadFieldId(const uint8_t** pBuf) { return Read4BE(pBuf); }
-static inline MethodId ReadMethodId(const uint8_t** pBuf) { return Read4BE(pBuf); }
-static inline ObjectId ReadObjectId(const uint8_t** pBuf) { return Read8BE(pBuf); }
-static inline RefTypeId ReadRefTypeId(const uint8_t** pBuf) { return Read8BE(pBuf); }
-static inline FrameId ReadFrameId(const uint8_t** pBuf) { return Read8BE(pBuf); }
-static inline JdwpTag ReadTag(const uint8_t** pBuf) { return static_cast<JdwpTag>(Read1(pBuf)); }
-static inline JdwpTypeTag ReadTypeTag(const uint8_t** pBuf) { return static_cast<JdwpTypeTag>(Read1(pBuf)); }
+ObjectId ReadObjectId(const uint8_t** pBuf);
+
static inline void SetFieldId(uint8_t* buf, FieldId val) { return Set4BE(buf, val); }
static inline void SetMethodId(uint8_t* buf, MethodId val) { return Set4BE(buf, val); }
static inline void SetObjectId(uint8_t* buf, ObjectId val) { return Set8BE(buf, val); }