X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=sim%2Fucsim%2Fs51.src%2Ftimer0.cc;h=5024c9e320eb4d1dd8325cd6bca6485c3d751a28;hb=34d14506fd0c12ee5434fec0f9dec27753e1aab5;hp=fddf0c8242c3c2c9a024a8dc4cac92561d9581d7;hpb=8c8f34ff4281a55d2f535335c02999246e9e12f2;p=fw%2Fsdcc

diff --git a/sim/ucsim/s51.src/timer0.cc b/sim/ucsim/s51.src/timer0.cc
index fddf0c82..5024c9e3 100644
--- a/sim/ucsim/s51.src/timer0.cc
+++ b/sim/ucsim/s51.src/timer0.cc
@@ -30,7 +30,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "types51.h"
 
 
-cl_timer0::cl_timer0(class cl_uc *auc, int aid, char *aid_string):
+cl_timer0::cl_timer0(class cl_uc *auc, int aid, const char *aid_string):
   cl_hw(auc, HW_TIMER, aid, aid_string)
 {
   cell_tmod= cell_tcon= 0;
@@ -81,28 +81,28 @@ cl_timer0::cl_timer0(class cl_uc *auc, int aid, char *aid_string):
 int
 cl_timer0::init(void)
 {
-  class cl_mem *sfr= uc->mem(MEM_SFR);
+  class cl_address_space *sfr= uc->address_space(MEM_SFR_ID);
 
   if (sfr)
     {
       //t_mem d;
       if (id == 0 || id == 1)
-	{
-	  //cell_tmod= sfr->register_hw(TMOD, this, 0);
-	  register_cell(sfr, TMOD, &cell_tmod, wtd_restore_write);
-	  //d= cell_tmod->get(); write(cell_tmod, &d);
-	  //cell_tcon= sfr->register_hw(TCON, this, 0);
-	  register_cell(sfr, TCON, &cell_tcon, wtd_restore_write);
-	  //d= cell_tcon->get(); write(cell_tcon, &d);
-	  INT= sfr->read(P3) & mask_INT;
-	}
+        {
+          //cell_tmod= sfr->register_hw(TMOD, this, 0);
+          register_cell(sfr, TMOD, &cell_tmod, wtd_restore_write);
+          //d= cell_tmod->get(); write(cell_tmod, &d);
+          //cell_tcon= sfr->register_hw(TCON, this, 0);
+          register_cell(sfr, TCON, &cell_tcon, wtd_restore_write);
+          //d= cell_tcon->get(); write(cell_tcon, &d);
+          INT= sfr->read(P3) & mask_INT;
+        }
       else if (id == 2)
-	{
-	  cell_tmod= 0;
-	  //cell_tcon= sfr->register_hw(T2CON, this, 0);
-	  register_cell(sfr, T2CON, &cell_tcon, wtd_restore_write);
-	  //d= cell_tcon->get(); write(cell_tcon, &d);
-	}
+        {
+          cell_tmod= 0;
+          //cell_tcon= sfr->register_hw(T2CON, this, 0);
+          register_cell(sfr, T2CON, &cell_tcon, wtd_restore_write);
+          //d= cell_tcon->get(); write(cell_tcon, &d);
+        }
       //cell_tl= sfr->get_cell(addr_tl);
       //cell_th= sfr->get_cell(addr_th);
       use_cell(sfr, addr_tl, &cell_tl, wtd_restore);
@@ -116,10 +116,10 @@ cl_timer0::added_to_uc(void)
 {
   if (id == 0)
     uc->it_sources->add(new cl_it_src(bmET0, TCON, bmTF0, 0x000b, true,
-				      "timer #0", 2));
+                                      "timer #0", 2));
   else if (id == 1)
     uc->it_sources->add(new cl_it_src(bmET1, TCON, bmTF1, 0x001b, true,
-				      "timer #1", 4));
+                                      "timer #1", 4));
 }
 
 /*t_mem
@@ -129,19 +129,19 @@ cl_timer0::read(class cl_cell *cell)
 }*/
 
 void
