--- a/trace.c	Mon Jul 09 14:54:43 2018 +0900
+++ b/trace.c	Tue Jul 10 10:49:07 2018 +0900
@@ -107,10 +107,10 @@
         int adr,skip;
         if (bpskip) { // skip unbreak instruction
             bpskip--;
-            int lpc = paddr(pcreg,mmu);
+            int ppc = paddr(pcreg,mmu);
             BPTR *prev = &breakpoint;
             for(BPTR b = breakpoint; b ; prev=&b->next, b=b->next ) {
-                if (lpc==b->address) {
+                if (ppc==b->address /* || pcreg==b->laddr */) {
                     if (b->count==-1) {  // temporaly break point
                         BPTR next = b->next;
                         free(b);
@@ -335,6 +335,9 @@
         case 'R':
                 pcreg = (mem[0xfffe] << 8) + mem[0xffff];
                 bpskip = 0;
+#ifdef USE_MMU
+                mmu = &mem[0xffa0];
+#endif
                 attention = escape = 1;
                 break;
         }