version 0.5.2

[fw/sdcc] / sim / ucsim / s51.src / interrupt.cc

diff --git a/sim/ucsim/s51.src/interrupt.cc b/sim/ucsim/s51.src/interrupt.cc
index 5f9c8631fdef6391fa99c71a8b9f19952f30a7d4..80aad40c9261b8364e10a5932a3620c609ec7510 100644 (file)
--- a/sim/ucsim/s51.src/interrupt.cc
+++ b/sim/ucsim/s51.src/interrupt.cc
@@ -25,6 +25,9 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA. */
 /*@1@*/
 
+// prj
+#include "utils.h"
+
 // sim
 #include "itsrccl.h"
 
@@ -44,9 +47,7 @@ cl_interrupt::cl_interrupt(class cl_uc *auc):
 int
 cl_interrupt::init(void)
 {
-  class cl_mem *sfr;
-
-  sfr= uc->mem(MEM_SFR);
+  sfr= uc->address_space(MEM_SFR_ID);
   if (sfr)
     {
       //sfr->register_hw(IE, this, 0);
@@ -68,7 +69,7 @@ cl_interrupt::added_to_uc(void)
 }
 
 void
-cl_interrupt::write(class cl_cell *cell, t_mem *val)
+cl_interrupt::write(class cl_memory_cell *cell, t_mem *val)
 {
   if (cell == cell_tcon)
     {
@@ -81,7 +82,7 @@ cl_interrupt::write(class cl_cell *cell, t_mem *val)
 }
 
 /*void
-cl_interrupt::mem_cell_changed(class cl_mem *mem, t_addr addr)
+cl_interrupt::mem_cell_changed(class cl_m *mem, t_addr addr)
 {
 }*/
 
@@ -129,7 +130,7 @@ cl_interrupt::happen(class cl_hw *where, enum hw_event he, void *params)
 void
 cl_interrupt::print_info(class cl_console *con)
 {
-  int ie= uc->get_mem(MEM_SFR, IE);
+  int ie= sfr->get(IE);
   int i;
 
   con->dd_printf("Interrupts are %s. Interrupt sources:\n",
@@ -142,10 +143,10 @@ cl_interrupt::print_info(class cl_console *con)
       con->dd_printf(" %-3s", (ie&(is->ie_mask))?"en":"dis");
       con->dd_printf(" %2d", uc->it_priority(is->ie_mask));
       con->dd_printf(" %-3s",
-                    (uc->get_mem(MEM_SFR, is->src_reg)&(is->src_mask))?
+                    (sfr->get(is->src_reg)&(is->src_mask))?
                     "YES":"no");
       con->dd_printf(" %-3s", (is->active)?"act":"no");
-      con->dd_printf(" %s", is->name);
+      con->dd_printf(" %s", object_name(is));
       con->dd_printf("\n");
     }
   con->dd_printf("Active interrupt service(s):\n");
@@ -158,7 +159,8 @@ cl_interrupt::print_info(class cl_console *con)
          con->dd_printf("  %2d", il->level);
          con->dd_printf(" 0x%06x", il->addr);
          con->dd_printf(" 0x%06x", il->PC);
-         con->dd_printf(" %s", (il->source)?(il->source->name):"nothing");
+         con->dd_printf(" %s", (il->source)?(object_name(il->source)):
+                        "nothing");
          con->dd_printf("\n");
        }
     }