github0null · github0null · Jan 19, 2025 · Jan 19, 2025 · Jan 19, 2025 · Jan 19, 2025
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,18 @@ All notable version changes will be recorded in this file.
 
 ***
 
+### [v3.21.1] revision
+
+**New**:
+  - `Map View`: Support show `map.view` file for SDCC and KEIL_C51 toolchain.
+  - `Scatter File Highlight`: Support a simple arm scatter file (`.sct`) language support.
+
+**Fix**:
+  - `Program Matcher`: Sometimes armcc problem matcher missed matchs.
+  - `CMSIS Config Wizard`: Missed skip value for `<e>` tag.
+
+***
+
 ### [v3.21.0] update
 
 **New**:

diff --git a/lang/syntax/sct.language-configuration.json b/lang/syntax/sct.language-configuration.json
@@ -0,0 +1,23 @@
+{
+	"comments": {
+		"lineComment": ";",
+		"blockComment": ["/*", "*/"],
+	},
+	"brackets": [
+		["{", "}"],
+		["[", "]"],
+		["(", ")"]
+	],
+	"autoClosingPairs": [
+		{ "open": "{", "close": "}" },
+		{ "open": "[", "close": "]" },
+		{ "open": "(", "close": ")" },
+		{ "open": "'", "close": "'", "notIn": ["string", "comment"] },
+		{ "open": "\"", "close": "\"", "notIn": ["string"] },
+		{ "open": "/**", "close": " */", "notIn": ["string"] }
+	],
+	"indentationRules": {
+		"increaseIndentPattern": "^\\s*{",
+		"decreaseIndentPattern": "^\\s*}"
+	}
+}
diff --git a/lang/syntax/sct.tmLanguage.json b/lang/syntax/sct.tmLanguage.json
@@ -0,0 +1,108 @@
+{
+    "information_for_contributors": [
+        "arm scatter file"
+    ],
+    "version": "1.0.0",
+    "name": "sct",
+    "scopeName": "source.arm.sct",
+    "patterns": [
+        {
+            "include": "#commandline"
+        },
+        {
+            "include": "#line_comment"
+        },
+        {
+            "include": "#block_comment"
+        },
+        {
+            "include": "#string"
+        },
+        {
+            "include": "#number"
+        },
+        {
+            "include": "#operators"
+        },
+        {
+            "include": "#preprocessor"
+        },
+        {
+            "include": "#keyword.load_region"
+        },
+        {
+            "include": "#keyword.exec_region"
+        }
+    ],
+    "repository": {
+        "commandline": {
+            "match": "^#!.*$",
+            "captures": {
+                "0": {
+                    "name": "markup.italic"
+                }
+            }
+        },
+        "line_comment": {
+            "match": "(;|\\/\\/).*",
+            "captures": {
+                "0": {
+                    "name": "comment.line"
+                }
+            }
+        },
+        "block_comment": {
+            "begin": "\\/\\*",
+            "end"  : "\\*\\/",
+            "name": "comment.block"
+        },
+        "string": {
+            "match": "\"([^\"\\\\]*(\\\\.[^\"\\\\]*)*)\"",
+            "captures": {
+                "0": {
+                    "name": "string.quoted.double"
+                }
+            }
+        },
+        "number": {
+            "match": "(?i)\\b([0-9]+|0x[0-9a-f]+)\\b",
+            "captures": {
+                "1": {
+                    "name": "constant.numeric"
+                }
+            }
+        },
+        "operators": {
+            "match": "\\+|-|\\*|\\/(?!\\/)|\\+=|-=|=|==|<=|>=|!=",
+            "captures": {
+                "0": {
+                    "name": "keyword.operator"
+                }
+            }
+        },
+        "preprocessor": {
+            "match": "^\\s*(#define|#undef|#include|#if|#ifdef|#ifndef|#elif|#else|#endif)",
+            "captures": {
+                "1": {
+                    "name": "keyword.control.define"
+                }
+            }
+        },
+        "keyword.load_region": {
+            "match": "\\b(ABSOLUTE|ALIGN|NOCOMPRESS|OVERLAY|PI|PROTECTED|RELOC)\\b",
+            "captures": {
+                "1": {
+                    "name": "keyword"
+                }
+            }
+        },
+        "keyword.exec_region": {
+            "match": "\\b(ABSOLUTE|ALIGN|NOCOMPRESS|OVERLAY|PI|ALIGNALL|ANY_SIZE|EMPTY|FILL|FIXED|PADVALUE|SORTTYPE|UNINIT|ZEROPAD)\\b",
+            "captures": {
+                "1": {
+                    "name": "keyword"
+                }
+            }
+        }
+    }
+}
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -38,7 +38,7 @@
     "homepage": "https://em-ide.com",
     "license": "MIT",
     "description": "A mcu development environment for 8051/AVR/STM8/Cortex-M/MIPS/RISC-V",
