refactored parser, made it C strict (#797)

* refactored parser, made it C strict
* fixed hex parsing
* added more const folding, added perf stats
* Parser: Now can read types from ScvdModel
* fixed parser fetch of scalar types
* changed _addr to return base if just one entry (for read)
* removed pre-evaluation and forwarding of types from typedef
* updated shown item behavior to match UV4
* aligned "// generated with AI", disabled perf stats
* removed parser global API and fixed ScvdExpression accordingly.
* fixed: gathering of execution context for parsing
* extended unit tests, fixed MAC address printing and "1 off" mask. Added integration tests for them

Author: thorstendb-ARM

src/views/component-viewer/component-viewer-instance.ts

@@ -25,7 +25,6 @@ import { StatementEngine } from './statement-engine/statement-engine';
 import { ScvdEvalContext } from './scvd-eval-context';
 import { GDBTargetDebugSession, GDBTargetDebugTracker } from '../../debug-session';
 import { ScvdGuiTree } from './scvd-gui-tree';
-import { perf } from './stats-config';
 
 
 const xmlOpts: ParserOptions = {
@@ -178,7 +177,6 @@ export class ComponentViewerInstance {
         await this.executeStatements(this._guiTree);
         stats.push(this.getStats('end'));
         console.log('ComponentViewerInstance update stats:\n' + stats.join('\n  '));
-        perf?.logSummaries();
     }
 
     private async readFileToBuffer(filePath: URI): Promise<Buffer> {

src/views/component-viewer/component-viewer-main.ts

@@ -21,6 +21,7 @@ import { URI } from 'vscode-uri';
 import { ComponentViewerTreeDataProvider } from './component-viewer-tree-view';
 import { logger } from '../../logger';
 import type { ScvdGuiInterface } from './model/scvd-gui-interface';
+import { perf, parsePerf } from './stats-config';
 
 export type fifoUpdateReason = 'sessionChanged' | 'refreshTimer' | 'stackTrace' | 'stackItemChanged';
 
@@ -108,6 +109,7 @@ export class ComponentViewer {
         if (scvdFilesPaths.length === 0) {
             return undefined;
         }
+        parsePerf?.reset();
         const cbuildRunInstances: ComponentViewerInstance[] = [];
         for (const scvdFilePath of scvdFilesPaths) {
             const instance = new ComponentViewerInstance();
@@ -116,6 +118,7 @@ export class ComponentViewer {
                 cbuildRunInstances.push(instance);
             }
         }
+        parsePerf?.logSummary();
         // Store loaded instances, set default lock state to false
         this._instances.push(...cbuildRunInstances.map(instance => ({
             componentViewerInstance: instance,
@@ -268,6 +271,8 @@ export class ComponentViewer {
         if (this._instances.length === 0) {
             return;
         }
+        perf?.resetBackendStats();
+        perf?.resetUiStats();
         const roots: ScvdGuiInterface[] = [];
         for (const instance of this._instances) {
             // Check if instance belongs to the active session, if not skip it and clear its data from the tree view.
@@ -291,7 +296,7 @@ export class ComponentViewer {
                 roots[roots.length - 1].isRootInstance = true;
             }
         }
+        perf?.logSummaries();
         this._componentViewerTreeDataProvider?.setRoots(roots);
     }
 }
-

src/views/component-viewer/data-host/memory-host.ts

@@ -420,6 +420,9 @@ export class MemoryHost {
             console.error(`getElementTargetBase: unknown symbol "${name}"`);
             return undefined;
         }
+        if (m.bases.length === 1) {
+            return m.bases[0];
+        }
         if (index < 0 || index >= m.bases.length) {
             console.error(`getElementTargetBase: index ${index} out of range for "${name}"`);
             return undefined;

src/views/component-viewer/model/scvd-expression.ts

@@ -17,17 +17,15 @@
 // https://arm-software.github.io/CMSIS-View/main/scvd_expression.html
 
 
-import { parseExpression, ParseResult } from '../parser-evaluator/parser';
+import { ParseResult } from '../parser-evaluator/parser';
 import { EvaluateResult } from '../parser-evaluator/evaluator';
 import { ScvdNode } from './scvd-node';
-import { ExecutionContext } from '../scvd-eval-context';
 
 export class ScvdExpression extends ScvdNode {
     private _expression: string | undefined;
     private _scvdVarName: string | undefined;
     private _expressionAst: ParseResult | undefined;
     private _isPrintExpression: boolean = false;
-    private _executionContext: ExecutionContext | undefined;
 
     constructor(
         parent: ScvdNode | undefined,
@@ -66,11 +64,15 @@ export class ScvdExpression extends ScvdNode {
     }
 
     private async evaluateExpression(): Promise<EvaluateResult> {
-        if (this.expressionAst === undefined || this._executionContext === undefined) {
+        const executionContext = this.getExecutionContext();
+        if (this.expressionAst === undefined || executionContext === undefined) {
             console.error(this.getLineInfoStr(), 'Expression evaluation missing AST or execution context');
             return undefined;
         }
-        return this._executionContext.evaluator.evaluateParseResult(this.expressionAst, this._executionContext.evalContext);
+        if (executionContext && this._executionContext !== executionContext) {
+            this._executionContext = executionContext;
+        }
+        return executionContext.evaluator.evaluateParseResult(this.expressionAst, executionContext.evalContext);
     }
 
     public override getValue(): Promise<EvaluateResult> {
@@ -108,7 +110,16 @@ export class ScvdExpression extends ScvdNode {
         }
 
         if (this.expressionAst === undefined) {  // if already parsed by dependency, skip parsing
-            const expressionAst = parseExpression(expression, this.isPrintExpression);
+            const executionContext = this.getExecutionContext();
+            if (executionContext && this._executionContext !== executionContext) {
+                this._executionContext = executionContext;
+            }
+            const parser = executionContext?.parser;
+            if (!parser) {
+                console.error(this.getLineInfoStr(), 'Expression parsing missing execution context or parser');
+                return false;
+            }
+            const expressionAst = parser.parseExpression(expression, this.isPrintExpression);
             if (expressionAst !== undefined && expressionAst.diagnostics.length === 0) {
                 this.expressionAst = expressionAst;
             }
@@ -122,10 +133,6 @@ export class ScvdExpression extends ScvdNode {
         return super.configure();
     }
 
-    public override setExecutionContext(_executionContext: ExecutionContext) {
-        this._executionContext = _executionContext;
-    }
-
     public override validate(prevResult: boolean): boolean {
         const expression = this.expression;
         if (expression === undefined) {

src/views/component-viewer/model/scvd-format-specifier.ts

@@ -108,7 +108,7 @@ export class ScvdFormatSpecifier {
 
         if (kind === 'uint') {
             if (bits && bits < 32) {
-                const mask = (1 << bits) >>> 0;
+                const mask = ((1 << bits) - 1) >>> 0;
                 return (((value as number) >>> 0) & mask).toString(10);
             }
             return ((value as number) >>> 0).toString(10);
@@ -221,9 +221,12 @@ export class ScvdFormatSpecifier {
                 }
                 case 'M': {
                     if (value instanceof Uint8Array) {
-                        return this.formatMac(value);
+                        return this.format_M(value);
                     }
-                    return this.format_M(value as number | string);
+                    if (typeof value === 'string') {
+                        return this.format_M(value);
+                    }
+                    return String(value);
                 }
                 case 'T': {
                     return this.format_T(value, typeInfo, padHex);
@@ -389,20 +392,12 @@ export class ScvdFormatSpecifier {
     }
 
 
-    public format_M(value: number | string): string {
+    public format_M(value: Uint8Array | string): string {
         if (typeof value === 'string') {
             const cleaned = value.replace(/[^0-9a-fA-F]/g, '').slice(0, 12).padStart(12, '0');
             return cleaned.match(/.{1,2}/g)?.join('-').toUpperCase() ?? value;
         }
-        const n = Number(value);
-        if (!Number.isFinite(n)) {
-            return `${value}`;
-        }
-        const parts: string[] = [];
-        for (let i = 5; i >= 0; i--) {
-            parts.push(((n >> (i * 8)) & 0xFF).toString(16).padStart(2, '0'));
-        }
-        return parts.join('-').toUpperCase();
+        return this.formatMac(value);
     }
 
     public format_T(value: unknown, typeInfo?: FormatTypeInfo, padZeroes: boolean = false): string {

src/views/component-viewer/model/scvd-node.ts

@@ -26,6 +26,7 @@ import { ScvdNodeSymbolCache } from './scvd-node-cache';
  */
 export abstract class ScvdNode extends ScvdBase {
     private _symbolsCache = new ScvdNodeSymbolCache();
+    protected _executionContext: ExecutionContext | undefined;
 
     public override get parent(): ScvdNode | undefined {
         return super.parent as ScvdNode | undefined;
@@ -90,6 +91,14 @@ export abstract class ScvdNode extends ScvdBase {
     }
 
     public setExecutionContext(_executionContext: ExecutionContext) {
+        this._executionContext = _executionContext;
+    }
+
+    public getExecutionContext(): ExecutionContext | undefined {
+        if (this._executionContext !== undefined) {
+            return this._executionContext;
+        }
+        return this.parent?.getExecutionContext();
     }
 
     // default condition always true

src/views/component-viewer/model/scvd-read.ts

@@ -193,6 +193,10 @@ export class ScvdRead extends ScvdNode {
         return this.type?.getMember(property);
     }
 
+    public override getElementRef(): ScvdNode | undefined {
+        return this.type ?? undefined;
+    }
+
     public override getValueType(): string | undefined {
         return this.type?.getValueType();
     }

src/views/component-viewer/model/scvd-symbol.ts

@@ -16,13 +16,11 @@
 
 // https://arm-software.github.io/CMSIS-View/main/elem_component_viewer.html
 
-import { ExecutionContext } from '../scvd-eval-context';
 import { ScvdNode } from './scvd-node';
 import { MemberInfo } from '../scvd-debug-target';
 
 export class ScvdSymbol extends ScvdNode {
     private _symbol: string | undefined;
-    private _executionContext: ExecutionContext | undefined;
     private _address: number | undefined;
     private _memberInfo: MemberInfo[] = [];
 
@@ -84,9 +82,4 @@ export class ScvdSymbol extends ScvdNode {
         return memberInfo?.offset;
     }
 
-    public override setExecutionContext(executionContext: ExecutionContext) {
-        this._executionContext = executionContext;
-    }
-
-
 }

src/views/component-viewer/model/scvd-typedef.ts

@@ -241,6 +241,17 @@ export class ScvdTypedef extends ScvdNode {
     }
 
     public async calculateTypedef() {
+        // Ensure typedef expressions are parsed before any value access.
+        this._size?.configure();
+        for (const member of this._member) {
+            member.offset?.configure();
+            member.size?.configure();
+        }
+        for (const varItem of this._var) {
+            varItem.size?.configure();
+            varItem.offset?.configure();
+        }
+
         if (this.import !== undefined) {
             await this.import.fetchSymbolInformation();
         }