new: add 'visualize-jumps' when disasm code

Author: github0null

src/EIDEProjectExplorer.ts

@@ -88,7 +88,9 @@ import {
     genGithubHash, md5, toArray, newMarkdownString, newFileTooltipString, FileTooltipInfo, escapeXml,
     readGithubRepoTxtFile, downloadFile, notifyReloadWindow, formatPath, execInternalCommand,
     copyAndMakeObjectKeysToLowerCase,
-    sortPaths
+    sortPaths,
+    getGccBinutilsVersion,
+    compareVersion
 } from './utility';
 import { concatSystemEnvPath, DeleteDir, exeSuffix, kill, osType, DeleteAllChildren } from './Platform';
 import { KeilARMOption, KeilC51Option, KeilParser, KeilRteDependence } from './KeilXmlParser';
@@ -5010,6 +5012,11 @@ export class ProjectExplorer implements CustomConfigurationProvider {
                 exeFile = File.fromArray([prj.getToolchain().getToolchainDir().path, 'bin', `${toolPrefix}objdump${exeSuffix()}`]);
                 if (!exeFile.IsFile()) { throw Error(`Not found '${exeFile.name}' !`) }
                 cmds = ['-S', '-l', elfPath, '>', dasmFile.path];
+                // https://interrupt.memfault.com/blog/gnu-binutils#new-feature-visualize-jumps
+                const binutilsVer = getGccBinutilsVersion(exeFile.dir, toolPrefix, 'objdump');
+                if (binutilsVer && compareVersion(binutilsVer, '2.34') > 0) {
+                    cmds = ['--visualize-jumps'].concat(cmds);
+                }
             }
             else if (toolchainName.startsWith('AC')) { // armcc
                 exeFile = File.fromArray([prj.getToolchain().getToolchainDir().path, 'bin', `fromelf${exeSuffix()}`]);
@@ -5124,6 +5131,11 @@ export class ProjectExplorer implements CustomConfigurationProvider {
                 exeFile = File.fromArray([activePrj.getToolchain().getToolchainDir().path, 'bin', `${toolPrefix}objdump${exeSuffix()}`]);
                 if (!exeFile.IsFile()) { throw Error(`Not found '${exeFile.name}' !`) }
                 cmds = ['-S', '-l', objPath, '>', tmpFile.path];
+                // https://interrupt.memfault.com/blog/gnu-binutils#new-feature-visualize-jumps
+                const binutilsVer = getGccBinutilsVersion(exeFile.dir, toolPrefix, 'objdump');
+                if (binutilsVer && compareVersion(binutilsVer, '2.34') > 0) {
+                    cmds = ['--visualize-jumps'].concat(cmds);
+                }
             }
             else if (toolchainName.startsWith('AC')) { // armcc
                 exeFile = File.fromArray([activePrj.getToolchain().getToolchainDir().path, 'bin', `fromelf${exeSuffix()}`]);

src/utility.ts

@@ -42,6 +42,31 @@ import { ExeCmd } from '../lib/node-utility/Executable';
 import { GlobalEvent } from './GlobalEvents';
 import { SettingManager } from './SettingManager';
 
+export function getGccBinutilsVersion(gccBinDirPath: string, toolprefix?: string, toolname?: string): string | undefined {
+
+    // example output:
+    //   GNU objdump (GNU Arm Embedded Toolchain 10-2020-q4-major) 2.35.1.20201028
+    //   GNU readelf (GNU Tools for Arm Embedded Processors 8-2019-q3-update) 2.32.0.20190703
+
+    const exeName = toolname || 'objdump';
+
+    try {
+        const lines = child_process.execFileSync(`${toolprefix || ''}${exeName}`, ['-v'], { cwd: gccBinDirPath, encoding: 'ascii' }).split(/\r\n|\n/);
+        for (const line of lines) {
+            if (line.trim().startsWith(`GNU ${exeName}`)) {
+                const m = /(\d+\.\d+\.\d+)(?:\.\d+)*$/.exec(line);
+                if (m && m.length > 1) {
+                    return m[1].trim();
+                }
+            }
+        }
+    } catch (error) {
+        GlobalEvent.emit('msg', ExceptionToMessage(error, 'Hidden'));
+    }
+
+    return undefined;
+}
+
 export function sortPaths(pathList: string[], sep?: string): string[] {
 
     let plist: string[][] = pathList.map(p => p.split(/\\|\//));