-cl_timer0::write(class cl_cell *cell, t_mem *val)
+cl_timer0::write(class cl_memory_cell *cell, t_mem *val)
 {
   if (cell == cell_tmod)
     {
       t_mem md= *val & (mask_M0|mask_M1);
       if (md == mask_M0)
-	mode= 1;
+        mode= 1;
       else if (md == mask_M1)
-	mode= 2;
+        mode= 2;
       else if (md == (mask_M0|mask_M1))
-	mode= 3;
+        mode= 3;
       else
-	mode= 0;
+        mode= 0;
       GATE= *val & mask_GATE;
       C_T = *val & mask_C_T;
       T_edge= 0;
@@ -154,9 +154,9 @@ cl_timer0::write(class cl_cell *cell, t_mem *val)
 }
 
 /*void
-cl_timer0::mem_cell_changed(class cl_mem *mem, t_addr addr)
+cl_timer0::mem_cell_changed(class cl_m *mem, t_addr addr)
 {
-  //class cl_mem *sfr= uc->mem(MEM_SFR);
+  //class cl_m *sfr= uc->mem(MEM_SFR);
   //t_mem d;
 
   cl_hw::mem_cell_changed(mem, addr);
@@ -192,15 +192,15 @@ cl_timer0::do_mode0(int cycles)
   if (GATE)
     {
       if ((/*p3 & mask_*/INT) == 0)
-	return(0);
+        return(0);
     }
 
   if (C_T)
     {
       /*cycles= 0;
       if ((uc51->prev_p3 & mask_T) &&
-	  !(p3 & uc51->port_pins[3] & mask_T))
-	  cycles= 1;*/
+          !(p3 & uc51->port_pins[3] & mask_T))
+          cycles= 1;*/
       cycles= T_edge;
       T_edge= 0;
     }
@@ -209,14 +209,14 @@ cl_timer0::do_mode0(int cycles)
       // mod 0, TH= 8 bit t/c, TL= 5 bit precounter
       t_mem tl= cell_tl->add(1);
       if ((tl & 0x1f) == 0)
-	{
-	  cell_tl->set(0);
-	  if (!cell_th->add(1))
-	    {
-	      cell_tcon->set_bit1(mask_TF);
-	      overflow();
-	    }
-	}
+        {
+          cell_tl->set(0);
+          if (!cell_th->add(1))
+            {
+              cell_tcon->set_bit1(mask_TF);
+              overflow();
+            }
+        }
     }
 
   return(0);
@@ -232,15 +232,15 @@ cl_timer0::do_mode1(int cycles)
   if (GATE)
     {
       if ((/*p3 & mask_*/INT) == 0)
-	return(0);
+        return(0);
     }
 
   if (C_T)
     {
       /*cycles= 0;
       if ((uc51->prev_p3 & mask_T) &&
-	  !(p3 & uc51->port_pins[3] & mask_T))
-	  cycles= 1;*/
+          !(p3 & uc51->port_pins[3] & mask_T))
+          cycles= 1;*/
       cycles= T_edge;
       T_edge= 0;
     }
@@ -249,13 +249,13 @@ cl_timer0::do_mode1(int cycles)
     {
       // mod 1 TH+TL= 16 bit t/c
       if (!cell_tl->add(1))
-	{
-	  if (!cell_th->add(1))
-	    {
-	      cell_tcon->set_bit1(mask_TF);
-	      overflow();
-	    }
-	}
+        {
+          if (!cell_th->add(1))
+            {
+              cell_tcon->set_bit1(mask_TF);
+              overflow();
+            }
+        }
     }
 
   return(0);
@@ -271,15 +271,15 @@ cl_timer0::do_mode2(int cycles)
   if (GATE)
     {
       if ((/*p3 & mask_*/INT) == 0)
-	return(0);
+        return(0);
     }
 
   if (C_T)
     {
       /*cycles= 0;
       if ((uc51->prev_p3 & mask_T) &&
-	  !(p3 & uc51->port_pins[3] & mask_T))
-	  cycles= 1;*/
+          !(p3 & uc51->port_pins[3] & mask_T))
+          cycles= 1;*/
       cycles= T_edge;
       T_edge= 0;
     }
