2.3.2: minor updates

sim_core/sim_adt_mainmemory.js

@@ -140,6 +140,11 @@
                 src = src.join(";") ;
             }
 
+            // if it is a binary element -> show '*'
+            if ('*' == valobj.source) {
+                src = '*' ;
+            }
+
             // escape html end attribute char
             if (typeof src == "string") {
 		src = main_memory_source_escape_html(src) ;

wepsim_web/wepsim_uielto_bin_asm.js

@@ -71,8 +71,7 @@
 		    // get html code
 		    var o = mp2html(simware.mp, simware.labels_asm, simware.seg) ;
 
-/* in beta
-                    o += '<span>Memory as binary segment... </span>' +
+                    o += '<span>Memory as binary section... </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>' +
@@ -81,7 +80,6 @@
 		         mp2bin(simware.mp, simware.labels_asm, simware.seg) +
                          '</pre>' +
                          '</div>' ;
-*/
 
 		    // set html code
 		    $('#compile_bin2a').html(o) ;
@@ -142,11 +140,12 @@
                                         'c_end':   parseInt(seg[skey1].end),
                                         'm_begin': parseInt(seg[skey1].begin),
                                         'm_end':   0,
+                                        'loaded':  seg[skey1].loaded,
 		                        'color':   seg[skey1].color
 				      } ;
 
                      // try to use the limits loaded in main memory (if any) ...
-                     if (seg[skey1].loaded)
+                     if (slimits[skey1].loaded)
                           slimits[skey1].m_end = slimits[skey1].c_end ;
                      else slimits[skey1].m_end = slimits[skey1].c_begin + WORD_BYTES ;
                 }
@@ -177,12 +176,24 @@
 			 "<th class='border border-0' align='right'>&nbsp;&nbsp;segment</th>" +
 			 "</tr>" ;
 
-	   	var color="white";
+	   	var color = "white" ;
+	   	var sname = "" ;
 	        for (var skey in seg)
 	        {
+                     // tip: ".binary" is a segment section but not a memory segment,
+                     //      ".stack"  is a memory segment but not a segment section
+	   	     sname = seg[skey].name ;
+                     if (".binary" == skey)
+                     {
+                          if (false == slimits[skey].loaded)
+	   	               continue ;   // skip empty ".binary" segment section
+                          else sname = "" ; // skip ".binary" segment as memory segment name
+                     }
+
                      c_begin =  slimits[skey].m_begin ;
                      c_end   =  slimits[skey].m_end ;
 		     color   =  slimits[skey].color ;
+
                      rows    =  0 ;
                      var x   =  "" ;
                      var p   =  "" ;
@@ -223,7 +234,7 @@
                          rows = 2 ;
 		     }
 
-                     o += rows + " class=\"text-dark\" bgcolor=\"" + color + "\" align=right>" + seg[skey].name + "&nbsp;</td></tr>" + x ;
+                     o += rows + " class=\"text-dark\" bgcolor=\"" + color + "\" align=right>" + sname + "&nbsp;</td></tr>" + x ;
 
 	             if (seg[skey].name != ".stack") {
 		         o += "<tr class=\"font-monospace fs-6 text-dark\">" +
@@ -268,8 +279,8 @@
 
 		     // 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" ;
+		     o += "0x" +          parseInt(a, 16).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