Changes so that breakpoint cmdlets return the breakpiont id.

Author: Your Name

src/breakpoints/bp.ts

@@ -37,6 +37,10 @@ export abstract class Bp {
   public conditions: string[] = [];
   public commands: string[] = [];
 
+  public static idToVar(id: number): Var {
+    return new Var(uint64(id.toString()), `#${id}`);
+  }
+
   protected constructor(
     index: number,
     address: Var | null,

src/breakpoints/regs.ts

@@ -1,4 +1,5 @@
 import { Var } from '../vars/var.js';
+import { Bp } from './bp.js';
 
 enum PseudoRegNames {
   TID = 'tid',
@@ -57,10 +58,7 @@ export class Regs {
   }
 
   public static setBreakpointId(breakpointId: number) {
-    this.pseudoRegs[PseudoRegNames.BP] = new Var(
-      uint64(breakpointId.toString()),
-      `#${breakpointId}`,
-    );
+    this.pseudoRegs[PseudoRegNames.BP] = Bp.idToVar(breakpointId);
   }
 
   public static get(name: string): Var {

src/breakpoints/replace.ts

@@ -46,6 +46,10 @@ export class BpReplacement extends Bp {
     const idxString = Output.green(`#${this.index.toString()}.`.padEnd(4, ' '));
     const targetString = `target: ${Output.blue(this.target.getLiteral())}`;
     const addressString = `address: ${Output.blue(this.literal)}`;
-    return `${idxString} ${addressString} -> ${targetString}`;
+    let tranmpolineString = '';
+    if (this.trampoline !== null) {
+      tranmpolineString = `trampoline: ${Output.blue(Format.toHexString(this.trampoline.toPointer()))}`;
+    }
+    return `${idxString} ${addressString} -> ${targetString} [${tranmpolineString}]`;
   }
 }

src/cmdlets/breakpoints/code.ts

@@ -1,4 +1,4 @@
-import { BpType } from '../../breakpoints/bp.js';
+import { Bp, BpType } from '../../breakpoints/bp.js';
 import { Bps } from '../../breakpoints/bps.js';
 import {
   BpCodeInstruction,
@@ -52,7 +52,7 @@ abstract class CodeBpCmdLet extends TypedBpCmdLet {
         throw new Error(`unexpected breakpoint type: ${this.bpType}`);
     }
 
-    return addr;
+    return Bp.idToVar(idx);
   }
 
   protected runModify(tokens: Token[]): Var | null {
@@ -81,7 +81,7 @@ abstract class CodeBpCmdLet extends TypedBpCmdLet {
     Output.writeln(`Modified ${bp.toString()}`);
     this.editBreakpoint(bp, conditional);
 
-    return addr ?? Var.ZERO;
+    return Bp.idToVar(index);
   }
 
   protected override usageCreate(): string {

src/cmdlets/breakpoints/mem.ts

@@ -1,4 +1,4 @@
-import { BpType } from '../../breakpoints/bp.js';
+import { Bp, BpType } from '../../breakpoints/bp.js';
 import { Bps } from '../../breakpoints/bps.js';
 import { BpReadMemory, BpWriteMemory } from '../../breakpoints/memory.js';
 import { CmdLetBase } from '../../commands/cmdlet.js';
@@ -46,7 +46,7 @@ abstract class MemoryBpCmdLet extends TypedBpCmdLet {
         throw new Error(`unexpected breakpoint type: ${this.bpType}`);
     }
 
-    return addr ?? Var.ZERO;
+    return Bp.idToVar(idx);
   }
 
   protected runModify(tokens: Token[]): Var | null {
@@ -75,7 +75,7 @@ abstract class MemoryBpCmdLet extends TypedBpCmdLet {
     Output.writeln(`Modified ${bp.toString()}`);
     this.editBreakpoint(bp, conditional);
 
-    return addr ?? Var.ZERO;
+    return Bp.idToVar(index);
   }
 
   protected override usageCreate(): string {

src/cmdlets/breakpoints/replace.ts

@@ -1,7 +1,7 @@
 import { Token } from '../../io/token.js';
 import { Var } from '../../vars/var.js';
 import { TypedBpCmdLet } from './bp.js';
-import { BpType } from '../../breakpoints/bp.js';
+import { Bp, BpType } from '../../breakpoints/bp.js';
 import { Bps } from '../../breakpoints/bps.js';
 import { BpReplacement } from '../../breakpoints/replace.js';
 import { Output } from '../../io/output.js';
@@ -20,16 +20,28 @@ export class ReplaceCmdLet extends TypedBpCmdLet {
       const index = Bps.getNextFreeIndex(this.bpType);
       const bp = new BpReplacement(index, address, target);
       Bps.add(bp);
-      Output.writeln(`Created ${bp.toString()}`);
       bp.enable();
-      return bp.trampoline;
+      Output.writeln(`Created ${bp.toString()}`);
+      return Bp.idToVar(index);
     } catch (error) {
       throw new Error(`failed to replace ${address} with ${target}, ${error}`);
     }
   }
 
-  protected override runModify(_tokens: Token[]): Var | null {
-    return null;
+  /*
+   * This function doesn't actually modify the breakpoint, but rather since it
+   * is called berfore runShow in the parent it allows us to match those same
+   * arguments and overload it to return the trampoline address in the event
+   * that a breakpoint id was specified.
+   */
+  protected override runModify(tokens: Token[]): Var | null {
+    const vars = this.transform(tokens, [this.parseIndex]);
+    if (vars === null) return null;
+    const [index] = vars as [number];
+    const bp = Bps.get(this.bpType, index) as BpReplacement;
+    if (bp === null) throw new Error(`breakpoint #${index} doesn't exist`);
+    Output.writeln(bp.toString());
+    return bp.trampoline;
   }
 
   protected override usageCreate(): string {

src/cmdlets/breakpoints/trace.ts

@@ -1,4 +1,4 @@
-import { BpType } from '../../breakpoints/bp.js';
+import { Bp, BpType } from '../../breakpoints/bp.js';
 import { Bps } from '../../breakpoints/bps.js';
 import {
   BpBlockTrace,
@@ -68,7 +68,7 @@ abstract class TraceBpCmdLet extends TypedBpCmdLet {
         throw new Error(`unexpected breakpoint type: ${this.bpType}`);
     }
 
-    return addr ?? Var.ZERO;
+    return Bp.idToVar(idx);
   }
 
   protected runModify(tokens: Token[]): Var | null {
@@ -100,7 +100,7 @@ abstract class TraceBpCmdLet extends TypedBpCmdLet {
     Output.writeln(`Modified ${bp.toString()}`);
     this.editBreakpoint(bp, conditional);
 
-    return addr ?? Var.ZERO;
+    return Bp.idToVar(index);
   }
 
   protected override usageCreate(): string {