-    "version": "3.21.0",
+    "version": "3.21.1",
     "preview": false,
     "engines": {
         "vscode": "^1.67.0"
@@ -1748,6 +1748,19 @@
                     "**/*.lkf"
                 ],
                 "configuration": "./lang/syntax/lkf.language-configuration.json"
+            },
+            {
+                "id": "sct",
+                "aliases": [
+                    "ARM Scatter File"
+                ],
+                "extensions": [
+                    ".sct"
+                ],
+                "filenamePatterns": [
+                    "**/*.sct"
+                ],
+                "configuration": "./lang/syntax/sct.language-configuration.json"
             }
         ],
         "jsonValidation": [
@@ -1829,6 +1842,11 @@
                 "language": "lkf",
                 "scopeName": "source.cosmic.lkf",
                 "path": "./lang/syntax/lkf.tmLanguage.json"
+            },
+            {
+                "language": "sct",
+                "scopeName": "source.arm.sct",
+                "path": "./lang/syntax/sct.tmLanguage.json"
             }
         ],
         "taskDefinitions": [

diff --git a/res/tools/darwin/unify_builder/arm64/unify_builder.deps.json b/res/tools/darwin/unify_builder/arm64/unify_builder.deps.json
@@ -7,7 +7,7 @@
   "targets": {
     ".NETCoreApp,Version=v6.0": {},
     ".NETCoreApp,Version=v6.0/osx-arm64": {
-      "unify_builder/3.9.1": {
+      "unify_builder/3.9.2": {
         "dependencies": {
           "CommandLineParser": "2.9.1",
           "ConsoleTableExt": "3.1.9",
@@ -60,7 +60,7 @@
     }
   },
   "libraries": {
-    "unify_builder/3.9.1": {
+    "unify_builder/3.9.2": {
       "type": "project",
       "serviceable": false,
       "sha512": ""

diff --git a/res/tools/darwin/unify_builder/arm64/unify_builder.dll b/res/tools/darwin/unify_builder/arm64/unify_builder.dll
diff --git a/res/tools/darwin/unify_builder/x86_64/unify_builder.deps.json b/res/tools/darwin/unify_builder/x86_64/unify_builder.deps.json
@@ -7,7 +7,7 @@
   "targets": {
     ".NETCoreApp,Version=v6.0": {},
     ".NETCoreApp,Version=v6.0/osx-x64": {
-      "unify_builder/3.9.1": {
+      "unify_builder/3.9.2": {
         "dependencies": {
           "CommandLineParser": "2.9.1",
           "ConsoleTableExt": "3.1.9",
@@ -60,7 +60,7 @@
     }
   },
   "libraries": {
-    "unify_builder/3.9.1": {
+    "unify_builder/3.9.2": {
       "type": "project",
       "serviceable": false,
       "sha512": ""

diff --git a/res/tools/darwin/unify_builder/x86_64/unify_builder.dll b/res/tools/darwin/unify_builder/x86_64/unify_builder.dll
diff --git a/res/tools/linux/unify_builder/unify_builder.deps.json b/res/tools/linux/unify_builder/unify_builder.deps.json
@@ -7,7 +7,7 @@
   "targets": {
     ".NETCoreApp,Version=v6.0": {},
     ".NETCoreApp,Version=v6.0/linux-x64": {
-      "unify_builder/3.9.1": {
+      "unify_builder/3.9.2": {
         "dependencies": {
           "CommandLineParser": "2.9.1",
           "ConsoleTableExt": "3.1.9",
@@ -60,7 +60,7 @@
     }
   },
   "libraries": {
-    "unify_builder/3.9.1": {
+    "unify_builder/3.9.2": {
       "type": "project",
       "serviceable": false,
       "sha512": ""

diff --git a/res/tools/linux/unify_builder/unify_builder.dll b/res/tools/linux/unify_builder/unify_builder.dll
diff --git a/res/tools/win32/unify_builder/unify_builder.deps.json b/res/tools/win32/unify_builder/unify_builder.deps.json
@@ -7,7 +7,7 @@
   "targets": {
     ".NETCoreApp,Version=v6.0": {},
     ".NETCoreApp,Version=v6.0/win-x64": {
-      "unify_builder/3.9.1": {
+      "unify_builder/3.9.2": {
         "dependencies": {
           "CommandLineParser": "2.9.1",
           "ConsoleTableExt": "3.1.9",
@@ -60,7 +60,7 @@
     }
   },
   "libraries": {
-    "unify_builder/3.9.1": {
+    "unify_builder/3.9.2": {
       "type": "project",
       "serviceable": false,
       "sha512": ""

diff --git a/res/tools/win32/unify_builder/unify_builder.dll b/res/tools/win32/unify_builder/unify_builder.dll
diff --git a/res/tools/win32/unify_builder/unify_builder.exe b/res/tools/win32/unify_builder/unify_builder.exe
diff --git a/src/CmsisConfigParser.ts b/src/CmsisConfigParser.ts
@@ -401,7 +401,7 @@ interface ParserContext {
 
 const fieldMatcher: TagMatcher = {
     'group': { start: /^\/\/\s*<h>\s*(?<name>.+)/, end: /^\/\/\s*<\/h>/ },
-    'section': { start: /^\/\/\s*<e(?:\.(?<var_mod_bit_s>[\d]+))?(?: (?<var_name>\w+))?>\s*(?<name>.+?)(?<desc>(?:\s+[-]+\s*.*)?)$/, end: /^\/\/\s*<\/e>/ },
+    'section': { start: /^\/\/\s*<e(?<var_skip_val>\d+)?(?:\.(?<var_mod_bit_s>[\d]+))?(?: (?<var_name>\w+))?>\s*(?<name>.+?)(?<desc>(?:\s+[-]+\s*.*)?)$/, end: /^\/\/\s*<\/e>/ },
     'tooltip': { start: /^\/\/\s*<i>\s*(?<detail>.+)\s*$/ },
     'defval': { start: /^\/\/\s*<d>\s*(?<var_def_val>.+)\s*$/ },
     'code': { start: /^\/\/\s*<!?c(?<var_skip_val>\d+)?>\s*(?<name>.+?)(?<desc>(?:\s+[-]+\s*.*)?)$/, end: /^\/\/\s*<\/[!]?c>/ },

diff --git a/src/CodeBuilder.ts b/src/CodeBuilder.ts
@@ -128,7 +128,7 @@ export abstract class CodeBuilder {
         this._event.emit(event, arg);
     }
 
-    protected genSourceInfo(prevBuilderParams: BuilderParams | undefined): {
+    protected genSourceInfo(): {
         sources: string[],
         params?: { [name: string]: string; }
     } {
@@ -175,18 +175,6 @@ export abstract class CodeBuilder {
                     const parttenInfo = options?.files;
                     matcher(parttenInfo, 'path');
                 }
-
-                // if src options is modified to null but old is not null,
-                // we need make source recompile
-                if (prevBuilderParams) {
-                    const oldSrcParams = prevBuilderParams.sourceParams;
-                    for (const path in oldSrcParams) {
-                        if (srcParams[path] == undefined && oldSrcParams[path] != undefined &&
-                            oldSrcParams[path] != '') {
-                            srcParams[path] = ""; // make it empty to trigger recompile 
-                        }
-                    }
-                }
             }
 
         } catch (err) {
@@ -375,9 +363,7 @@ export abstract class CodeBuilder {
         const paramsPath = this.project.ToAbsolutePath(outDir + File.sep + this.paramsFileName);
         const compileOptions: BuilderOptions = this.project.GetConfiguration().compileConfigModel.getOptions();
         const memMaxSize = this.getMcuMemorySize();
-        const oldParamsPath = `${paramsPath}.old`;
-        const prevParams: BuilderParams | undefined = File.IsFile(oldParamsPath) ? JSON.parse(fs.readFileSync(oldParamsPath, 'utf8')) : undefined;
-        const sourceInfo = this.genSourceInfo(prevParams);
+        const sourceInfo = this.genSourceInfo();
         const builderModeList: string[] = []; // build mode
 
         const builderOptions: BuilderParams = {
@@ -497,37 +483,6 @@ export abstract class CodeBuilder {
 
         // set build mode
         {
-            /** --------------------------------------------------------------
-             * @note After unify_builder v3.9.0, this function is deprecated 
-             * because we have built-in it in the latest unify_builder
-             * ---------------------------------------------------------------
-             */
-            // // generate hash for compiler options
-            // builderOptions.sha = this.genHashFromCompilerOptions(builderOptions);
-            // // check whether need rebuild project
-            // if (this.isRebuild() == false && prevParams) {
-            //     try {
-            //         // not found hash from old params file
-            //         if (prevParams.sha == undefined) {
-            //             this.enableRebuild();
-            //         }
-
-            //         // check hash obj by specifies keys
-            //         else {
-            //             const keyList = ['global', 'c/cpp-defines', 'c/cpp-compiler', 'asm-compiler'];
-            //             for (const key of keyList) {
-            //                 if (!this.compareHashObj(key, prevParams.sha, builderOptions.sha)) {
-            //                     this.enableRebuild();
-            //                     break;
-            //                 }
-            //             }
-            //         }
-            //     } catch (error) {
-            //         this.enableRebuild(); // make rebuild
-            //         GlobalEvent.emit('msg', ExceptionToMessage(error, 'Hidden'));
-            //     }
-            // }
-
             if (config.toolchain === 'Keil_C51') {
                 builderModeList.push('normal'); // disable increment build for Keil C51
             } else {

diff --git a/src/EIDEProject.ts b/src/EIDEProject.ts
@@ -2877,12 +2877,20 @@ $(OUT_DIR):
                     }
                 }
             } catch (error) {
+                GlobalEvent.log_warn(<Error>error);
                 const msg = [
                     `${toolchain.getToolchainPrefix()}gcc not avaliable:\n${(<Error>error).message}`,
                     `Please check your package.json and run 'xpm install' to install xpack dependences.`
                 ].join(os.EOL);
-                GlobalEvent.emit('msg', newMessage('Error', msg));
-                GlobalEvent.log_warn(<Error>error);
+                vscode.window.showErrorMessage(msg, 'Install', 'Later')
+                    .then((value) => {
+                        if (value == 'Install') {
+                            runShellCommand('xpm install', 'xpm install', {
+                                useTerminal: true,
+                                cwd: this.getRootDir().path
+                            });
+                        }
+                    });
                 return false
             }
         }