Changed a few Makefiles & Fixed 3 bugs.

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

diff --git a/sim/ucsim/sim.src/uc.cc b/sim/ucsim/sim.src/uc.cc
index d05779192a9f67f964020107402c0f5d7c0789dc..026648b0b50088e26106200c6add1570d3af8a1f 100644 (file)
--- a/sim/ucsim/sim.src/uc.cc
+++ b/sim/ucsim/sim.src/uc.cc
@@ -151,7 +151,7 @@ cl_uc::init(void)
     }
   ebrk= new brk_coll(2, 2, (class cl_rom *)mem(MEM_ROM));
   fbrk= new brk_coll(2, 2, (class cl_rom *)mem(MEM_ROM));
-  fbrk->Duplicates= FALSE;
+  fbrk->Duplicates= DD_FALSE;
   mk_hw_elements();
   reset();
   return(0);
@@ -295,7 +295,7 @@ cl_uc::mem(enum mem_class type)
   return((class cl_mem *)(mems->at(type)));
 }
 
-uchar *
+TYPE_UBYTE *
 cl_uc::MEM(enum mem_class type)
 {
   class cl_mem *m;
@@ -304,7 +304,7 @@ cl_uc::MEM(enum mem_class type)
     //FIXME
 {printf("TROUBLE\n");    return(0);
 }
-  return((TYPE_UBYTE *)(m->mem));
+  return((uchar *)(m->mem));
 }
 
 
@@ -316,7 +316,7 @@ ReadInt(FILE *f, bool *ok, int bytes)
   char s2[3];
   long l= 0;
 
-  *ok= FALSE;
+  *ok= DD_FALSE;
   while (bytes)
     {
       if (fscanf(f, "%2c", &s2[0]) == EOF)
@@ -325,7 +325,7 @@ ReadInt(FILE *f, bool *ok, int bytes)
       l= l*256 + strtol(s2, NULL, 16);
       bytes--;
     }
-  *ok= TRUE;
+  *ok= DD_TRUE;
   return(l);
 }
 
@@ -356,7 +356,10 @@ cl_uc::read_hex_file(const char *name)
   uchar low= 0, high;
 
   if (!name)
-    f= sim->/*FIXME*/cmd_in();
+    {
+      sim->cmd->printf("cl_uc::read_hex_file File name not specified\n");
+      return(-1);
+    }
   else
     if ((f= fopen(name, "r")) == NULL)
       {
@@ -365,7 +368,7 @@ cl_uc::read_hex_file(const char *name)
       }
 
   //memset(inst_map, '\0', sizeof(inst_map));
-  ok= TRUE;
+  ok= DD_TRUE;
   while (ok &&
         rtyp != 1)
     {
@@ -426,18 +429,17 @@ cl_uc::read_hex_file(const char *name)
                  else
                    if (sim->get_iarg('V', 0) &&
                        rtyp != 1)
-                     fprintf(sim->cmd_out(),
-                             "Unknown record type %d(0x%x)\n", rtyp, rtyp);
+                     sim->cmd->printf("Unknown record type %d(0x%x)\n",
+                                      rtyp, rtyp);
                }
              else
                if (sim->get_iarg('V', 0))
-                 fprintf(sim->cmd_out(),
-                         "Checksum error (%x instead of %x) in record %ld.\n",
-                         chk, sum, recnum);
+                 sim->cmd->printf("Checksum error (%x instead of %x) in "
+                                  "record %ld.\n", chk, sum, recnum);
            }
          else
            if (sim->get_iarg('V', 0))
-             fprintf(sim->cmd_out(), "Read error in record %ld.\n", recnum);
+             sim->cmd->printf("Read error in record %ld.\n", recnum);
        }
     }
   if (get_mem_width(MEM_ROM) > 8 &&
@@ -447,7 +449,7 @@ cl_uc::read_hex_file(const char *name)
   if (name)
     fclose(f);
   if (sim->get_iarg('V', 0))
-    fprintf(sim->cmd_out(), "%ld records have been read\n", recnum);
+    sim->cmd->printf("%ld records have been read\n", recnum);
   analyze(0);
   return(written);
 }
@@ -538,7 +540,7 @@ cl_uc::register_hw_write(enum mem_class type, long addr, class cl_hw *hw)
 class cl_hw *
 cl_uc::get_hw(enum hw_cath cath, int *idx)
 {
-  class cl_hw *hw;
+  class cl_hw *hw= 0;
   int i= 0;
 
   if (idx)