1. support new debugger eclipse-cdt.cdt-gdb-vscode.

github0null · github0null · commit 2e266d280788 · 2026-03-30T01:52:46.000+08:00
2. remove axf2elf.
diff --git a/res/data/openocd-helpers.tcl b/res/data/openocd-helpers.tcl
@@ -0,0 +1,66 @@
+#
+# Cortex-Debug extension calls this function during initialization. You can copy this
+# file, modify it and specifyy it as one of the config files supplied in launch.json
+# preferably at the beginning.
+#
+# Note that this file simply defines a function for use later when it is time to configure
+# for SWO.
+#
+set USE_SWO 0
+proc CDSWOConfigure { CDCPUFreqHz CDSWOFreqHz CDSWOOutput } {    
+    # We don't create/configure the entire TPIU which requires advanced knowledge of the device
+    # like which DAP/AP ports to use, what their bases addresses are, etc. That should already
+    # be done by the config files from the Silicon Vendor
+    catch {tpiu init}; # we are allowed to call this multiple times. So, call it just in case
+    set tipu_names [tpiu names]
+    if { [llength $tipu_names] == 0 } {
+        puts stderr "[info script]: Error: Could not find TPIU/SWO names. Perhaps it hasn't been created?"
+    } else {
+        set mytpiu [lindex $tipu_names 0]
+        # We don't create/configure the entire TPIU which requires advanced knowledge of the device
+        # like which DAP/AP ports to use, what their bases addresses are, etc. That should already
+        # be done by the config files from the Silicon Vendor
+        puts "[info script]: $mytpiu configure -protocol uart -output $CDSWOOutput -traceclk $CDCPUFreqHz -pin-freq $CDSWOFreqHz"
+        $mytpiu configure -protocol uart -output $CDSWOOutput -traceclk $CDCPUFreqHz -pin-freq $CDSWOFreqHz
+        $mytpiu enable
+    }
+}
+
+#
+# The following function may not work in a multi-core setup. You may want to overide this function
+# to enable RTOS detection for each core appropriately. This function must be called before `init` and
+# after all the targets are created.
+#
+proc CDRTOSConfigure { rtos } {
+    set target [target current]
+    if { $target != "" } {
+        puts "[info script]: $target configure -rtos $rtos"
+        $target configure -rtos $rtos
+    } else {
+        # Maybe this function was called too early?
+        puts stderr "[info script]: Error: No current target. Could not configure target for RTOS"
+    }
+}
+
+#
+# CDLiveWatchSetup
+#    This function must be called before the init is called and after all the targets are created. You can create
+#    a custom version of this function (even empty) if you already setup the gdb-max-connections elsewhere
+#
+#    We increment all gdb-max-connections by one if it is already a non-zero. Note that if it was already set to -1,
+#    we leave it alone as it means unlimited connections
+#
+proc CDLiveWatchSetup {} {
+    try {
+        foreach tgt [target names] {
+            set nConn [$tgt cget -gdb-max-connections]
+            if { $nConn > 0 } {
+                incr nConn
+                $tgt configure -gdb-max-connections $nConn
+                puts "[info script]: Info: Setting gdb-max-connections for target '$tgt' to $nConn"
+            }
+        }
+    } on error {} {
+        puts stderr "[info script]: Error: Failed to increase gdb-max-connections for current target. Live variables will not work"
+    }
+}
diff --git a/src/CodeBuilder.ts b/src/CodeBuilder.ts
@@ -1126,17 +1126,18 @@ export class ARMCodeBuilder extends CodeBuilder {
 
             const extraCommands: any[] = [];
 
+            //! deprecated. 现在我们可以通过在调试配置中设置 'loadFiles' 和 'symbolFiles' 来实现同样效果
             // convert axf to elf
             // why we need this ? see: https://stackoverflow.com/questions/49508277/warning-loadable-section-my-section-outside-of-elf-segments
-            if (['AC5', 'AC6'].includes(config.toolchain) &&
-                settingManager.IsConvertAxf2Elf() &&
-                options['linker']['$disableOutputTask'] != true) {
-                const axf2elf_log = `\${OutDir}/axf2elf.log`;
-                extraCommands.push({
-                    name: 'axf to elf',
-                    command: `axf2elf -d "\${ToolchainRoot}" -i "\${OutDir}/\${ProjectName}.axf" -o "\${OutDir}/\${ProjectName}.elf" > "${axf2elf_log}"`
-                });
-            }
+            // if (['AC5', 'AC6'].includes(config.toolchain) &&
+            //     settingManager.IsConvertAxf2Elf() &&
+            //     options['linker']['$disableOutputTask'] != true) {
+            //     const axf2elf_log = `\${OutDir}/axf2elf.log`;
+            //     extraCommands.push({
+            //         name: 'axf to elf',
+            //         command: `axf2elf -d "\${ToolchainRoot}" -i "\${OutDir}/\${ProjectName}.axf" -o "\${OutDir}/\${ProjectName}.elf" > "${axf2elf_log}"`
+            //     });
+            // }
 
             // insert command lines
             if (settingManager.isInsertCommandsAtBegin()) {
diff --git a/src/EIDEProject.ts b/src/EIDEProject.ts
@@ -1541,6 +1541,11 @@ export abstract class AbstractProject implements CustomConfigurationProvider, Pr
 
     //////////////////////// project targets //////////////////////////
 
+    getTargetInfo(): ProjectTargetInfo {
+        const prjConfig = this.GetConfiguration<any>().config;
+        return prjConfig.targets[prjConfig.mode];
+    }
+
     getCurrentTarget(): string {
         return this.GetConfiguration().config.mode;
     }
diff --git a/src/EIDEProjectExplorer.ts b/src/EIDEProjectExplorer.ts
@@ -90,7 +90,8 @@ import {
     view_str$prompt$filesOptionsComment,
     view_str$virual_doc_provider_banner,
     view_str$missed_stubs_added,
-    view_str$keil_export_path_warning
+    view_str$keil_export_path_warning,
+    view_str$settings$debugger
 } from './StringTable';
 import { CodeBuilder, BuildOptions } from './CodeBuilder';
 import { ExceptionToMessage, newMessage } from './Message';
@@ -113,7 +114,8 @@ import {
     pyocd_getTargetList,
     generateDotnetProgramCmd,
     isGccFamilyToolchain,
-    cxxDemangle
+    cxxDemangle,
+    DEBUGGER_MAPS
 } from './utility';
 import { concatSystemEnvPath, DeleteDir, exeSuffix, kill, osType, DeleteAllChildren, userhome, getGlobalState } from './Platform';
 import { KeilARMOption, KeilC51Option, KeilParser, KeilRteDependence } from './KeilXmlParser';
@@ -1372,6 +1374,16 @@ class ProjectDataProvider implements vscode.TreeDataProvider<ProjTreeItem>, vsco
                             projectIndex: element.val.projectIndex
                         }));
 