@@ -289,12 +289,12 @@ cl_timer0::do_mode2(int cycles)
     {
       // mod 2 TL= 8 bit t/c auto reload from TH
       if (!cell_tl->add(1))
-	{
-	  cell_tl->set(cell_th->get());
-	  cell_tcon->set_bit1(mask_TF);
-	  //printf("timer%d overflow %d (%d) %d\n",id,uc->ticks->ticks,i,startt+(i*12));
-	  overflow();
-	}
+        {
+          cell_tl->set(cell_th->get());
+          cell_tcon->set_bit1(mask_TF);
+          //printf("timer%d overflow %d (%d) %d\n",id,uc->ticks->ticks,i,startt+(i*12));
+          overflow();
+        }
       //i++;
     }
   return(0);
@@ -312,15 +312,15 @@ cl_timer0::do_mode3(int cycles)
   if (GATE)
     {
       if ((/*p3 & mask_*/INT) == 0)
-	goto do_th;
+        goto do_th;
     }
 
   if (C_T)
     {
       /*cycles= 0;
       if ((uc51->prev_p3 & mask_T) &&
-	  !(p3 & uc51->port_pins[3] & mask_T))
-	  cycles= 1;*/
+          !(p3 & uc51->port_pins[3] & mask_T))
+          cycles= 1;*/
       cycles= T_edge;
       T_edge= 0;
     }
@@ -328,18 +328,18 @@ cl_timer0::do_mode3(int cycles)
   while (cycles--)
     {
       if (!cell_tl->add(1))
-	{
-	  cell_tcon->set_bit1(mask_TF);
-	  overflow();
-	}
+        {
+          cell_tcon->set_bit1(mask_TF);
+          overflow();
+        }
     }
 
  do_th:
   if ((cell_tcon->get() & bmTR1) != 0)
     while (cyc--)
       {
-	if (!cell_th->add(1))
-	  cell_tcon->set_bit1(bmTF1);
+        if (!cell_th->add(1))
+          cell_tcon->set_bit1(bmTF1);
       }
   return(0);
 }
@@ -362,35 +362,36 @@ cl_timer0::happen(class cl_hw *where, enum hw_event he, void *params)
       t_mem p3n= ep->new_pins & ep->new_value;
       t_mem p3o= ep->pins & ep->prev_value;
       if ((p3n & mask_T) &&
-	  !(p3o & mask_T))
-	T_edge++;
+          !(p3o & mask_T))
+        T_edge++;
       INT= p3n & mask_INT;
       //printf("timer%d p%dchanged (%02x,%02x->%02x,%02x) INT=%d(%02x) edge=%d(%02x)\n",id,where->id,ep->prev_value,ep->pins,ep->new_value,ep->new_pins,INT,mask_INT,T_edge,mask_T);
     }
 }
 
 void
-cl_timer0::print_info(class cl_console *con)
+cl_timer0::print_info(class cl_console_base *con)
 {
-  char *modes[]= { "13 bit", "16 bit", "8 bit autoreload", "2x8 bit" };
+  const char *modes[]= { "13 bit", "16 bit", "8 bit autoreload", "2x8 bit" };
   //t_mem tmod= cell_tmod->get();
   int on;
+  class cl_address_space *sfr= uc->address_space(MEM_SFR_ID);
 
   con->dd_printf("%s[%d] 0x%04x", id_string, id,
-		 256*cell_th->get()+cell_tl->get());
+                 256*cell_th->get()+cell_tl->get());
   //int mode= tmod & (bmM00|bmM10);
   con->dd_printf(" %s", modes[mode]);
   con->dd_printf(" %s", (/*tmod&bm*/C_T/*0*/)?"counter":"timer");
   if (/*tmod&bm*/GATE/*0*/)
     {
       con->dd_printf(" gated");
-      on= /*uc->get_mem(MEM_SFR, P3) & uc->port_pins[3] & mask_*/INT/*bm_INT0*/;
+      on= INT;
     }
   else
-    on= TR/*cell_tcon->get(TCON) & mask_TR*/;
+    on= TR;
   con->dd_printf(" %s", on?"ON":"OFF");
   con->dd_printf(" irq=%c", (cell_tcon->get()&mask_TF)?'1':'0');
-  con->dd_printf(" %s", (uc->get_mem(MEM_SFR, IE)&bmET0)?"en":"dis");
+  con->dd_printf(" %s", sfr?"?":((sfr->get(IE)&bmET0)?"en":"dis"));
   con->dd_printf(" prio=%d", uc->it_priority(bmPT0));
   con->dd_printf("\n");
 }