2.3.6: minor update

Author: acaldero

wepsim_nodejs/wepsim.sh

@@ -5,7 +5,7 @@
    // Help
    //
 
-   var ws_cl_ver = 'WepSIM-cl v2.0.0' ;
+   var ws_cl_ver = 'WepSIM-cl v2.0.1' ;
 
    function ws_help_usage ()
    {
@@ -149,7 +149,7 @@
         return o ;
    }
 
-   function ws_help_examples_developer ()
+   function ws_help_examples_developers ()
    {
        var o = '\n' +
                ws_cl_ver + '\n' +
@@ -164,7 +164,7 @@
                ' * 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' +
+               '   ./wepsim.sh -a filter-microcode -m ep -f ./repo/microcode/rv32/ep_bare.mc -r /tmp/f.txt\n' +
                '' ;
 
         return o ;

wepsim_nodejs/wepsim_node_action.js

@@ -302,8 +302,10 @@
         }
 
         // dump filtered firmware
-        console.log('Begin microcode-filtered') ;
-        console.log(ret.firmware) ;
+        console.log('Begin microcode-filtered\n') ;
+        if (ret.ok)
+             console.log(ret.firmware) ;
+        else console.log(ret.msg) ;
         console.log('End microcode-filtered\n') ;
 
         return true ;

wepsim_nodejs/wepsim_node_core.js

@@ -627,13 +627,34 @@
         var SIMWARE = get_simware() ;
 
 	// 3) filter firmware
-        var filter_arr  = data.assembly.split('\n') ;
+        var filter_arr  = data.result_ok.split('\n') ;
         var filter_firm = [] ;
-        for (var i=0; i<SIMWARE.firmware.length; i++)
+        var filter_action = options.purify.toUpperCase() ;
+
+        if (['SELECT', 'SEL', ''].includes(filter_action))
         {
-             if (filter_arr.includes(SIMWARE.firmware[i].name)) {
-                 filter_firm.push(SIMWARE.firmware[i]) ;
-             }
+            for (var i=0; i<SIMWARE.firmware.length; i++)
+            {
+                 if (filter_arr.includes(SIMWARE.firmware[i].name)) {
+                     filter_firm.push(SIMWARE.firmware[i]) ;
+                 }
+            }
+        }
+        else
+        if (['DELETE', 'DEL'].includes(filter_action))
+        {
+            for (var i=0; i<SIMWARE.firmware.length; i++)
+            {
+                 if (! filter_arr.includes(SIMWARE.firmware[i].name)) {
+                     filter_firm.push(SIMWARE.firmware[i]) ;
+                 }
+            }
+        }
+        else
+        {
+            ret.ok  = false ;
+	    ret.msg = 'Unknown ' + filter_action + ' filter option used' ;
+	    return wepsim_nodejs_retfill(false, ret.msg + ".\n") ;
         }
 
         // 4) save new firmware

wepsim_web/wepsim_uielto_registers.js

@@ -75,8 +75,8 @@
         {
               for (let rf_item in simware.registers)
               {
-                   if (typeof rf_item.registers[reg_name] != "undefined") {
-                       return rf_item ;
+                   if (typeof simware.registers[rf_item].registers[reg_name] != "undefined") {
+                       return simware.registers[rf_item] ;
                    }
               }
 

ws_dist/min.wepsim_node.js

@@ -5,7 +5,7 @@
    // Help
    //
 
-   var ws_cl_ver = 'WepSIM-cl v2.0.0' ;
+   var ws_cl_ver = 'WepSIM-cl v2.0.1' ;
 
    function ws_help_usage ()
    {
@@ -149,7 +149,7 @@
         return o ;
    }
 
-   function ws_help_examples_developer ()
+   function ws_help_examples_developers ()
    {
        var o = '\n' +
                ws_cl_ver + '\n' +
@@ -161,6 +161,10 @@
                ' * Run in an interactive REPL interface (beta):\n' +
                '   ./wepsim.sh -a interactive --checkpoint ./repo/checkpoint/tutorial_1.txt\n' +
                '\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_bare.mc -r /tmp/f.txt\n' +
                '' ;
 
         return o ;