2.3.5: minor updates

acaldero · Aug 19, 2024 · e38c0c1 · e38c0c1
1 parent 18cf544
commit e38c0c1
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 27 deletions.
diff --git a/sim_sw/assembly/compiler3_obj2mem_wepsim.js b/sim_sw/assembly/compiler3_obj2mem_wepsim.js
@@ -290,8 +290,11 @@ function wsasm_obj2mem  ( ret )
          wsasm_zeropadding_and_writememory(ret.mp, gen) ;
 
          // copy back the last asigned address
-         for (let seg_name in last_assig_word) {
-              ret.seg[seg_name].end = parseInt(last_assig_word[seg_name]) ;
+         for (var seg_name in ret.seg)
+         {
+              if (typeof last_assig_word[seg_name] != "undefined")
+                   ret.seg[seg_name].end = parseInt(last_assig_word[seg_name]) ;
+              else ret.seg[seg_name].end = ret.seg[seg_name].begin + WORD_BYTES ;
          }
 
          return ret ;

diff --git a/sim_sw/assembly/memory_segments.js b/sim_sw/assembly/memory_segments.js
@@ -29,9 +29,9 @@
 
                    ".data":   { name:".data",   begin:0x01000, end:0x07FFF,    color:"#FACC2E", kindof:"data"  },
                    ".text":   { name:".text",   begin:0x08000, end:0x1FFFF,    color:"#BEF781", kindof:"text"  },
-                   ".stack":  { name:".stack",  begin:0x1FFFF, end:0x100000,   color:"#F1F2A3", kindof:"stack" },
 
-                   ".binary": { name:".binary", begin:0x00000, end:0xFFFFFFFF, color:"#BEF781", kindof:"binary" }
+                   ".binary": { name:".binary", begin:0x00000, end:0xFFFFFFFF, color:"#BEF781", kindof:"binary" },
+                   ".stack":  { name:".stack",  begin:0x1FFFF, end:0x100000,   color:"#F1F2A3", kindof:"stack" }
                 } ;
 
    function segments_addr_within_text ( address )

diff --git a/wepsim_web/wepsim_uielto_bin_asm.js b/wepsim_web/wepsim_uielto_bin_asm.js
@@ -97,7 +97,7 @@
 	          if (typeof slebal[wadd] != "undefined")
                   {
                        for (var i=0; i<slebal[wadd].length; i++) {
-		            clabel = clabel + "<span class='badge rounded-pill text-bg-secondary float-start'>" + slebal[wadd][i] + "</span>" ;
+		            clabel = clabel + "<span class='badge rounded-pill text-bg-secondary float-end'>" + slebal[wadd][i] + "</span>" ;
                        }
                   }
 	          else clabel = clabel + "&nbsp;" ;
@@ -108,7 +108,7 @@
 
 	function mp2html ( mp, labels, seg )
 	{
-                // auxiliar for search
+                // auxiliar for search label
                 var slebal = {} ;
                 for (var l in labels)
                 {
@@ -118,30 +118,17 @@
                      slebal[labels[l]].push(l);
                 }
 
+                // auxiliar for segments
                 var slimits = {} ;
 	        for (var skey1 in seg)
 	        {
                      slimits[skey1] = {
                                         'c_begin': parseInt(seg[skey1].begin),
                                         'c_end':   parseInt(seg[skey1].end),
-                                        'm_end':   0,
+                                        'm_end':   parseInt(seg[skey1].end),
 		                        'color':   seg[skey1].color
 				      } ;
                 }
-                var a = 0 ;
-	        for (var m in mp)
-	        {
-                     a = parseInt(m, 16) ;
-	             for (var skey2 in seg)
-	             {
-                          if ( (slimits[skey2].c_begin <= a) &&
- 			       (a < slimits[skey2].c_end) &&
- 			       (a > slimits[skey2].m_end) )
-	                  {
-                                slimits[skey2].m_end = a ;
-                          }
-                     }
-                }
 
                 // output...
 		var o  = "";
@@ -204,7 +191,7 @@
                              rows++;
 	             }
 
-		     p = "<tr class=\"font-monospace fs-6\">" +
+		     p = "<tr class=\"font-monospace fs-6 text-dark\">" +
                          "<td>&nbsp;</td>" +
 			 "<td style='border-style: solid; border-width:1px;' bgcolor=" + color + ">0x" + parseInt(seg[skey].begin).toString(16).toUpperCase() + "</td>" +
 			 "<td style='border-style: solid; border-width:1px;' bgcolor=" + color + ">&nbsp;</td>" ;
@@ -215,10 +202,10 @@
                          rows = 2 ;
 		     }
 
-                     o += rows + " align=right>" + seg[skey].name + "&nbsp;</td></tr>" + x ;
+                     o += rows + " class=\"text-dark\" bgcolor=\"" + color + "\" align=right>" + seg[skey].name + "&nbsp;</td></tr>" + x ;
 
 	             if (seg[skey].name != ".stack") {
-		         o += "<tr class=\"font-monospace fs-6\">" +
+		         o += "<tr class=\"font-monospace fs-6 text-dark\">" +
                               "<td>&nbsp;</td>" +
                               "<td valign='middle' align='center' height='25px'>...</td>" +
                               "<td valign='middle' align='center' height='25px'>...</td>" +

diff --git a/ws_dist/min.sim_all.js b/ws_dist/min.sim_all.js
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