v3.23.8 revision

v3.23.8 revision

Author: github0null

CHANGELOG.md

@@ -6,12 +6,16 @@ All notable version changes will be recorded in this file.
 
 ***
 
-### [v3.23.7] revision
+### [v3.23.8] revision
 
 **Improve**:
   - `GNU Arm Toolchain`: Support new mcpu: `cortex-m52, cortex-m55, cortex-m85`.
   - `unify_builder`: Optimize builder speed.
 
+  - `File Options`: Add memory assignment feature for `AC5`, `AC6` toolchain. Thanks the contributor [Deadline039](https://github.com/Deadline039)
+  - `File Options GUI`: Update the translation text. Optimize layout.
+  - `DebugConfig Generator GUI`: Change gui element width. Sort the option result list.
+
 ***
 
 ### [v3.23.6] revision

README.md

@@ -12,9 +12,9 @@
 
 ## Summary 📑
 
-A mcu development environment for `8051/AVR/STM8/Cortex-M/MIPS/RISC-V/Universal-Gcc` on VsCode. 
+A mcu development environment for `8051/STM8/Cortex-M/MIPS/RISC-V` on VsCode. 
 
-Provide `8051/AVR/STM8/Cortex-M/MIPS/RISC-V` project development, compilation, program flash and other functions.
+Provide `8051/STM8/Cortex-M/MIPS/RISC-V` project development, compilation, program flash and other functions.
 
 Supported Platforms: 
   - **Windows x64 (>= Windows 10)**
@@ -27,7 +27,7 @@ Supported Platforms:
 
 ## Features 🎉
 
-* Support 8051, AVR, STM8, Cortex-M, MIPS MTI, RISC-V, Universal-Gcc projects.
+* Support 8051, STM8, Cortex-M, MIPS MTI, RISC-V, GCC projects.
 * Support to import KEIL5/IAR/Eclipse projects, support to import 'IAR-STM8, IAR-ARM, Segger Embedded Studio' project source file resource tree.
 * Support for installing standard KEIL chip support packs (only for Cortex-M projects).
 * Provides many project templates for quick start a project.

README_ZH-CN.md

@@ -12,7 +12,7 @@
 
 一款适用于 8051/STM8/Cortex-M/MIPS/RISC-V 的单片机开发环境。
 
-在 vscode 上提供 **8051**, **AVR**, **STM8**, **Cortex-M**, **MIPS MTI**, **RISC-V** ... 项目的 开发, 编译, 烧录 等功能。
+在 vscode 上提供 **8051**, **STM8**, **Cortex-M**, **MIPS MTI**, **RISC-V** ... 项目的 开发, 编译, 烧录 等功能。
 
 支持的平台: 
   - **Windows x64 (>= Windows 10)**
@@ -25,7 +25,7 @@
 
 ## 功能特性 🎉
 
-* 支持开发 8051，STM8，AVR，Cortex-M，MIPS MTI, RISC-V, AnyGcc 项目。
+* 支持开发 8051，STM8，Cortex-M，MIPS MTI, RISC-V, GCC 项目。
 * 支持导入 KEIL5/IAR/Eclipse 项目，支持导入 `IAR-STM8, IAR-ARM, Segger Embedded Studio` 项目源文件资源树。
 * 支持安装标准的 KEIL 芯片支持包 (仅用于 Cortex-M 项目)。
 * 提供丰富的项目模板方便快速开始项目。

package.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.23.7",
+    "version": "3.23.8",
     "preview": false,
     "engines": {
         "vscode": "^1.67.0"

res/html/simple_config_ui/js/app.js

@@ -38,7 +38,8 @@ import { BuilderOptions, ProjectConfigData, ProjectConfiguration } from "./EIDET
 import {
     ArmBaseCompileData,
     Memory, ARMStorageLayout,
-    FloatingHardwareOption, C51BaseCompileData, RiscvCompileData, AnyGccCompileData, MipsCompileData
+    FloatingHardwareOption, C51BaseCompileData, RiscvCompileData, AnyGccCompileData, MipsCompileData,
+    getRamRomName
 } from './EIDEProjectModules';
 import { SettingManager } from "./SettingManager";
 import { GlobalEvent } from "./GlobalEvents";
@@ -561,12 +562,18 @@ interface MemorySize {
 interface RomItem {
     memInfo: Memory;
     selected: boolean;
+    name: string;
+    roFiles: string[];
 }
 
 interface RamItem {
     memInfo: Memory;
     selected: boolean;
     noInit: boolean;
+    name: string;
+    roFiles: string[];
+    rwFiles: string[];
+    ziFiles: string[];
 }
 
 interface MemoryScatter {
@@ -601,15 +608,21 @@ export class ARMCodeBuilder extends CodeBuilder {
                     startAddr: '0x00000000',
                     size: '0x00000000'
                 },
-                selected: false
+                selected: false,
+                name: '',
+                roFiles: [],
             });
             memScatter.ramList.push({
                 memInfo: {
                     startAddr: '0x00000000',
                     size: '0x00000000'
                 },
                 selected: false,
-                noInit: false
+                noInit: false,
+                name: '',
+                roFiles: [],
+                ziFiles: [],
+                rwFiles: []
             });
         }
 
@@ -653,6 +666,7 @@ export class ARMCodeBuilder extends CodeBuilder {
             memScatter.ramList[index].memInfo.size = this.FillHexNumber(storageLayout.RAM[i].mem.size);
             memScatter.ramList[index].selected = storageLayout.RAM[i].isChecked;
             memScatter.ramList[index].noInit = storageLayout.RAM[i].noInit;
+            memScatter.ramList[index].name = getRamRomName(storageLayout.RAM[i]);
         }
 
         for (let i = 0; i < storageLayout.ROM.length; i++) {
@@ -672,6 +686,7 @@ export class ARMCodeBuilder extends CodeBuilder {
             memScatter.romList[index].memInfo.startAddr = this.FillHexNumber(storageLayout.ROM[i].mem.startAddr);
             memScatter.romList[index].memInfo.size = this.FillHexNumber(storageLayout.ROM[i].mem.size);
             memScatter.romList[index].selected = storageLayout.ROM[i].isChecked;
+            memScatter.romList[index].name = getRamRomName(storageLayout.ROM[i]);
             memScatter.startUpIndex = storageLayout.ROM[i].isStartup ? index : memScatter.startUpIndex;
         }
 
@@ -723,30 +738,115 @@ export class ARMCodeBuilder extends CodeBuilder {
             child: []
         });
 
+        // Extra memory assign. 
+        const assignFileToMemory = (fileName: string, memoryName: string, memoryList: RomItem[] | RamItem[], attr: string) => {
+            memoryList.forEach((item) => {
+                if (item.name === memoryName && attr === 'RO') {
+                    item.roFiles.push(fileName);
+                    return;
+                }
+
+                if (item.name === memoryName && attr === 'RW') {
+                    (item as RamItem).rwFiles.push(fileName);
+                    return;
+                }
+
+                if (item.name === memoryName && attr === 'ZI') {
+                    (item as RamItem).ziFiles.push(fileName);
+                    return;
+                }
+            });
+        }
+
+        const options = this.project.getSourceExtraArgsCfg();
+        if (options && options.memoryAssign) {
+            const memoryAssign = options.memoryAssign;
+            Object.keys(memoryAssign).forEach((key) => {
+                const fileName = NodePath.basename(key).replace(/\.[^/.]+$/, '.o');
+                const item = memoryAssign[key];
+                if (item.RO) {
+                    assignFileToMemory(fileName, item.RO, memScatter.romList, 'RO');
+                    assignFileToMemory(fileName, item.RO, memScatter.ramList, 'RO');
+                }
+                if (item.RW) {
+                    assignFileToMemory(fileName, item.RW, memScatter.ramList, 'RW');
+                }
+                if (item.ZI) {
+                    assignFileToMemory(fileName, item.ZI, memScatter.ramList, 'ZI');
+                }
+            });
+        }
+
+        const InsertFileToScatter = (fileName: string, content: string, attr: string): string => {
+            if (content.search(fileName) === -1) {
+                content += `${fileName} (+${attr}) \r\n`;
+            } else {
+                // Insert the attribute only. e.g. "file.o (+RO)" => "file.o (+RO +RW)"
+                const regex = new RegExp(`(${fileName} \\(([^)]*)\\))`);
+                content = content.replace(regex, (match, p1, p2) => {
+                    // Don't add the same attribute again
+                    if (p2.includes(`+${attr}`)) return match;
+                    return `${fileName} (${p2} +${attr})`;
+                });
+            }
+
+            return content;
+        }
         //RAM
         memScatter.ramList.forEach((item, index) => {
+            let content = ''
+            if (item.roFiles.length > 0) {
+                item.roFiles.forEach((fileName) => {
+                    content = InsertFileToScatter(fileName, content, 'RO');
+                });
+            }
+            if (item.rwFiles.length > 0) {
+                item.rwFiles.forEach((fileName) => {
+                    content = InsertFileToScatter(fileName, content, 'RW');
+                });
+            }
+            if (item.ziFiles.length > 0) {
+                item.ziFiles.forEach((fileName) => {
+                    content = InsertFileToScatter(fileName, content, 'ZI');
+                });
+            }
             if (item.selected) {
+                content += '.ANY (+RW +ZI) \r\n';
+            }
+
+            if (content !== '') {
                 staUpTxt.child.push({
                     name: getRamName(index),
                     addr: ' ' + item.memInfo.startAddr + (item.noInit ? ' UNINIT ' : ' ') + item.memInfo.size + ' ',
-                    content: '.ANY (+RW +ZI) \r\n',
+                    content: content,
                     child: []
                 });
             }
         });
 
         memTxt.push(staUpTxt);
 
+        //ROM
         memScatter.romList.forEach((item, index) => {
+            let content = ''
+            if (item.roFiles.length > 0) {
+                item.roFiles.forEach((fileName) => {
+                    content = InsertFileToScatter(fileName, content, 'RO');
+                });
+            }
             if (item.selected && index !== memScatter.startUpIndex) {
+                content += '.ANY (+RO) \r\n';
+            }
+
+            if (content !== '') {
                 memTxt.push({
                     name: getRomName(index, false),
                     addr: ' ' + item.memInfo.startAddr + ' ' + item.memInfo.size + ' ',
                     content: '',
                     child: [{
                         name: getRomName(index, true),
                         addr: ' ' + item.memInfo.startAddr + ' ' + item.memInfo.size + ' ',
-                        content: '.ANY (+RO) \r\n',
+                        content: content,
                         child: []
                     }]
                 });

src/CodeBuilder.ts

@@ -76,7 +76,7 @@ import { ExeCmd } from '../lib/node-utility/Executable';
 import { jsonc } from 'jsonc';
 import * as iconv from 'iconv-lite';
 import * as globmatch from 'micromatch'
-import { EventData, CurrentDevice, ArmBaseCompileConfigModel } from './EIDEProjectModules';
+import { EventData, CurrentDevice, ArmBaseCompileConfigModel, ArmBaseCompileData } from './EIDEProjectModules';
 import * as FileLock from '../lib/node-utility/FileLock';
 import { CompilerCommandsDatabaseItem, CodeBuilder } from './CodeBuilder';
 import { xpackRequireDevTools } from './XpackDevTools';
@@ -778,10 +778,17 @@ export interface BaseProjectInfo {
     prjConfig: ProjectConfiguration<any>;
 }
 
+export interface SourceExtraMemoryAssignCfg {
+    RO?: string;
+    RW?: string;
+    ZI?: string;
+}
+
 export interface SourceExtraCompilerOptionsCfg {
     files?: { [key: string]: string };
     virtualPathFiles?: { [key: string]: string };
     alwaysBuildSourceFiles?: string[];
+    memoryAssign?: { [key: string]: SourceExtraMemoryAssignCfg };
 }
 
 export interface SourceFileOptions {
@@ -790,6 +797,7 @@ export interface SourceFileOptions {
 };
 
 export type DataChangeType = 'pack' | 'dependence' | 'compiler' | 'uploader' | 'files';
+export const EIDE_FILE_OPTION_VERSION = '2.1'
 
 export abstract class AbstractProject implements CustomConfigurationProvider, ProjectBaseApi {
 
@@ -1907,6 +1915,15 @@ export abstract class AbstractProject implements CustomConfigurationProvider, Pr
 
     //-------------------- other ------------------
 
+    supportArmccMemeoryAssignment(): boolean {
+        let isUseCustomScatterFile = false;
+        if (this.getProjectType() == 'ARM')
+            isUseCustomScatterFile = this.GetConfiguration<ArmBaseCompileData>().config
+                .compileConfig.useCustomScatterFile;
+        const toolchainName = this.getToolchain().name;
+        return (toolchainName === 'AC5' || toolchainName === 'AC6') && !isUseCustomScatterFile;
+    }
+
     getLibsGeneratorCfgFile(notCreate: boolean = false): File {
 
         const target = this.getCurrentTarget().toLowerCase();
@@ -2235,8 +2252,8 @@ $(OUT_DIR):
 
         const optFile = File.fromArray([this.getEideDir().path, `files.options.yml`]);
         if (!optFile.IsFile() && !notCreate) {
-            const optsObj = <SourceFileOptions>{ version: '2.0', options: {} };
-            optsObj.version = '2.0';
+            const optsObj = <SourceFileOptions>{ version: EIDE_FILE_OPTION_VERSION, options: {} };
+            optsObj.version = EIDE_FILE_OPTION_VERSION;
             optsObj.options[this.getCurrentTarget()] = { files: {}, virtualPathFiles: {} };
             optFile.Write(view_str$prompt$filesOptionsComment + yaml.stringify(optsObj, { indent: 4 }));
         }
@@ -2262,7 +2279,7 @@ $(OUT_DIR):
         try {
             const optFile = this.getSourceExtraArgsCfgFile();
             const optsObj = <SourceFileOptions>yaml.parse(optFile.Read());
-            optsObj.version = '2.0';
+            optsObj.version = EIDE_FILE_OPTION_VERSION;
             optsObj.options[targetName || this.getCurrentTarget()] = cfg;
             optFile.Write(view_str$prompt$filesOptionsComment + yaml.stringify(optsObj, { indent: 4 }));
         } catch (error) {
@@ -2317,6 +2334,16 @@ $(OUT_DIR):
             }
         }
 
+        if (cfg.memoryAssign && this.supportArmccMemeoryAssignment()) {
+            for (const filePath in cfg.memoryAssign) {
+                if (virtpath && this.comparePath(filePath, <string>virtpath)) {
+                    return true;
+                } else if (this.comparePath(filePath, <string>fspath)) {
+                    return true;
+                }
+            }
+        }
+
         return false;
     }
 
@@ -2786,7 +2813,7 @@ $(OUT_DIR):
             }
             // merge all files options
             if (allFileOptions.length > 0) {
-                const optionsObj: SourceFileOptions = { 'version': '2.0', options: {} };
+                const optionsObj: SourceFileOptions = { 'version': EIDE_FILE_OPTION_VERSION, options: {} };
                 allFileOptions.forEach(opts => {
                     const obj = opts.fileOptions;
                     obj.version = undefined;