Merge pull request #231 from github0null/dev

github0null · web-flow · commit a26860e8e698 · 2023-04-02T19:33:29.000+08:00
v3.11.3 update
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,22 @@ All notable version changes will be recorded in this file.
 
 ***
 
+### [v3.11.3] revision
+
+**Fix**:
+  - `Extra Compiler Options`: Cannot evaluate inherited parameters.
+  - `unify_builder`: Cannot handle more than one `args expressions` for file options.
+  - `unify_builder`: Remove global extra options for `sdxxasm`.
+
+**Optimize**:
+  - `unify_builder`: More color render for compiler output messages.
+  - `unify_builder`: Add 'ASM_FLAGS' for sdcc sdxxasm.
+  - `Debug Config`: Auto generate toolchain prefix for cortex-debug.
+
+**Please update `eide_binaries` to v11.0.1+ (Restart plug-in to auto fetch update).**
+
+***
+
 ### [v3.11.2] update
 
 **New**:
diff --git a/lang/any.gcc.verify.json b/lang/any.gcc.verify.json
@@ -179,7 +179,7 @@
                     }
                 },
                 "ASM_FLAGS": {
-                    "markdownDescription": "Assembler Params",
+                    "markdownDescription": "Assembler Options",
                     "description.zh-cn": "汇编器参数",
                     "$ref": "#/definitions/FLAGS",
                     "default": "-c -x assembler"
diff --git a/lang/sdcc.verify.json b/lang/sdcc.verify.json
@@ -15,6 +15,19 @@
                 "type": "string"
             },
             "default": ""
+        },
+        "FLAGS": {
+            "markdownDescription": "Options",
+            "description.zh-cn": "选项",
+            "size": "huge",
+            "type": [
+                "string",
+                "array"
+            ],
+            "items": {
+                "type": "string"
+            },
+            "default": []
         }
     },
     "properties": {
@@ -185,16 +198,6 @@
                         "size"
                     ]
                 },
