2.3.6: minor update on filter-microcode

Author: acaldero

wepsim_nodejs/wepsim.sh

@@ -161,9 +161,10 @@
                ' * Run in an interactive REPL interface (beta):\n' +
                '   ./wepsim.sh -a interactive --checkpoint ./repo/checkpoint/tutorial_1.txt\n' +
                '\n' +
-               ' * Build MIPS32-like microcode for testing in command-line:\n' +
-               '   ./wepsim.sh -a import-creator --checkpoint ./MIPS_32.json > microcode.txt\n' +
-               '   ./wepsim.sh -a run -m ep -f ./microcode.txt -s repo/assembly/mips/s6e3.asm\n' +
+               ' * Filter microcode:\n' +
+               '   echo begin  > /tmp/f.txt\n' +
+               '   echo add   >> /tmp/f.txt\n' +
+               '   ./wepsim.sh -a filter-microcode -m ep -f ./repo/microcode/rv32/ep_base.mc -s /tmp/f.txt\n' +
                '' ;
 
         return o ;

wepsim_nodejs/wepsim_node_action.js

@@ -290,6 +290,26 @@
         return true ;
     } ;
 
+    hash_action["FILTER-MICROCODE"] = function(data, options)
+    {
+	var elto_obj    = null ;
+	var elto_fields = null ;
+
+        // get filtered firmware
+        var ret = wepsim_nodejs_get_instructionset_filtered(data, options) ;
+        if (typeof ret.firmware === "undefined") {
+            ret.firmware = '<Empty>\n' ;
+        }
+
+        // dump filtered firmware
+        console.log('Begin microcode-filtered') ;
+        console.log(ret.firmware) ;
+        console.log('End microcode-filtered\n') ;
+
+        return true ;
+    } ;
+
+
     //
     // HELP (signal, instruction set, etc.)
     //
@@ -318,20 +338,6 @@
     } ;
 
 
-    //
-    // IMPORT-CREATOR
-    //
-
-    hash_action["IMPORT-CREATOR"] = function(data, options)
-    {
-        var obj_def = JSON.parse(data.str_chk) ;
-        var ret = simlang_firm_is2native(obj_def) ;
-
-        console.log(ret);
-        return true ;
-    } ;
-
-
     //
     // BUILD-CHECKPOINT
     //

wepsim_nodejs/wepsim_node_core.js

@@ -608,6 +608,42 @@
         return ret ;
     }
 
+    function wepsim_nodejs_get_instructionset_filtered ( data, options )
+    {
+	// 1) initialization
+        var ret = wepsim_nodejs_init(data) ;
+	if (false === ret.ok) {
+	    return wepsim_nodejs_retfill(false, ret.msg + ".\n") ;
+	}
+
+	// 2) load firmware
+        // simcore_reset() ;
+
+        var ret = simcore_compile_firmware(data.firmware) ;
+	if (false === ret.ok) {
+	    return wepsim_nodejs_retfill(false, "ERROR: Firmware: " + ret.msg) ;
+	}
+
+        var SIMWARE = get_simware() ;
+
+	// 3) filter firmware
+        var filter_arr  = data.assembly.split('\n') ;
+        var filter_firm = [] ;
+        for (var i=0; i<SIMWARE.firmware.length; i++)
+        {
+             if (filter_arr.includes(SIMWARE.firmware[i].name)) {
+                 filter_firm.push(SIMWARE.firmware[i]) ;
+             }
+        }
+
+        // 4) save new firmware
+        SIMWARE.firmware = filter_firm ;
+	ret.firmware = saveFirmware(SIMWARE) ;
+
+	// 5) return result
+        return ret ;
+    }
+
     function wepsim_nodejs_get_asmbin ( data, options )
     {
 	// 1) initialization

ws_dist/min.external.js

@@ -161,9 +161,6 @@
                ' * Run in an interactive REPL interface (beta):\n' +
                '   ./wepsim.sh -a interactive --checkpoint ./repo/checkpoint/tutorial_1.txt\n' +
                '\n' +
-               ' * Build MIPS32-like microcode for testing in command-line:\n' +
-               '   ./wepsim.sh -a import-creator --checkpoint ./MIPS_32.json > microcode.txt\n' +
-               '   ./wepsim.sh -a run -m ep -f ./microcode.txt -s repo/assembly/mips/s6e3.asm\n' +
                '' ;
 
         return o ;