Fixed bug #2488074

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

diff --git a/sim/ucsim/avr.src/avr.cc b/sim/ucsim/avr.src/avr.cc
index 5991f6c33f65359f0c8b3d76d946e9b170f136cd..3b021e5c8ec8699ece837e8d072ceb957fe922d3 100644 (file)
--- a/sim/ucsim/avr.src/avr.cc
+++ b/sim/ucsim/avr.src/avr.cc
@@ -2,7 +2,7 @@
  * Simulator of microcontrollers (avr.cc)
  *
  * Copyright (C) 1999,99 Drotos Daniel, Talker Bt.
- * 
+ *
  * To contact author send email to drdani@mazsola.iit.uni-miskolc.hu
  *
  */
@@ -66,7 +66,7 @@ cl_avr::init(void)
   return(0);
 }
 
-char *
+const char *
 cl_avr::id_string(void)
 {
   return("unspecified AVR");
@@ -168,16 +168,17 @@ cl_avr::bit_tbl(void)
   return(0);
 }
 
-char *
-cl_avr::disass(t_addr addr, char *sep)
+const char *
+cl_avr::disass(t_addr addr, const char *sep)
 {
   char work[256], temp[20];
-  char *buf, *p, *b, *t;
+  const char *b;
+  char *buf, *p, *t;
   uint code, data= 0;
   int i;
 
   p= work;
-  
+
   code= get_mem(MEM_ROM_ID, addr);
   i= 0;
   while ((code & dis_tbl()[i].mask) != dis_tbl()[i].code &&
@@ -291,10 +292,10 @@ cl_avr::disass(t_addr addr, char *sep)
     buf= (char *)malloc(6+strlen(p)+1);
   else
     buf= (char *)malloc((p-work)+strlen(sep)+strlen(p)+1);
-  for (p= work, b= buf; *p != ' '; p++, b++)
-    *b= *p;
+  for (p= work, t= buf; *p != ' '; p++, t++)
+    *t= *p;
   p++;
-  *b= '\0';
+  *t= '\0';
   if (sep == NULL)
     {
       while (strlen(buf) < 6)
@@ -645,7 +646,7 @@ cl_avr::push_data(t_mem data)
 {
   t_addr sp;
   t_mem spl, sph;
-  
+
   spl= ram->read(SPL);
   sph= ram->read(SPH);
   sp= 0xffff & (256*sph + spl);
@@ -663,7 +664,7 @@ cl_avr::push_addr(t_addr addr)
 {
   t_addr sp;
   t_mem spl, sph, al, ah;
-  
+
   spl= ram->read(SPL);
   sph= ram->read(SPH);
   sp= 0xffff & (256*sph + spl);
@@ -717,7 +718,7 @@ cl_avr::pop_addr(t_addr *addr)
   sph= (sp>>8) & 0xff;
   ram->write(SPL, spl);
   ram->write(SPH, sph);
-  
+
   return(resGO);
 }