Merge pull request #512 from github0null/dev

v3.26.6 revision

Author: github0null

CHANGELOG.md

@@ -6,6 +6,17 @@ All notable version changes will be recorded in this file.
 
 ***
 
+### [v3.26.6] revision
+
+**New**:
+  - `One-Click Debug`: Support new debugger `eclipse-cdt.cdt-gdb-vscode`. You can select it in project settings.
+
+**Changes**:
+  - `axf2elf Removed`: This function now is deprecated because we can use 'loadFiles', 'symbolFiles' options to load ac5/ac6 axf.
+  - `Project Export`: Check [PR 511](https://github.com/github0null/eide/pull/511) for more details.
+
+***
+
 ### [v3.26.5] revision
 
 **Improve**:

eide.code-workspace

@@ -6,6 +6,6 @@
 	],
 	"settings": {
 		"search.useIgnoreFiles": false,
-		"typescript.tsdk": "node_modules\\typescript\\lib"
+		"js/ts.tsdk.path": "node_modules/typescript/lib"
 	}
-}
+}

package-lock.json

@@ -36,7 +36,7 @@
     "homepage": "https://em-ide.com",
     "license": "MIT",
     "description": "A mcu development environment for 8051/AVR/STM8/Cortex-M/MIPS/RISC-V",
-    "version": "3.26.5",
+    "version": "3.26.6",
     "preview": false,
     "engines": {
         "vscode": "^1.67.0"
@@ -440,12 +440,6 @@
                         "description": "Auto Generate RTE_Components.h",
                         "default": true
                     },
-                    "EIDE.ARM.Option.AxfToElf": {
-                        "type": "boolean",
-                        "scope": "resource",
-                        "markdownDescription": "%settings.armcc.convert.axf%",
-                        "default": true
-                    },
                     "EIDE.STM8.STVP.CliExePath": {
                         "type": "string",
                         "scope": "resource",

package.json

@@ -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"
+    }
+}

res/data/openocd-helpers.tcl

@@ -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()) {

src/CodeBuilder.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;
     }
@@ -3414,7 +3419,7 @@ $(OUT_DIR):
 
     protected abstract create(option: CreateOptions): File;
 
