iar arm compiler supported

Author: github0null

lang/arm.iar.verify.json

@@ -378,6 +378,12 @@
                         "markdownDescription": "%settings.iar.stm8.install.folder%",
                         "default": ""
                     },
+                    "EIDE.IAR.ARM.Toolchain.InstallDirectory": {
+                        "type": "string",
+                        "scope": "machine",
+                        "markdownDescription": "%settings.iar.arm.toolchain.install.folder%",
+                        "default": ""
+                    },
                     "EIDE.STM8.GNU-SDCC.InstallDirectory": {
                         "type": "string",
                         "scope": "machine",
@@ -1496,6 +1502,10 @@
                 "fileMatch": "**/*.options.gcc.json",
                 "url": "./lang/arm.gcc.verify.json"
             },
+            {
+                "fileMatch": "**/*.options.arm.iar.json",
+                "url": "./lang/arm.iar.verify.json"
+            },
             {
                 "fileMatch": "**/*.stm8.gnu-sdcc.json",
                 "url": "./lang/stm8.gnu-sdcc.verify.json"

package.json

@@ -117,6 +117,7 @@
 
     "settings.keilc51.ini": "Keil C51 `UV4.exe` or `TOOLS.INI` file path [`example: C:\\Keil_v5\\UV4\\UV4.exe`]",
     "settings.iar.stm8.install.folder": "IAR for STM8 install directory [`example: D:\\IAR`]",
+    "settings.iar.arm.toolchain.install.folder": "IAR ARM C/C++ Compiler root directory [`example: D:\\IAR_ARM\\arm`]",
     "settings.sdcc.install.folder": "SDCC install folder [`example: C:\\Program Files (x86)\\SDCC`]",
 
     "settings.arm.armcc5.install.folder": "Armcc v5 toolchain install directory [`example: D:\\ac5`]",

package.nls.json

@@ -107,6 +107,7 @@
 
     "settings.keilc51.ini": "Keil C51 `UV4.exe` 或 `TOOLS.INI` 文件路径 [`example: C:\\Keil_v5\\UV4\\UV4.exe`]",
     "settings.iar.stm8.install.folder": "IAR for STM8 安装目录 [`example: D:\\IAR`]",
+    "settings.iar.arm.toolchain.install.folder": "IAR ARM C/C++ 编译器根目录 [`example: D:\\IAR_ARM\\arm`]",
     "settings.sdcc.install.folder": "SDCC 安装目录 [`example: C:\\Program Files (x86)\\SDCC`]",
 
     "settings.arm.armcc5.install.folder": "Armcc v5 toolchain 安装目录 [`example: D:\\ac5`]",

package.nls.zh-CN.json

@@ -893,29 +893,46 @@ export class ARMCodeBuilder extends CodeBuilder {
             scatterFilePath = `${scatterFilePath}.sct`;
         }
 
-        // 'armcc' can select whether use custom linker file
-        if (['AC5', 'AC6'].includes(toolchain.name)) {
-            // use custom linker script files
-            if (config.compileConfig.useCustomScatterFile) {
-                scatterFilePath.split(',')
-                    .filter(s => s.trim() != '')
-                    .forEach((sctPath) => {
-                        ldFileList.push(`"${File.ToUnixPath(this.project.ToAbsolutePath(sctPath))}"`);
-                    });
-            }
-            // auto generate scatter file 
-            else {
-                ldFileList.push(`"${File.ToUnixPath(this.GenMemScatterFile(config).path)}"`);
-            }
-        }
+        switch (toolchain.name) {
+            // 'armcc' can select whether use custom linker file
+            case 'AC5':
+            case 'AC6':
+                {
+                    if (config.compileConfig.useCustomScatterFile) { // use custom linker script files
+                        scatterFilePath.split(',')
+                            .filter(s => s.trim() != '')
+                            .forEach((sctPath) => {
+                                ldFileList.push(`"${File.ToUnixPath(this.project.ToAbsolutePath(sctPath))}"`);
+                            });
+                    } else { // auto generate scatter file 
+                        ldFileList.push(`"${File.ToUnixPath(this.GenMemScatterFile(config).path)}"`);
+                    }
+                }
+                break;
 
-        // other toolchain must use custom linker script file
-        else {
-            scatterFilePath.split(',')
-                .filter(s => s.trim() != '')
-                .forEach((sctPath) => {
-                    ldFileList.push(`"${File.ToUnixPath(this.project.ToAbsolutePath(sctPath))}"`);
-                });
+            // arm gcc
+            case 'GCC':
+                {
+                    scatterFilePath.split(',')
+                        .filter(s => s.trim() != '')
+                        .forEach((sctPath) => {
+                            ldFileList.push(`"${File.ToUnixPath(this.project.ToAbsolutePath(sctPath))}"`);
+                        });
+                }
+                break;
+
+            // iar
+            case 'IAR_ARM':
+                {
+                    scatterFilePath.split(',')
+                        .filter(s => s.trim() != '')
+                        .forEach((sctPath) => {
+                            ldFileList.push(`"${File.ToUnixPath(this.project.ToAbsolutePath(sctPath))}"`);
+                        });
+                }
+                break;
+            default:
+                break;
         }
 
         // set linker script

src/CodeBuilder.ts

@@ -723,7 +723,7 @@ export abstract class AbstractProject implements CustomConfigurationProvider, Pr
     static readonly excludeDirFilter: RegExp = /^\./;
 
     // to show output files
-    static readonly buildOutputMatcher: RegExp = /\.(?:elf|axf|out|hex|ihx|bin|s19|sct|ld[s]?|map|map\.view)$/i;
+    static readonly buildOutputMatcher: RegExp = /\.(?:elf|axf|out|a|lib|hex|ihx|bin|s19|s37|sct|icf|ld[s]?|map|map\.view)$/i;
 
     //-------
 
@@ -2167,11 +2167,11 @@ class EIDEProject extends AbstractProject {
 
         try {
             const refMap = JSON.parse(refListFile.Read());
-            for (const srcName in refMap) {
-                const refFile = new File((<string>refMap[srcName]).replace(/\.[^\\\/\.]+$/, '.d'));
+            for (const srcpath in refMap) {
+                const refFile = new File((<string>refMap[srcpath]).replace(/\.[^\\\/\.]+$/, '.d'));
                 if (!refFile.IsFile()) continue;
-                const refs = this.parseRefFile(refFile, toolName);
-                this.srcRefMap.set(srcName, refs.map((path) => new File(path)));
+                const refs = this.parseRefFile(refFile, toolName).filter(p => p != srcpath);
+                this.srcRefMap.set(srcpath, refs.map((path) => new File(path)));
             }
         } catch (error) {
             GlobalEvent.emit('msg', ExceptionToMessage(error, 'Hidden'));
@@ -2248,8 +2248,9 @@ class EIDEProject extends AbstractProject {
         switch (toolchain) {
             case "AC5":
                 return this.ac5_parseRefLines(lines);
+            case "IAR_ARM":
             case "IAR_STM8":
-                return this.ac5_parseRefLines(lines, 2);
+                return this.ac5_parseRefLines(lines, 1);
             case "SDCC":
             case "AC6":
             case "GCC":

src/EIDEProject.ts

@@ -416,6 +416,8 @@ export abstract class CompileConfigModel<T> extends ConfigModel<T> {
                 return <any>new Keil51CompileConfigModel(prjConfigData);
             case 'IAR_STM8':
                 return <any>new Iarstm8CompileConfigModel(prjConfigData);
+            case 'IAR_ARM':
+                return <any>new IarArmCompileConfigModel(prjConfigData);
             case 'AC5':
                 return <any>new Armcc5CompileConfigModel(prjConfigData);
             case 'AC6':
@@ -994,6 +996,61 @@ export class GccCompileConfigModel extends ArmBaseCompileConfigModel {
     }
 }
 
+export class IarArmCompileConfigModel extends ArmBaseCompileConfigModel {
+
+    protected cpuTypeList = [
+        'ARM7EJ-S',
+        'ARM7TDMI',
+        'ARM720T',
+        'ARM7TDMI-S',
+        'ARM9TDMI',
+        'ARM920T',
+        'ARM922T',
+        'ARM9E-S',
+        'ARM926EJ-S',
+        'ARM946E-S',
+        'ARM966E-S',
+        'Cortex-M0',
+        'Cortex-M0+',
+        'Cortex-M3',
+        'Cortex-M4',
+        'Cortex-M7',
+        //'Cortex-R4',
+        //'Cortex-R4F',
+        'SC000',
+        'SC300'
+    ];
+
+    protected GetKeyType(key: string): FieldType {
+        switch (key) {
+            case 'cpuType':
+            case 'floatingPointHardware':
+                return 'SELECTION';
+            case 'scatterFilePath':
+                return 'INPUT';
+            case 'options':
+                return 'EVENT';
+            default:
+                return 'Disable';
+        }
+    }
+
+    static getDefaultConfig(): ArmBaseCompileData {
+        return {
+            cpuType: 'Cortex-M3',
+            floatingPointHardware: 'none',
+            scatterFilePath: '${ToolchainRoot}/config/linker/ST/stm32f103x8.icf',
+            useCustomScatterFile: false,
+            storageLayout: { RAM: [], ROM: [] },
+            options: 'null'
+        };
+    }
+
+    GetDefault(): ArmBaseCompileData {
+        return IarArmCompileConfigModel.getDefaultConfig();
+    }
+}
+
 // -------- RISC-V --------
 
 // deprecated

src/EIDEProjectModules.ts

@@ -63,10 +63,10 @@ export interface HexUploaderInfo {
 export class HexUploaderManager {
 
     private uploaderList: HexUploaderInfo[] = [
-        { type: 'JLink', description: 'for Cortex-M chips, only JLink interface', filters: ['AC5', 'AC6', 'GCC', 'RISCV_GCC', 'ANY_GCC'] },
-        { type: 'STLink', description: 'for STM32 chips, only STLink interface', filters: ['AC5', 'AC6', 'GCC'] },
-        { type: 'pyOCD', description: 'for Cortex-M chips', filters: ['AC5', 'AC6', 'GCC', 'RISCV_GCC', 'ANY_GCC'] },
-        { type: 'OpenOCD', description: 'for Cortex-M chips', filters: ['AC5', 'AC6', 'GCC', 'RISCV_GCC', 'ANY_GCC'] },
+        { type: 'JLink', description: 'for Cortex-M chips, only JLink interface', filters: ['AC5', 'AC6', 'GCC', 'IAR_ARM', 'RISCV_GCC', 'ANY_GCC'] },
+        { type: 'STLink', description: 'for STM32 chips, only STLink interface', filters: ['AC5', 'AC6', 'GCC', 'IAR_ARM'] },
+        { type: 'pyOCD', description: 'for Cortex-M chips', filters: ['AC5', 'AC6', 'GCC', 'IAR_ARM', 'RISCV_GCC', 'ANY_GCC'] },
+        { type: 'OpenOCD', description: 'for Cortex-M chips', filters: ['AC5', 'AC6', 'GCC', 'IAR_ARM', 'RISCV_GCC', 'ANY_GCC'] },
         { type: 'stcgal', description: 'for STC chips', filters: ['Keil_C51', 'SDCC'] },
         { type: 'STVP', description: 'for STM8 chips, only STLink interface', filters: ['IAR_STM8', 'SDCC'] },
         { type: 'Custom', label: 'Shell', description: 'download program by custom shell command' }

src/HexUploader.ts

@@ -239,11 +239,11 @@ export class OperationExplorer {
 
         //---
 
-        const tcList: ToolchainName[] = ['AC5', 'GCC', 'IAR_STM8', 'SDCC', 'Keil_C51', 'RISCV_GCC', 'ANY_GCC', 'GNU_SDCC_STM8'];
+        const tcList: ToolchainName[] = ['AC5', 'AC6', 'GCC', 'IAR_ARM', 'IAR_STM8', 'SDCC', 'Keil_C51', 'RISCV_GCC', 'ANY_GCC'];
         const toolchainManager = ToolchainManager.getInstance();
-        const checkResults = tcList.map((tcName) => { return toolchainManager.isToolchainPathReady(tcName); });
-        const status: CheckStatus = checkResults.every((val) => { return val; }) ?
-            CheckStatus.All_Verified : (checkResults.includes(true) ? CheckStatus.All_Verified : CheckStatus.All_Failed);
+        const status: CheckStatus = tcList.some((tcName) => toolchainManager.isToolchainPathReady(tcName))
+            ? CheckStatus.All_Verified
+            : CheckStatus.All_Failed;
         icoPath = resManager.GetIconByName(<string>this.statusIconMap.get(status));
         this.provider.AddData({
             label: view_str$operation$setToolchainPath,
@@ -647,6 +647,13 @@ export class OperationExplorer {
                     + ` Loc: ${toolchainManager.getToolchainExecutableFolder('AC6')?.path}`,
                 detail: view_str$operation$setToolchainInstallDir.replace('${name}', 'ARMCC V6 Toolchain')
             },
+            {
+                label: 'IAR ARM C/C++ Compiler',
+                type: 'IAR_ARM',
+                description: this.getStatusTxt(toolchainManager.isToolchainPathReady('IAR_ARM'))
+                    + ` Loc: ${toolchainManager.getToolchainExecutableFolder('IAR_ARM')?.path}`,
+                detail: view_str$operation$setToolchainInstallDir.replace('${name}', 'IAR ARM C/C++ Compiler')
+            },
             {
                 label: 'GNU Arm Embedded Toolchain',
                 type: 'GCC',

src/OperationExplorer.ts

@@ -362,6 +362,10 @@ export class ResManager extends events.EventEmitter {
         return File.fromArray([(<File>this.GetDir('include')).path, 'internal_headers', 'iar_stm8_intr.h']);
     }
 
+    getIarArmForceIncludeHeaders(): File {
+        return File.fromArray([(<File>this.GetDir('include')).path, 'internal_headers', 'iar_arm_intr.h']);
+    }
+
     /* ------------------ builder and runtime ----------------- */
 
     getBuilderDir(): File {