[WIP] tracer: Show contextual disassembly

agents/tracer/agent.ts

@@ -1,3 +1,5 @@
+const MAX_HANDLERS_PER_REQUEST = 1000;
+
 class Agent {
     private handlers = new Map<TraceTargetId, TraceHandler>();
     private stagedPlanRequest: TracePlanRequest | null = null;
@@ -34,6 +36,8 @@ class Agent {
                 message: e.message
             });
         });
+
+        return Process.mainModule;
     }
 
     dispose() {
@@ -98,6 +102,14 @@ class Agent {
         return [...nativeIds, ...javaIds];
     }
 
+    readMemory(address: string, size: number): ArrayBuffer | null {
+        try {
+            return ptr(address).readByteArray(size);
+        } catch (e) {
+            return null;
+        }
+    }
+
     private cropStagedPlan(plan: TracePlan, id: StagedItemId): TracePlan {
         let candidateId: StagedItemId;
 
@@ -307,7 +319,8 @@ class Agent {
         for (const [name, items] of groups.entries()) {
             scopes.push({
                 name,
-                members: items.map(item => item[0])
+                members: items.map(item => item[0]),
+                addresses: items.map(item => item[1].toString()),
             });
             this.nextId += items.length;
         }
@@ -727,10 +740,11 @@ async function getHandlers(request: HandlerRequest): Promise<HandlerResponse> {
 
     const { type, flavor, baseId } = request;
 
-    const pendingScopes = request.scopes.slice().map(({ name, members }) => {
+    const pendingScopes = request.scopes.slice().map(({ name, members, addresses }) => {
         return {
             name,
-            members: members.slice()
+            members: members.slice(),
+            addresses: addresses?.slice(),
         };
     });
     let id = baseId;
@@ -744,29 +758,17 @@ async function getHandlers(request: HandlerRequest): Promise<HandlerResponse> {
         };
 
         let size = 0;
-        for (const { name, members: pendingMembers } of pendingScopes) {
-            const curMembers: MemberName[] = [];
+        for (const { name, members: pendingMembers, addresses: pendingAddresses } of pendingScopes) {
+            const n = Math.min(pendingMembers.length, MAX_HANDLERS_PER_REQUEST - size);
+            if (n === 0) {
+                break;
+            }
             curScopes.push({
                 name,
-                members: curMembers
+                members: pendingMembers.splice(0, n),
+                addresses: pendingAddresses?.splice(0, n),
             });
-
-            let exhausted = false;
-            for (const member of pendingMembers) {
-                curMembers.push(member);
-
-                size++;
-                if (size === 1000) {
-                    exhausted = true;
-                    break;
-                }
-            }
-
-            pendingMembers.splice(0, curMembers.length);
-
-            if (exhausted) {
-                break;
-            }
+            size += n;
         }
 
         while (pendingScopes.length !== 0 && pendingScopes[0].members.length === 0) {
@@ -965,6 +967,7 @@ interface HandlerRequest {
 interface HandlerRequestScope {
     name: string;
     members: MemberName[];
+    addresses?: string[];
 }
 interface HandlerResponse {
     scripts: HandlerScript[];
@@ -993,5 +996,6 @@ rpc.exports = {
     dispose: agent.dispose.bind(agent),
     update: agent.update.bind(agent),
     stageTargets: agent.stageTargets.bind(agent),
-    commitTargets: agent.commitTargets.bind(agent,)
+    commitTargets: agent.commitTargets.bind(agent),
+    readMemory: agent.readMemory.bind(agent),
 };

apps/tracer/src/App.css

@@ -30,20 +30,49 @@
     padding: 5px;
 }
 
-.work-area {
+.editor-area {
     display: flex;
     flex: 1;
     flex-direction: column;
 }
 
-.work-area section {
+.editor-area section {
     flex: 1;
 }
 
+.editor-area .bp5-button:focus {
+    outline: 0;
+}
+
 .monaco-editor {
     position: absolute !important;
 }
 
+.bottom-tabs {
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+}
+
+.bottom-tabs .bp5-tab-list {
+    padding-left: 5px;
+}
+
+.bottom-tabs .bp5-tab:focus {
+    outline: 0;
+}
+
+.bottom-tab-panel {
+    display: flex;
+    margin-top: 5px;
+    flex: 1;
+    overflow: hidden;
+}
+
 .event-view {
     flex: 1;
 }
+
+.disassembly-view {
+    flex: 1;
+}