-    abstract ExportToKeilProject(): File | undefined;
+    abstract ExportToKeilProject(saveFile?: File): File | undefined;
 
     static NewProject(workspaceState: vscode.Memento): AbstractProject {
         return new EIDEProject(workspaceState);
@@ -3813,7 +3818,7 @@ class EIDEProject extends AbstractProject {
         return baseInfo.workspaceFile;
     }
 
-    ExportToKeilProject(): File | undefined {
+    ExportToKeilProject(saveFile?: File): File | undefined {
 
         let keilFile: File;
 
@@ -3826,8 +3831,8 @@ class EIDEProject extends AbstractProject {
         const keilSuffix = prjConfig.type === 'C51' ? 'uvproj' : 'uvprojx';
         const suffixFilter = [new RegExp('\\.' + keilSuffix + '$', 'i')];
 
-        // local keil file
-        const localKeilFile = File.fromArray([this.GetRootDir().path, `${prjConfig.name}.${keilSuffix}`]);
+        // use user-specified save path, or fall back to project root
+        const localKeilFile = saveFile ?? File.fromArray([this.GetRootDir().path, `${prjConfig.name}.${keilSuffix}`]);
 
         // get from project root folder
         if (localKeilFile.IsFile()) {
@@ -3860,7 +3865,7 @@ class EIDEProject extends AbstractProject {
                     halFiles = halFiles.concat(group.files);
                 } else {
                     fileGroups.push(<FileGroup>{
-                        name: File.ToUnixPath(<string>rePath).toUpperCase(),
+                        name: File.ToUnixPath(<string>rePath),
                         files: group.files,
                         disabled: group.disabled
                     });
@@ -3892,10 +3897,13 @@ class EIDEProject extends AbstractProject {
         // rm empty file groups for MDK
         fileGroups = fileGroups.filter(g => g.files.length > 0);
 
+        const outDir = saveFile ? new File(NodePath.dirname(saveFile.path)) : this.GetRootDir();
+        const outName = saveFile ? saveFile.noSuffixName : localKeilFile.noSuffixName;
+
         // set keil xml
-        keilParser.SetKeilXml(this, fileGroups, cDevice);
+        keilParser.SetKeilXml(this, fileGroups, outDir, cDevice);
 
-        return keilParser.Save(this.GetRootDir(), localKeilFile.noSuffixName);
+        return keilParser.Save(outDir, outName);
     }
 
     //////////////////////////////// overrride ///////////////////////////////////

src/EIDEProject.ts

@@ -89,7 +89,9 @@ import {
     remove_this_item,
     view_str$prompt$filesOptionsComment,
     view_str$virual_doc_provider_banner,
-    view_str$missed_stubs_added
+    view_str$missed_stubs_added,
+    view_str$keil_export_path_warning,
+    view_str$settings$debugger
 } from './StringTable';
 import { CodeBuilder, BuildOptions } from './CodeBuilder';
 import { ExceptionToMessage, newMessage } from './Message';
@@ -112,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';
@@ -1371,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',
@@ -1969,6 +1982,7 @@ class ProjectDataProvider implements vscode.TreeDataProvider<ProjTreeItem>, vsco
                         libList: []
                     },
                     builderOptions: {},
+                    settings: {}
                 };
                 eidePrjCfg.targets[targetName] = nEideTarget;
 
@@ -2206,7 +2220,8 @@ class ProjectDataProvider implements vscode.TreeDataProvider<ProjTreeItem>, vsco
                     incList: [],
                     defineList: [],
                     libList: []
-                }
+                },
+                settings: {}
             };
 
             nEideTarget.cppPreprocessAttrs.defineList = eTarget.builldArgs.cMacros;
@@ -4203,7 +4218,7 @@ export class ProjectExplorer implements CustomConfigurationProvider {
         }
     }
 
-    ExportKeilXml(prjItem: ProjTreeItem) {
+    async ExportKeilXml(prjItem: ProjTreeItem) {
         try {
             const prj = this.getProjectByTreeItem(prjItem);
             if (!prj)
@@ -4221,7 +4236,27 @@ export class ProjectExplorer implements CustomConfigurationProvider {
                 return;
             }
 
-            const xmlFile = prj.ExportToKeilProject();
+            const prjConfig = prj.GetConfiguration().config;
+            const keilSuffix = prjConfig.type === 'C51' ? 'uvproj' : 'uvprojx';
+            const defaultUri = vscode.Uri.file(NodePath.join(prj.GetRootDir().path, `${prjConfig.name}.${keilSuffix}`));
+
+            const uri = await vscode.window.showSaveDialog({
+                defaultUri: defaultUri,
+                filters: { 'Keil Project': [keilSuffix] }
+            });
+            if (!uri) return;
+
+            // warn if the chosen save path is on a different drive from the project root;
+            // in that case, cross-drive paths cannot be made relative and will be written as absolute paths
+            const saveDrive = NodePath.parse(uri.fsPath).root.toLowerCase();
+            const prjDrive = NodePath.parse(prj.GetRootDir().path).root.toLowerCase();
+            if (saveDrive !== prjDrive) {
+                GlobalEvent.emit('msg', newMessage('Warning', view_str$keil_export_path_warning
+                    .replace('{0}', saveDrive)
+                    .replace('{1}', prjDrive)));
+            }
+
+            const xmlFile = prj.ExportToKeilProject(new File(uri.fsPath));
 
             if (xmlFile) {
                 GlobalEvent.emit('msg', newMessage('Info', export_keil_xml_ok + prj.toRelativePath(xmlFile.path)));
@@ -6192,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':
                 {
@@ -7222,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}',
@@ -7260,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) {