+                        // setting: debugger
+                        const debuggerId = project.getTargetInfo().settings.debugger || 'unknown';
+                        iList.push(new ProjTreeItem(TreeItemType.SETTINGS_ITEM, {
+                            key: 'debugger',
+                            value: DEBUGGER_MAPS[debuggerId].name,
+                            keyAlias: view_str$settings$debugger,
+                            tooltip: newMarkdownString(`**${view_str$settings$debugger}**: \`${DEBUGGER_MAPS[debuggerId].name}\``),
+                            projectIndex: element.val.projectIndex
+                        }));
+
                         // setting: project env
                         iList.push(new ProjTreeItem(TreeItemType.SETTINGS_ITEM, {
                             key: 'project.env',
@@ -1970,6 +1982,7 @@ class ProjectDataProvider implements vscode.TreeDataProvider<ProjTreeItem>, vsco
                         libList: []
                     },
                     builderOptions: {},
+                    settings: {}
                 };
                 eidePrjCfg.targets[targetName] = nEideTarget;
 
@@ -2207,7 +2220,8 @@ class ProjectDataProvider implements vscode.TreeDataProvider<ProjTreeItem>, vsco
                     incList: [],
                     defineList: [],
                     libList: []
-                }
+                },
+                settings: {}
             };
 
             nEideTarget.cppPreprocessAttrs.defineList = eTarget.builldArgs.cMacros;
