Skip to content

Add full Child DAP type & new Memory Read for Memory Inspector #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
WyoTwT wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add full Child DAP type & new Memory Read for Memory Inspector #20

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 50 additions & 0 deletions src/AmalgamatorSession.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,21 @@ export interface ChildDapContents {
children?: string[];
}

export interface ChildDapFull {
children?: {
name: string;
id: number;
}[];
}

export interface ChildDapResponse extends Response {
body: ChildDapContents;
}

export interface ChildDapFullResponse extends Response {
body: ChildDapFull;
}

export class StoppedEvent extends Event implements DebugProtocol.StoppedEvent {
public body: {
reason: string;
Expand Down Expand Up @@ -689,6 +700,16 @@ export class AmalgamatorSession extends LoggingDebugSession {
children: this.childDapNames,
} as ChildDapContents;
this.sendResponse(response);
} else if (command === 'cdt-amalgamator/getChildDaps') {
const fullDapResponse = response as ChildDapFullResponse;
const [, threads] = await this.collectChildTheads();
fullDapResponse.body = {
children: threads.map((child) => ({
name: child.name,
id: child.id,
})),
};
this.sendResponse(fullDapResponse);
} else if (command === 'cdt-amalgamator/Memory') {
if (typeof args.address !== 'string') {
throw new Error(
Expand All @@ -710,6 +731,35 @@ export class AmalgamatorSession extends LoggingDebugSession {
].customRequest('cdt-gdb-adapter/Memory', args);
response.body = childResponse.body;
this.sendResponse(response);
} else if (command === 'cdt-amalgamator/readMemory') {
try {
const childThreadID = args.child?.id;
if (typeof childThreadID !== 'number') {
throw new Error(
`Invalid type for 'child.id', expected number, got ${typeof childThreadID}`
);
}
// Convert from ThreadID to Child array index.
const [childIndex,] = await this.getThreadInfo(
childThreadID
);
if (typeof childIndex === 'undefined' || childIndex >= this.childDaps.length) {
throw new Error(
`Invalid value for 'child.id' or out of bounds [${childIndex}]`
);
}
const childResponse = await this.childDaps[
childIndex
].customRequest('readMemory', args);
response.body = childResponse.body;
this.sendResponse(response);
} catch (err) {
this.sendErrorResponse(
response,
1,
err instanceof Error ? err.message : String(err)
);
}
} else if (
command === 'cdt-amalgamator/resumeAll' ||
command === 'cdt-amalgamator/suspendAll'
Expand Down