Merge branch ucsim-034-pre3 to main trunk; new version 0.4

[fw/sdcc] / sim / ucsim / sim.src / arg.cc

diff --git a/sim/ucsim/sim.src/arg.cc b/sim/ucsim/sim.src/arg.cc
index fe2e6811c21aaaa4e62797c2bee2c372d35cd0c9..3e6f5cd714929fb6d80499dc908265aa955e62a1 100644 (file)
--- a/sim/ucsim/sim.src/arg.cc
+++ b/sim/ucsim/sim.src/arg.cc
@@ -214,7 +214,10 @@ cl_cmd_int_arg::get_bit_address(class cl_uc *uc, // input
 
   if (!get_address(uc, &bit_addr))
     return(DD_FALSE);
-  return(uc->extract_bit_address(bit_addr, mem, mem_addr, bit_mask));
+  
+  if (mem)
+    *mem= uc->bit2mem(bit_addr, mem_addr, bit_mask);
+  return(mem && *mem);
 }
 
 bool
@@ -272,7 +275,9 @@ cl_cmd_sym_arg::get_bit_address(class cl_uc *uc, // input
                          get_svalue(),
                          uc)) == NULL)
     return(DD_FALSE);
-  return(uc->extract_bit_address(ne->addr, mem, mem_addr, bit_mask));
+  if (mem)
+    *mem= uc->bit2mem(ne->addr, mem_addr, bit_mask);
+  return(mem && *mem);
 }
 
 bool