Skip to content
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

Enhancing ImageAndSymbols to load several binaries #321

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

Enhancing ImageAndSymbols to load several binaries #321

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
37 changes: 33 additions & 4 deletions src/GDBTargetDebugSession.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,26 +79,40 @@ export interface TargetLaunchArguments extends TargetAttachArguments {
cwd?: string;
}

export interface ImageAndSymbolArguments {
export interface SymbolFileAndOffset {
// If specified, a symbol file to load at the given (optional) offset
file: string;
offset?: string;
}

export interface ImageFileAndOffset {
// If specified, an image file to load at the given (optional) offset
file: string;
offset?: string;
}

export interface ImageAndSymbolsArguments {
symbolFilesAndOffset?: SymbolFileAndOffset[];
imageFilesAndOffset?: ImageFileAndOffset[];
// Deprecated, use symbolFilesAndOffset instead. If specified, a symbol file to load at the given (optional) offset
symbolFileName?: string;
symbolOffset?: string;
// If specified, an image file to load at the given (optional) offset
// Deprecated, use imageFilesAndOffset instead. If specified, an image file to load at the given (optional) offset
imageFileName?: string;
imageOffset?: string;
}

export interface TargetAttachRequestArguments extends RequestArguments {
target?: TargetAttachArguments;
imageAndSymbols?: ImageAndSymbolArguments;
imageAndSymbols?: ImageAndSymbolsArguments;
// Optional commands to issue between loading image and resuming target
preRunCommands?: string[];
}

export interface TargetLaunchRequestArguments
extends TargetAttachRequestArguments {
target?: TargetLaunchArguments;
imageAndSymbols?: ImageAndSymbolArguments;
imageAndSymbols?: ImageAndSymbolsArguments;
// Optional commands to issue between loading image and resuming target
preRunCommands?: string[];
}
Expand Down Expand Up @@ -453,6 +467,7 @@ export class GDBTargetDebugSession extends GDBDebugSession {
await this.gdb.sendEnablePrettyPrint();
if (args.imageAndSymbols) {
if (args.imageAndSymbols.symbolFileName) {
// Deprecated
if (args.imageAndSymbols.symbolOffset) {
await this.gdb.sendAddSymbolFile(
args.imageAndSymbols.symbolFileName,
Expand All @@ -463,6 +478,13 @@ export class GDBTargetDebugSession extends GDBDebugSession {
args.imageAndSymbols.symbolFileName
);
}
} else {
const symFiles: SymbolFileAndOffset[] =
args.imageAndSymbols.symbolFilesAndOffset ?? [];
for (const symF of symFiles) {
const offset: string = symF.offset ? symF.offset : '';
await this.gdb.sendAddSymbolFile(symF.file, offset);
}
}
}

Expand Down Expand Up @@ -511,10 +533,17 @@ export class GDBTargetDebugSession extends GDBDebugSession {

if (args.imageAndSymbols) {
if (args.imageAndSymbols.imageFileName) {
// Deprecated
await this.gdb.sendLoad(
args.imageAndSymbols.imageFileName,
args.imageAndSymbols.imageOffset
);
} else {
const imgFiles: ImageFileAndOffset[] =
args.imageAndSymbols.imageFilesAndOffset ?? [];
for (const imgF of imgFiles) {
await this.gdb.sendLoad(imgF.file, imgF.offset);
}
}
}
await this.gdb.sendCommands(args.preRunCommands);
Expand Down