-                "$one-module-per-function": {
-                    "type": "boolean",
-                    "markdownDescription": "Module Split Optimization (supported by eide)",
-                    "description.zh-cn": "模块拆分优化 (supported by eide)",
-                    "default": false,
-                    "enum": [
-                        true,
-                        false
-                    ]
-                },
                 "plain-char-is-signed": {
                     "type": "boolean",
                     "markdownDescription": "plain char is signed",
@@ -351,10 +354,11 @@
             "description.zh-cn": "汇编器选项",
             "type": "object",
             "properties": {
-                "misc-controls": {
-                    "markdownDescription": "Other Assembler Options",
-                    "description.zh-cn": "汇编器附加选项",
-                    "$ref": "#/definitions/misc-controls"
+                "ASM_FLAGS": {
+                    "markdownDescription": "Assembler Options",
+                    "description.zh-cn": "汇编器参数",
+                    "$ref": "#/definitions/FLAGS",
+                    "default": ""
                 }
             }
         },
diff --git a/package.json b/package.json
@@ -35,7 +35,7 @@
     "homepage": "https://em-ide.com",
     "license": "MIT",
     "description": "A mcu development environment for 8051/AVR/STM8/Cortex-M/RISC-V",
-    "version": "3.11.2",
+    "version": "3.11.3",
     "preview": false,
     "engines": {
         "vscode": "^1.67.0"
diff --git a/package.nls.json b/package.nls.json
@@ -29,7 +29,7 @@
     "eide.project.upload": "Program Flash",
     "eide.project.flash.erase.all": "Erase Chip",
     "eide.project.gen.makefile": "Generate Makefile Template",
-    "eide.project.modify.files.options": "Show Source Files Extra Compiler Args",
+    "eide.project.modify.files.options": "Show Source Files Extra Compiler Options",
     "eide.project.import.ext.project.src.struct": "Import source tree from other projects",
     "eide.project.generate_builder_params": "Generate builder.params",
 
@@ -67,8 +67,8 @@
     "eide.explorer.show.file.dir": "Show In File Explorer",
     "eide.explorer.modify.file.path": "Modify File Path",
     "eide.explorer.modify.exclude_list": "Modify Source File Exclude List",
-    "eide.explorer.file.modify.extraArgs": "Modify Extra Compiler Args",
-    "eide.explorer.folder.modify.extraArgs": "Modify Extra Compiler Args",
+    "eide.explorer.file.modify.extraArgs": "Modify Extra Compiler Options",
+    "eide.explorer.folder.modify.extraArgs": "Modify Extra Compiler Options",
 
     "eide.source.show_cmsis_config_wizard": "CMSIS Configuration Wizard",
     "eide.source.show.disassembly": "Show Disassembly",
diff --git a/src/DebugConfigGenerator.ts b/src/DebugConfigGenerator.ts
@@ -165,6 +165,13 @@ class CortexDebugConfigProvider extends IDebugConfigProvider {
             // must use elf to debug
             debugConfig.executable = outDir + File.sep + prjConfig.name + '.elf';
 
+            const toolchain = prj.getToolchain();
+            if (toolchain.getToolchainPrefix) {
+                debugConfig.toolchainPrefix = toolchain.getToolchainPrefix().trim().replace(/-$/, '');
+            } else if (debugConfig.toolchainPrefix) {
+                debugConfig.toolchainPrefix = undefined;
+            }
+
             // setup svd file, if existed
             const device = prj.GetPackManager().getCurrentDevInfo();
             if (device && device.svdPath && debugConfig.svdFile == undefined) {
diff --git a/src/EIDEProject.ts b/src/EIDEProject.ts
@@ -1975,12 +1975,12 @@ export abstract class AbstractProject implements CustomConfigurationProvider, Pr
         return false;
     }
 
-    getExtraArgsForSource(fspath: string, virtpath?: string, cfg?: SourceExtraCompilerOptionsCfg): string[] | undefined {
+    getExtraArgsForSource(fspath: string, virtpath?: string, cfg?: SourceExtraCompilerOptionsCfg): { [expr: string]: string | undefined } {
 
         if (cfg == undefined)
-            return undefined;
+            return {};
 
-        const extraArgs: string[] = [];
+        const extraArgs: { [expr: string]: string } = {};
 
         // for fs path
         if (cfg.files) {
@@ -1992,7 +1992,11 @@ export abstract class AbstractProject implements CustomConfigurationProvider, Pr
                 if (globmatch.isMatch(searchPath, expr)) {
                     const val = patterns[expr]?.replace(/\r\n|\n/g, ' ').replace(/\\r|\\n|\\t/g, ' ').trim();
                     if (val) {
-                        extraArgs.push(val);
+                        if (extraArgs[expr]) {
+                            extraArgs[expr] = extraArgs[expr] + ' ' + val;
+                        } else {
+                            extraArgs[expr] = val;
+                        }
                     }
                 }
             }
@@ -2005,28 +2009,40 @@ export abstract class AbstractProject implements CustomConfigurationProvider, Pr
                 if (globmatch.isMatch(searchPath, expr)) {
                     const val = patterns[expr]?.replace(/\r\n|\n/g, ' ').replace(/\\r|\\n|\\t/g, ' ').trim();
                     if (val) {
-                        extraArgs.push(val);
+                        if (extraArgs[expr]) {
+                            extraArgs[expr] = extraArgs[expr] + ' ' + val;
+                        } else {
+                            extraArgs[expr] = val;
+                        }
                     }
                 }
             }
         }
 
-        return extraArgs.length > 0 ? extraArgs : undefined;
+        return extraArgs;
     }
 
-    getExtraArgsForFolder(folderpath: string, isVirtpath?: boolean, cfg?: SourceExtraCompilerOptionsCfg): string[] | undefined {
+    getExtraArgsForFolder(folderpath: string, isVirtpath?: boolean, cfg?: SourceExtraCompilerOptionsCfg): { [expr: string]: string | undefined } {
 
         if (cfg == undefined)
-            return undefined;
+            return {};
 
-        const extraArgs: string[] = [];
+        const extraArgs: { [expr: string]: string | undefined } = {};
+
+        this._matchExtraArgsForFolder(folderpath, isVirtpath, cfg, (expr, path, val) => {
+
+            if (val) {
+                if (extraArgs[expr]) {
+                    extraArgs[expr] = extraArgs[expr] + ' ' + val;
+                } else {
+                    extraArgs[expr] = val;
+                }
+            }
 
-        this._matchExtraArgsForFolder(folderpath, isVirtpath, cfg, (expr, path, args) => {
-            extraArgs.push(args);
             return false;
         });
 
-        return extraArgs.length > 0 ? extraArgs : undefined;
+        return extraArgs;
     }
 
     private _matchExtraArgsForFolder(
@@ -2611,7 +2627,18 @@ class EIDEProject extends AbstractProject {
     }
 
     private getExtraCompilerOptionsBySrcFile(srcPath: string, vPath?: string): string[] | undefined {
-        return this.getExtraArgsForSource(srcPath, vPath, this.getSourceExtraArgsCfg());
+
+        const allArgs = this.getExtraArgsForSource(srcPath, vPath, this.getSourceExtraArgsCfg());
+        if (!allArgs)
+            return undefined;
+
+        const argsList: string[] = [];
+
+        for (const expr in allArgs) {
+            argsList.push(allArgs[expr] || '');
+        }
+
+        return argsList;
     }
 
     //////////////////////////////// source refs ///////////////////////////////////
diff --git a/src/EIDEProjectExplorer.ts b/src/EIDEProjectExplorer.ts
@@ -4788,41 +4788,51 @@ export class ProjectExplorer implements CustomConfigurationProvider {
         if (!extraArgs)
             return;
 
-        const ccArgs = project.getExtraArgsForSource(fspath, virtpath, extraArgs)?.join(' ').trim() || '';
+        const argsMap    = project.getExtraArgsForSource(fspath, virtpath, extraArgs);
         const absPattern = project.getExtraArgsAbsPatternForSource(fspath, virtpath, extraArgs);
-        const isInherited = ccArgs && !absPattern;
+        const ccOptions  = absPattern ? (argsMap[absPattern] || '') : '';
+
+        // merge all inherited args
+        let inheritedArgs: string = '';
+        for (const key in argsMap) {
+            const val = argsMap[key]?.trim();
+            if (key != absPattern && val) {
+                inheritedArgs = `${inheritedArgs} ${val}`;
+            }
+        }
+        inheritedArgs = inheritedArgs.trim();
 
         const ui_cfg: SimpleUIConfig = {
-            title: 'Extra Compiler Args',
+            title: 'Extra Compiler Options',
             items: {},
         };
 
-        if (isInherited) { // 继承于其他匹配模式
+        if (inheritedArgs) { // 继承于其他匹配模式
             ui_cfg.items['inherit'] = {
                 type: 'input',
                 attrs: { readonly: true },
-                name: `Inherited Args (from other args pattern, check your '*.files.options.yml' file for details !)`,
+                name: `Inherited Options (from other pattern, check your '*.files.options.yml' file for details !)`,
                 data: <SimpleUIConfigData_input>{
-                    value: ccArgs,
-                    default: ccArgs
+                    value: inheritedArgs,
+                    default: inheritedArgs
                 }
             };
         }
 
         ui_cfg.items['args'] = {
             type: 'input',
             attrs: {},
-            name: 'Compiler Args',
+            name: 'Compiler Options',
             data: <SimpleUIConfigData_input>{
                 placeHolder: `compiler options, like: '-O1', '-Os', '-flto' ...`,
-                value: isInherited ? '' : ccArgs,
-                default: isInherited ? '' : ccArgs,
+                value: ccOptions,
+                default: ccOptions,
             },
         };
 
         WebPanelManager.instance().showSimpleConfigUI(ui_cfg, (new_cfg) => {
 
-            const nArgs = (<SimpleUIConfigData_input>new_cfg.items['args'].data).value.trim();
+            const nArgs = (<SimpleUIConfigData_input>new_cfg.items['args'].data).value.replace(/\r\n|\n/g, ' ').trim();
 
             let pattern: string;
 
@@ -4884,35 +4894,45 @@ export class ProjectExplorer implements CustomConfigurationProvider {
         if (!extraArgs)
             return;
 
-        const ccArgs = project.getExtraArgsForFolder(folderpath, isVirtpath, extraArgs)?.join(' ').trim() || '';
+        const argsMap    = project.getExtraArgsForFolder(folderpath, isVirtpath, extraArgs);
         const absPattern = project.getExtraArgsAbsPatternForFolder(folderpath, isVirtpath, extraArgs);
-        const isInherited = ccArgs && !absPattern;
+        const ccOptions  = absPattern ? (argsMap[absPattern] || '') : '';
+
+        // merge all inherited args
+        let inheritedOptions: string = '';
+        for (const key in argsMap) {
+            const val = argsMap[key]?.trim();
+            if (key != absPattern && val) {
+                inheritedOptions = `${inheritedOptions} ${val}`;
+            }
+        }
+        inheritedOptions = inheritedOptions.trim();
 
         const ui_cfg: SimpleUIConfig = {
-            title: 'Extra Compiler Args',
+            title: 'Extra Compiler Options',
             items: {},
         };
 
-        if (isInherited) { // 继承于其他匹配模式
+        if (inheritedOptions) { // 继承于其他匹配模式
             ui_cfg.items['inherit'] = {
                 type: 'input',
                 attrs: { readonly: true },
-                name: `Inherited Args (from other args pattern, check your '*.files.options.yml' file for details !)`,
+                name: `Inherited Options (from other args pattern, check your '*.files.options.yml' file for details !)`,
                 data: <SimpleUIConfigData_input>{
-                    value: ccArgs,
-                    default: ccArgs
+                    value: inheritedOptions,
+                    default: inheritedOptions
                 }
             };
         }
 
         ui_cfg.items['args'] = {
             type: 'input',
             attrs: {},
-            name: 'Compiler Args',
+            name: 'Compiler Options',
             data: <SimpleUIConfigData_input>{
                 placeHolder: `compiler options, like: '-O1', '-Os', '-flto' ...`,
-                value: isInherited ? '' : ccArgs,
-                default: isInherited ? '' : ccArgs,
+                value: ccOptions,
+                default: ccOptions,
             },
         };
 
@@ -4930,7 +4950,7 @@ export class ProjectExplorer implements CustomConfigurationProvider {
 
         WebPanelManager.instance().showSimpleConfigUI(ui_cfg, (new_cfg) => {
 
-            const nArgs = (<SimpleUIConfigData_input>new_cfg.items['args'].data).value.trim();
+            const nArgs = (<SimpleUIConfigData_input>new_cfg.items['args'].data).value.replace(/\r\n|\n/g, ' ').trim();
             const isRecursive = (<SimpleUIConfigData_boolean>new_cfg.items['recursive'].data).value;
 
             let pattern: string;
diff --git a/src/ToolchainManager.ts b/src/ToolchainManager.ts
@@ -829,7 +829,6 @@ class SDCC implements IToolchian {
             afterBuildTasks: [],
             global: {
                 "device": "mcs51",
-                "$one-module-per-function": false,
                 "optimize-type": "speed",
                 "use-non-free": false
             },

Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@`
`179`	`179`	`}`
`180`	`180`	`},`
`181`	`181`	`"ASM_FLAGS": {`
`182`		`- "markdownDescription": "Assembler Params",`
	`182`	`+ "markdownDescription": "Assembler Options",`
`183`	`183`	`"description.zh-cn": "汇编器参数",`
`184`	`184`	`"$ref": "#/definitions/FLAGS",`
`185`	`185`	`"default": "-c -x assembler"`