Factor out debug session management.

Also, replace the stub implementation of step forwards/backwards with
a real one.

Author: whitequark

src/cxxrtl/proto.ts

@@ -101,6 +101,10 @@ export type ScopeDescriptionModule = {
 export type ScopeDescription =
 | ScopeDescriptionModule;
 
+export type ScopeDescriptionMap = {
+    [identifier: string]: ScopeDescription
+};
+
 export type CommandListScopes = {
     type: 'command';
     command: 'list_scopes';
@@ -109,9 +113,7 @@ export type CommandListScopes = {
 export type ResponseListScopes = {
     type: 'response';
     command: 'list_scopes';
-    scopes: {
-        [identifier: string]: ScopeDescription;
-    };
+    scopes: ScopeDescriptionMap;
 };
 
 // ## Command: List Items
@@ -142,6 +144,10 @@ export type ItemDescription =
 | ItemDescriptionNode
 | ItemDescriptionMemory;
 
+export type ItemDescriptionMap = {
+    [identifier: string]: ItemDescription
+};
+
 export type CommandListItems = {
     type: 'command';
     command: 'list_items';
@@ -151,9 +157,7 @@ export type CommandListItems = {
 export type ResponseListItems = {
     type: 'response';
     command: 'list_items';
-    items: {
-        [identifier: string]: ItemDescription;
-    };
+    items: ItemDescriptionMap;
 };
 
 // ## Command: Reference Items
@@ -201,8 +205,8 @@ export type CommandQueryInterval = {
     command: 'query_interval';
     interval: [TimePoint, TimePoint];
     collapse: boolean;
-    items: string;
-    item_values_encoding: string;
+    items: string | null;
+    item_values_encoding: string | null;
     diagnostics: boolean;
 };
 

src/observer.ts renamed to src/debug/observer.ts

@@ -1,8 +1,8 @@
 import * as vscode from 'vscode';
 
-import { UnboundReference, Designation, Reference } from './model/sample';
-import { CXXRTLDebugger } from './debugger';
-import { TimeInterval } from './model/time';
+import { UnboundReference, Designation, Reference } from '../model/sample';
+import { TimeInterval } from '../model/time';
+import { Session } from './session';
 
 class Observable<T> {
     private callbacks: ((value: T) => void)[] = [];
@@ -42,14 +42,15 @@ export class Observer {
     private subscription: vscode.Disposable;
 
     constructor(
-        private rtlDebugger: CXXRTLDebugger,
+        private session: Session,
         private referenceName: string,
     ) {
-        this.subscription = rtlDebugger.onDidChangeCurrentTime((_time) =>
+        this.subscription = this.session.onDidChangeTimeCursor((_time) =>
             this.invalidate());
     }
 
     dispose() {
+        this.observables.clear();
         this.subscription.dispose();
     }
 
@@ -84,11 +85,11 @@ export class Observer {
                 for (const observable of this.observables.values()) {
                     unboundReference.add(observable.designation);
                 }
-                this.reference = this.rtlDebugger.bindReference(this.referenceName, unboundReference);
+                this.reference = this.session.bindReference(this.referenceName, unboundReference);
             }
-            const interval = new TimeInterval(this.rtlDebugger.currentTime, this.rtlDebugger.currentTime);
+            const interval = new TimeInterval(this.session.timeCursor, this.session.timeCursor);
             const reference = this.reference; // could get invalidated in the meantime
-            const [sample] = await this.rtlDebugger.queryInterval(interval, reference);
+            const [sample] = await this.session.queryInterval(interval, reference);
             for (const [designation, handle] of reference.allHandles()) {
                 const observable = this.observables.get(designation.canonicalKey)!;
                 observable.update(sample.extract(handle));