commit a2e54f61453a2072181d5dd7aa2d5e845f5b53f6
author Elliott Hughes <enh@google.com> Thu Nov 17 13:01:30 2011 -0800
committer Elliott Hughes <enh@google.com> Thu Nov 17 13:01:30 2011 -0800
tree 4ca063dd40b4c246097aa31d4d79ddf14d0420a7
parent 761928d24e4e7ed7776b52243eaf9095ad35f448

More debugger support.

This lets you attach jdb. Quitting will let your program run to completion.
This also fixes the "class", "fields", and "methods" commands.

Change-Id: I6645f52dd8b5847454a553c31c80a2f5bf8f1000

src/debugger.h

diff --git a/src/debugger.h b/src/debugger.h
index c2e8661..ca1d2a0 100644
--- a/src/debugger.h
+++ b/src/debugger.h
@@ -137,7 +137,7 @@
   static bool FindLoadedClassBySignature(const char* classDescriptor, JDWP::RefTypeId* pRefTypeId);
   static void GetObjectType(JDWP::ObjectId objectId, uint8_t* pRefTypeTag, JDWP::RefTypeId* pRefTypeId);
   static uint8_t GetClassObjectType(JDWP::RefTypeId refTypeId);
-  static const char* GetSignature(JDWP::RefTypeId refTypeId);
+  static std::string GetSignature(JDWP::RefTypeId refTypeId);
   static const char* GetSourceFile(JDWP::RefTypeId refTypeId);
   static const char* GetObjectTypeName(JDWP::ObjectId objectId);
   static uint8_t GetObjectTag(JDWP::ObjectId objectId);
@@ -158,9 +158,9 @@
    * Method and Field
    */
   static const char* GetMethodName(JDWP::RefTypeId refTypeId, JDWP::MethodId id);
-  static void OutputAllFields(JDWP::RefTypeId refTypeId, bool withGeneric, JDWP::ExpandBuf* pReply);
-  static void OutputAllMethods(JDWP::RefTypeId refTypeId, bool withGeneric, JDWP::ExpandBuf* pReply);
-  static void OutputAllInterfaces(JDWP::RefTypeId refTypeId, JDWP::ExpandBuf* pReply);
+  static void OutputDeclaredFields(JDWP::RefTypeId refTypeId, bool withGeneric, JDWP::ExpandBuf* pReply);
+  static void OutputDeclaredMethods(JDWP::RefTypeId refTypeId, bool withGeneric, JDWP::ExpandBuf* pReply);
+  static void OutputDeclaredInterfaces(JDWP::RefTypeId refTypeId, JDWP::ExpandBuf* pReply);
   static void OutputLineTable(JDWP::RefTypeId refTypeId, JDWP::MethodId methodId, JDWP::ExpandBuf* pReply);
   static void OutputVariableTable(JDWP::RefTypeId refTypeId, JDWP::MethodId id, bool withGeneric, JDWP::ExpandBuf* pReply);
 
@@ -176,7 +176,7 @@
   /*
    * Thread, ThreadGroup, Frame
    */
-  static char* GetThreadName(JDWP::ObjectId threadId);
+  static bool GetThreadName(JDWP::ObjectId threadId, std::string& name);
   static JDWP::ObjectId GetThreadGroup(JDWP::ObjectId threadId);
   static char* GetThreadGroupName(JDWP::ObjectId threadGroupId);
   static JDWP::ObjectId GetThreadGroupParent(JDWP::ObjectId threadGroupId);