version 0.2.39: fix of arith insts and start of re-structure

[fw/sdcc] / sim / ucsim / pobj.cc

diff --git a/sim/ucsim/pobj.cc b/sim/ucsim/pobj.cc
index ae9e850bae0a55eca7825e6452db2c86481abba8..57405baa9e03eded243293d2d143284a5fa5775b 100644 (file)
--- a/sim/ucsim/pobj.cc
+++ b/sim/ucsim/pobj.cc
@@ -55,7 +55,6 @@ cl_base::cl_base(void) {}
 
 cl_base::~cl_base(void) {}
 
-
 int cl_base::init(void) {return(0);}
 
 
@@ -248,7 +247,7 @@ cl_list::for_each(iterator_func action, void *arg)
 void
 cl_list::free_item(void *item)
 {
-  delete item;
+  delete (class cl_base*)item;
 }
 
 
@@ -404,7 +403,7 @@ cl_list::set_limit(t_index alimit)
 cl_sorted_list::cl_sorted_list(t_index alimit, t_index adelta):
   cl_list(alimit, adelta)
 {
-  Duplicates= FALSE;
+  Duplicates= DD_FALSE;
 }
 
 
@@ -474,7 +473,7 @@ cl_sorted_list::search(void *key, t_index &index)
 {
   t_index l  = 0;
   t_index h  = count - 1;
-  bool   res= FALSE;
+  bool    res= DD_FALSE;
   
   while (l <= h)
     {
@@ -486,7 +485,7 @@ cl_sorted_list::search(void *key, t_index &index)
          h= i - 1;
          if (c == 0)
            {
-             res= TRUE;
+             res= DD_TRUE;
              if (!Duplicates)
                l= i;
            }
@@ -511,7 +510,7 @@ cl_sorted_list::search(void *key, t_index &index)
 cl_strings::cl_strings(t_index alimit, t_index adelta):
   cl_sorted_list(alimit, adelta)
 {
-  Duplicates= TRUE;
+  Duplicates= DD_TRUE;
 }
 
 
@@ -536,7 +535,7 @@ cl_strings::compare(void *key1, void *key2)
 void
 cl_strings::free_item(void* item)
 {
-  delete item;
+  delete (class cl_base*)item;
 }
 
 
@@ -578,7 +577,7 @@ bool
 cl_ustrings::search(void *key, t_index& index)
 {
   t_index i    = 0;
-  bool    found= FALSE;
+  bool    found= DD_FALSE;
   void    *Actual;
 
   if ((count) && key)