@@ -6213,6 +6227,36 @@ export class ProjectExplorer implements CustomConfigurationProvider {
                     }
                 }
                 break;
+            case 'debugger':
+                {
+                    const selections: any[] = [];
+
+                    if (prj.getProjectType() !== 'C51') {
+
+                        selections.push({
+                            value: 'cortex-debug',
+                            label: DEBUGGER_MAPS['cortex-debug'].name,
+                            detail: `extension id: ${DEBUGGER_MAPS['cortex-debug'].extension_id}`
+                        });
+
+                        selections.push({
+                            value: 'cdt-gdb-debug',
+                            label: DEBUGGER_MAPS['cdt-gdb-debug'].name,
+                            detail: `extension id: ${DEBUGGER_MAPS['cdt-gdb-debug'].extension_id}`
+                        });
+                    }
+
+                    const res = await vscode.window.showQuickPick(selections, {placeHolder: 'Select debugger type'});
+                    if (res) {
+                        const targetInfo = prj.getTargetInfo();
+                        if (targetInfo.settings.debugger !== res.value) {
+                            targetInfo.settings.debugger = res.value;
+                            this.updateSettingsView(prj);
+                            prj.Save(true);
+                        }
+                    }
+                }
+                break;
             // 'project.env'
             case 'project.env':
                 {
@@ -7243,7 +7287,8 @@ export class ProjectExplorer implements CustomConfigurationProvider {
         type: 'jlink' | 'openocd' | 'pyocd',
         prj: AbstractProject, old_cfgs: any[]): Promise<{ debug_config: any, override_idx: number } | undefined> {
 
-        const _elfPath = File.ToUnixPath(prj.getOutputDir()) + '/' + `${prj.getProjectName()}.elf`;
+        const _outFullName = File.ToUnixPath(prj.getOutputDir()) + '/' + `${prj.getProjectName()}`
+        const _elfPath = `${_outFullName}.elf`;
         const _debugConfigTemplates = {
             'jlink': {
                 cwd: '${workspaceRoot}',
@@ -7281,9 +7326,15 @@ export class ProjectExplorer implements CustomConfigurationProvider {
         };
 
         const debugConfig: any = _debugConfigTemplates[type];
+        const toolchain = prj.getToolchain();
+
+        if (toolchain.name == 'AC5' || toolchain.name == 'AC6') {
+            debugConfig['executable'] = undefined;
+            debugConfig['loadFiles'] = [ `${_outFullName}.hex` ];
+            debugConfig['symbolFiles'] = [ `${_outFullName}.axf` ];
+        }
 
         /* set gdb toolchain */
-        const toolchain = prj.getToolchain();
         if (toolchain.getToolchainPrefix) {
             debugConfig.toolchainPrefix = toolchain.getToolchainPrefix().trim().replace(/-$/, '');
         } else if (debugConfig.toolchainPrefix) {
diff --git a/src/EIDETypeDefine.ts b/src/EIDETypeDefine.ts
@@ -129,6 +129,10 @@ export interface ProjectTargetInfo {
     uploadConfigMap: { [uploader: string]: any };
     cppPreprocessAttrs: Dependence;
     builderOptions: { [toolchain: string]: BuilderOptions };
+    settings: {
+        debugger?: string; // @ref DEBUGGER_MAPS
+        [name: string]: any;
+    };
 }
 
 export interface VirtualFile {
@@ -1352,6 +1356,12 @@ export class ProjectConfiguration<T extends BuilderConfigData>
             builderOpts = utility.deepCloneObject(target.targets[target.mode].builderOptions);
         }
 
+        let settings: any = {};
+        if (target.targets[target.mode] &&
+            target.targets[target.mode].settings) {
+            settings = utility.deepCloneObject(target.targets[target.mode].settings);
+        }
+
         return {
             excludeList: Array.from(target.excludeList),
             toolchain: target.toolchain,
@@ -1361,7 +1371,8 @@ export class ProjectConfiguration<T extends BuilderConfigData>
             uploadConfig: utility.deepCloneObject(target.uploadConfig),
             uploadConfigMap: utility.deepCloneObject(target.uploadConfigMap),
             cppPreprocessAttrs: custom_dep,
-            builderOptions: builderOpts
+            builderOptions: builderOpts,
+            settings: settings
         };
     }
 
@@ -1518,6 +1529,34 @@ export class ProjectConfiguration<T extends BuilderConfigData>
             };
         }
 
+        // init targets default value
+        const defTargetInfo: ProjectTargetInfo = {
+            excludeList: [],
+            toolchain: this.config.toolchain,
+            toolchainConfig: {},
+            toolchainConfigMap: {},
+            uploader: this.config.uploader,
+            uploadConfig: {},
+            uploadConfigMap: {},
+            cppPreprocessAttrs: {
+                name: 'default',
+                incList: [],
+                libList: [],
+                defineList: []
+            },
+            builderOptions: {},
+            settings: {
+                debugger: this.config.type === 'C51' ? 'unknown' : 'cortex-debug'
+            }
+        };
+        for (const name in this.config.targets) {
+            const target = this.config.targets[name];
+            for (const key in defTargetInfo) {
+                if ((<any>target)[key] === undefined)
+                    (<any>target)[key] = utility.deepCloneObject((<any>defTargetInfo)[key]);
+            }
+        }
+
         //  old project(ver < 3.3) have 'mode' field
         //  new project(ver >= 3.3) not have 'mode' field
         if (this.config.mode == undefined) {
diff --git a/src/KeilXmlParser.ts b/src/KeilXmlParser.ts
@@ -846,9 +846,10 @@ class ARMParser extends KeilParser<KeilARMOption> {
                         eideOption.linker['output-format'] = 'lib';
                     }
                     if (!mdk_CreateHexFile) {
-                        // Make eide Don't output hex/bin
+                        // Make eide Don't output s19/bin
                         if (eideOption.linker == undefined) eideOption.linker = {};
-                        eideOption.linker['$disableOutputTask'] = true;
+                        eideOption.linker['$disableOutputTask'] = false;
+                        eideOption.linker['$outputTaskExcludes'] = ['.bin', '.s19'];
                     }
                 }
             }
diff --git a/src/SettingManager.ts b/src/SettingManager.ts
@@ -556,9 +556,10 @@ export class SettingManager {
         return num;
     }
 
-    IsConvertAxf2Elf(): boolean {
-        return this.getConfiguration().get<boolean>('ARM.Option.AxfToElf') || false;
-    }
+    //! deprecated.
+    // IsConvertAxf2Elf(): boolean {
+    //     return this.getConfiguration().get<boolean>('ARM.Option.AxfToElf') || false;
+    // }
 
     IsAutoGenerateRTEHeader(): boolean {
         return this.getConfiguration().get<boolean>('ARM.Option.AutoGenerateRTE_Components') || false;
diff --git a/src/StringTable.ts b/src/StringTable.ts
@@ -65,6 +65,11 @@ export const view_str$settings$outFolderName = [
     'Output Folder Name'
 ][langIndex];
 
+export const view_str$settings$debugger = [
+    '调试器',
+    'Debugger'
+][langIndex];
+
 export const view_str$settings$prj_name = [
     '项目名称',
     'Project Name'
diff --git a/src/extension.ts b/src/extension.ts
diff --git a/src/utility.ts b/src/utility.ts

Original file line number	Diff line number	Diff line change
`@@ -846,9 +846,10 @@ class ARMParser extends KeilParser<KeilARMOption> {`
`846`	`846`	`eideOption.linker['output-format'] = 'lib';`
`847`	`847`	`}`
`848`	`848`	`if (!mdk_CreateHexFile) {`
`849`		`- // Make eide Don't output hex/bin`
	`849`	`+ // Make eide Don't output s19/bin`
`850`	`850`	`if (eideOption.linker == undefined) eideOption.linker = {};`
`851`		`- eideOption.linker['$disableOutputTask'] = true;`
	`851`	`+ eideOption.linker['$disableOutputTask'] = false;`
	`852`	`+ eideOption.linker['$outputTaskExcludes'] = ['.bin', '.s19'];`
`852`	`853`	`}`
`853`	`854`	`}`
`854`	`855`	`}`