fix typing issues in loadExtensions.ts

Author: Sayeem2004

src/lib/hardcodedData.ts

@@ -0,0 +1,59 @@
+export const extensionDescriptions: Record<string, string> = {
+    I: "Base Integer",
+    E: "Embedded Base",
+    M: "Integer Multiply/Divide",
+    A: "Atomic Instructions",
+    F: "Single-Precision Floating Point",
+    D: "Double-Precision Floating Point",
+    Q: "Quad-Precision Floating Point",
+    C: "Compressed Instructions",
+    B: "Bit Manipulation",
+    H: "Hypervisor",
+    S: "Supervisor",
+    V: "Vector",
+    Sdext: "Supervisor Debug",
+    Smdbltrp: "Supervisor Multiple Double Trap",
+    Smrnmi: "Supervisor Recursive NMI",
+    Svinval: "Supervisor Virtual Invalidation",
+    Zaamo: "Atomics extensions",
+    Zabha: "Byte/Halfword Atomics",
+    Zacas: "Compare-and-Swap Atomics",
+    Zalasr: "Atomic Logical Shift Right",
+    Zalrsc: "Load-Reserved/Store-Conditional",
+    Zawrs: "Wait-on-Reservation-Set",
+    Zba: "Address Generation Bit-Manip",
+    Zbb: "Basic Bit-Manip",
+    Zbc: "Carry-Less Multiply",
+    Zbkb: "Bit-Manip Crypto B",
+    Zbkx: "Bit-Manip Crypto X",
+    Zbs: "Single-Bit Manipulation",
+    Zcb: "Compressed Bit-Manip",
+    Zcd: "Compressed Double",
+    Zcf: "Compressed Floating Point",
+    Zcmop: "Compressed Micro-Operations",
+    Zcmp: "Compressed Pair",
+    Zfa: "Vector Atomic Floating",
+    Zfbfmin: "Vector BF16 Min",
+    Zfh: "Half-Precision Floating Point",
+    Zicbom: "Cache Block Management",
+    Zicboz: "Zero Cache Block",
+    Zicfilp: "Fetch Line Prefetch",
+    Zicfiss: "Instruction Streaming",
+    Zicond: "Conditional Ops",
+    Zicsr: "CSR Instructions",
+    Zifencei: "Instruction-Fetch Fence",
+    Zimop: "Integer Multiply and Division Ops",
+    Zkn: "Scalar Cryptography",
+    Zknd: "NIST Suite: AES Decryption",
+    Zkne: "NIST Suite: AES Encryption",
+    Zknh: "NIST Suite: Hash",
+    Zks: "Scalar Crypto Suite",
+    Zvbb: "Vector Bitwise",
+    Zvbc: "Vector Carry-less Multiply",
+    Zvfbfmin: "Vector BF16 Min",
+    Zvfbfwma: "Vector BF16 Fused Multiply-Add",
+    Zvkg: "Vector Galois Field",
+    Zvkned: "Vector AES Decryption",
+    Zvknha: "Vector Hash",
+    Zvks: "Vector Crypto Suite",
+};

src/lib/loadExtensions.ts

@@ -1,88 +1,35 @@
+import { InstructionInfo, ExtensionInfo } from "./sharedTypes.js";
+import { extensionDescriptions } from "./hardcodedData.js";
 import loadInstructions from "./loadInstructions.js";
 
