2.3.5: minor update

acaldero · Aug 20, 2024 · 90dcd31 · 90dcd31
1 parent e38c0c1
commit 90dcd31
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 8 deletions.
diff --git a/sim_sw/firmware.js b/sim_sw/firmware.js
@@ -23,12 +23,6 @@
  *  Save Firmware
  */
 
-/*
-   TODO for saveFirmware:
-   a) try to unify internal definition for version 1 and 2 in order to save as last version by default
-   b) try to build a "1to2(...)" function to export version 1 as version 2 by default
-*/
-
 function saveFirmware ( SIMWARE )
 {
 	var o = "" ;

diff --git a/wepsim_web/wepsim_uielto_bin_asm.js b/wepsim_web/wepsim_uielto_bin_asm.js
@@ -70,8 +70,21 @@
 
 		    // get html code
 		    var o = mp2html(simware.mp, simware.labels_asm, simware.seg) ;
+
+                    o += '<span>Memory as binary segment... </span>' +
+                         '<span class="btn btn-sm" type="button" data-bs-toggle="collapse" ' +
+                         '      data-bs-target="#mp2bin1" ' +
+                         '      arial-expanded="true" arial-controls="memory as binary segment">+/-</span>' +
+                         '<div id="mp2bin1" valign="top" colspan="2" align="center" class="m-2 p-2 collapse">' +
+                         '<pre align="left">' +
+		         mp2bin(simware.mp, simware.labels_asm, simware.seg) +
+                         '</pre>' +
+                         '</div>' ;
+
+		    // set html code
 		    $('#compile_bin2a').html(o) ;
 
+                    // update limits
 		    for (var skey in simware.seg) {
 		         $("#compile_begin_" + skey).html("0x" + simware.seg[skey].begin.toString(16));
 		         $("#compile_end_"   + skey).html("0x" + simware.seg[skey].end.toString(16));
@@ -220,3 +233,39 @@
 		return o;
 	}
 
+	function mp2bin ( mp, labels, seg )
+	{
+                // auxiliar for search
+                var slebal = {} ;
+                for (var l in labels)
+                {
+                     if (typeof slebal[labels[l]] == "undefined") {
+                         slebal[labels[l]] = [] ;
+                     }
+                     slebal[labels[l]].push(l);
+                }
+
+                // output...
+		var o = '\n.binary\n' ;
+	        for (var a in mp)
+	        {
+		     // show labels
+                     if (typeof slebal[a] != "undefined")
+                     {
+                         o += "  " ;
+		         for (let j=0; j<slebal[a].length; j++) {
+			      o += slebal[a][j] + ":\n" ;
+		         }
+                     }
+
+		     // show address and value
+                     o += "\t" ;
+		     o += "0x" +                       a.toString(16).padStart(2*WORD_BYTES, '0') + "\t" ;
+		     o += "0x" + parseInt(mp[a].value,2).toString(16).padStart(2*WORD_BYTES, '0') + "\n" ;
+                }
+
+		// return memory as binary segment
+		return o ;
+	}
+
+
diff --git a/ws_dist/min.wepsim_node.js b/ws_dist/min.wepsim_node.js
diff --git a/ws_dist/min.wepsim_web.js b/ws_dist/min.wepsim_web.js