-export default () => {
-    const instructions = loadInstructions();
-    const descriptions = {
-        I: "Base Integer",
-        E: "Embedded Base",
-        M: "Integer Multiply/Divide",
-        A: "Atomic Instructions",
-        F: "Single-Precision Floating Point",
-        D: "Double-Precision Floating Point",
-        Q: "Quad-Precision Floating Point",
-        C: "Compressed Instructions",
-        B: "Bit Manipulation",
-        H: "Hypervisor",
-        S: "Supervisor",
-        V: "Vector",
-        Sdext: "Supervisor Debug",
-        Smdbltrp: "Supervisor Multiple Double Trap",
-        Smrnmi: "Supervisor Recursive NMI",
-        Svinval: "Supervisor Virtual Invalidation",
-        Zaamo: "Atomics extensions",
-        Zabha: "Byte/Halfword Atomics",
-        Zacas: "Compare-and-Swap Atomics",
-        Zalasr: "Atomic Logical Shift Right",
-        Zalrsc: "Load-Reserved/Store-Conditional",
-        Zawrs: "Wait-on-Reservation-Set",
-        Zba: "Address Generation Bit-Manip",
-        Zbb: "Basic Bit-Manip",
-        Zbc: "Carry-Less Multiply",
-        Zbkb: "Bit-Manip Crypto B",
-        Zbkx: "Bit-Manip Crypto X",
-        Zbs: "Single-Bit Manipulation",
-        Zcb: "Compressed Bit-Manip",
-        Zcd: "Compressed Double",
-        Zcf: "Compressed Floating Point",
-        Zcmop: "Compressed Micro-Operations",
-        Zcmp: "Compressed Pair",
-        Zfa: "Vector Atomic Floating",
-        Zfbfmin: "Vector BF16 Min",
-        Zfh: "Half-Precision Floating Point",
-        Zicbom: "Cache Block Management",
-        Zicboz: "Zero Cache Block",
-        Zicfilp: "Fetch Line Prefetch",
-        Zicfiss: "Instruction Streaming",
-        Zicond: "Conditional Ops",
-        Zicsr: "CSR Instructions",
-        Zifencei: "Instruction-Fetch Fence",
-        Zimop: "Integer Multiply and Division Ops",
-        Zkn: "Scalar Cryptography",
-        Zknd: "NIST Suite: AES Decryption",
-        Zkne: "NIST Suite: AES Encryption",
-        Zknh: "NIST Suite: Hash",
-        Zks: "Scalar Crypto Suite",
-        Zvbb: "Vector Bitwise",
-        Zvbc: "Vector Carry-less Multiply",
-        Zvfbfmin: "Vector BF16 Min",
-        Zvfbfwma: "Vector BF16 Fused Multiply-Add",
-        Zvkg: "Vector Galois Field",
-        Zvkned: "Vector AES Decryption",
-        Zvknha: "Vector Hash",
-        Zvks: "Vector Crypto Suite",
-    };
-    const byExtension = new Map();
 
+export default (): ExtensionInfo[] => {
+    const instructions: InstructionInfo[] = loadInstructions();
+    const byExtension = new Map<string, ExtensionInfo>();
+
+    // Group instructions by their extension and create ExtensionInfo objects
     for (const inst of instructions) {
         const name = inst.extension || "unknown";
         const slug = inst.extensionSlug || "unknown";
         if (!byExtension.has(name)) {
             byExtension.set(name, {
-                name,
-                slug,
-                description: descriptions[name] || null,
+                name, slug,
+                description: extensionDescriptions[name] || null,
                 instructions: [],
             });
         }
-        byExtension.get(name).instructions.push(inst);
+        byExtension.get(name)!.instructions.push(inst);
     }
 
+    // Sort instructions within each extension and count them
     const list = Array.from(byExtension.values());
     for (const entry of list) {
-        entry.instructions.sort((a, b) => a.name.localeCompare(b.name));
+        entry.instructions.sort((a: InstructionInfo, b: InstructionInfo) =>
+            a.name.localeCompare(b.name));
         entry.count = entry.instructions.length;
     }
 
+    // Sort extensions alphabetically by name
     list.sort((a, b) => a.name.localeCompare(b.name));
     return list;
 };

src/lib/sharedTypes.ts

@@ -0,0 +1,40 @@
+export interface Field {
+    label: string;
+    from: number;
+    to: number;
+    width: number;
+    kind: "var" | "const";
+    segments?: { from: number; to: number }[];
+}
+
+
+export interface InstructionInfo {
+    name: string;
+    longName: string;
+    description: string;
+    definedBy: string;
+    definedByRaw: any;
+    base: number;
+    syntax: string;
+    encodingType?: string;
+    encoding: {
+        match: string | null;
+        variables: any[];
+        fields: Field[];
+        opcode?: string;
+        funct3?: string;
+        funct7?: string;
+    };
+    extension: string;
+    extensionSlug: string;
+    bitfieldSVG: string;
+}
+
+
+export interface ExtensionInfo {
+    name: string;
+    slug: string;
+    description: string | null;
+    instructions: InstructionInfo[];
+    count?: number;
+}