WebSVN – HelenOS – Diff – //branches/tracing/uspace/app/debug/arch/mips32/src/mips32.c

 /** @file
  */
 #include <stdio.h>
 #include <stdlib.h>
+#include <assert.h>
 #include <sys/types.h>
 #include <udebug.h>
 #include "../../../cons.h"
 #include "../../../main.h"
 static istate_t istate;
 int arch_breakpoint_set(breakpoint_t *b)
+{
-    uint32_t brkp;
-    int rc;
-    rc = udebug_mem_read(app_phone, &b->arch.back, b->addr,
-        sizeof(b->arch.back));
-    if (rc < 0) return rc;
-    cons_printf("udebug_mem_read() -> %d\n", rc);
-    brkp = OPCODE_BREAK;
-    rc = udebug_mem_write(app_phone, &brkp, b->addr, sizeof(brkp));
+    return bstore_push(&b->arch.bs, b->addr, OPCODE_BREAK);
-    cons_printf("udebug_mem_write() -> %d\n", rc);
-    if (rc < 0) return rc;
-    return 0;
+}
 int arch_breakpoint_remove(breakpoint_t *b)
+{
-    int rc;
-    if (b->active) {
-        rc = udebug_mem_write(app_phone, &b->arch.back, b->addr + 4, 4);
+    return bstore_pop(&b->arch.bs);
-        if (rc < 0) {
-            cons_printf("error writing memory\n");
-            return rc;
-        }
-        active_bkpt = NULL;
-    } else {
-            rc = udebug_mem_write(app_phone, &b->arch.back, b->addr, 4);
-        if (rc < 0) {
-            cons_printf("error writing memory\n");
-            return rc;
-        }
-    }
-    return 0;
+}
-void arch_event_breakpoint(thash_t thread_hash)
+static void _ev_breakpoint(thash_t thread_hash)
+{
     breakpoint_t *b;
     dthread_t *dt;
     int rc;
     uint32_t epc;
     cons_printf("udebug_regs_read -> %d\n", rc);
     epc = istate_get_pc(&istate);
     cons_printf("EPC was 0x%08x\n", epc);
     brk_addr = epc;
-    b = breakpoint_find_by_addr(brk_addr);
-    if (b != NULL) {
-        cons_printf("move breakpoint\b");
-            rc = udebug_mem_write(app_phone, &b->arch.back, brk_addr, 4);
-        rc = udebug_mem_read(app_phone, &b->arch.back, brk_addr + 4, 4);
-            rc = udebug_mem_write(app_phone, &brkp, brk_addr + 4, 4);
-        active_bkpt = b;
-        b->active = true;
-        cons_printf("breakpoint_hit...\n");
-        breakpoint_hit(b);
+    dt = dthread_get();
-        cons_printf("end_hit...\n");
-        return;
-    }
+    if (active_bkpt != NULL) {
-    b = breakpoint_find_by_addr(brk_addr - 4);
+        assert(active_bkpt->arch.bs.address == brk_addr);
-    if (b != NULL && b->active) {
+        /* A breakpoint-clearing BRK has been hit */
         cons_printf("restoring breakpoint %d\n", b->id);
-            rc = udebug_mem_write(app_phone, &b->arch.back, brk_addr, 4);
+        rc = bstore_pop(&b->arch.bs);
+        if (rc != 0) return;
-        rc = udebug_mem_read(app_phone, &b->arch.back, brk_addr - 4, 4);
+        rc = bstore_push(&b->arch.bs, brk_addr - 4, OPCODE_BREAK);
-            rc = udebug_mem_write(app_phone, &brkp, brk_addr - 4, 4);
+        if (rc != 0) return;
         active_bkpt = NULL;
-        if (dt->arch.singlestep) {
-            singlestep_hit();
-            rc = udebug_mem_read(app_phone, &dt->arch.sstep_back, brk_addr + 4, 4);
-            rc = udebug_mem_write(app_phone, &brkp, brk_addr + 4, 4);
-        }
         return;
+    }
+    b = breakpoint_find_by_addr(brk_addr);
+    if (b == NULL) {
+        cons_printf("Unrecognized breakpoint at 0x%lx\n", brk_addr);
+    }
+    /* A breakpoint has been hit */
+    cons_printf("breakpoint_hit...\n");
+    breakpoint_hit(b);
+    /* While in breakpoint_hit(), singlestep was activated */
+    if (dt->arch.singlestep) return;
+    cons_printf("move breakpoint\b");
+    rc = bstore_pop(&b->arch.bs);
+    if (rc != 0) return;
+    /*
+     * There could be another breakpoint at brk_addr + 4,
+     * but that's okay. We'll pop the active breakpoint bs
+     * before doing anything else.
+     */
+    rc = bstore_push(&b->arch.bs, brk_addr + 4, OPCODE_BREAK);
+    if (rc != 0) return;
+    active_bkpt = b;
+    b->active = true;
+    cons_printf("end_hit...\n");
+}
+static void _ev_singlestep(thash_t thread_hash)
+{
+    dthread_t *dt;
+    int rc;
+    uint32_t epc;
+    int brk_addr;
+    uint32_t brkp;
     dt = dthread_get();
-    if (dt->arch.singlestep) {
+    assert(active_bkpt == NULL);
-        cons_printf("advance singlestep\n");
+    assert(dt->arch.singlestep);
-            rc = udebug_mem_write(app_phone, &dt->arch.sstep_back, brk_addr, 4);
-        rc = udebug_mem_read(app_phone, &dt->arch.sstep_back, brk_addr + 4, 4);
+    brkp = OPCODE_BREAK;
-            rc = udebug_mem_write(app_phone, &brkp, brk_addr + 4, 4);
+    cons_printf("arch_event_breakpoint\n");
+    rc = udebug_regs_read(app_phone, thread_hash, &istate);
+    cons_printf("udebug_regs_read -> %d\n", rc);
-        singlestep_hit();
+    epc = istate_get_pc(&istate);
+    cons_printf("EPC was 0x%08x\n", epc);
+    brk_addr = epc;
+    if (dt->arch.cur.valid) {
+        cons_printf("restore breakpoint BRK\n");
-        return;
+        rc = bstore_pop(&dt->arch.cur);
+    }
-    cons_printf("Unrecognized breakpoint at 0x%lx\n", brk_addr);
+    cons_printf("clear singlestep BRK\n");
+    rc = bstore_pop(&dt->arch.next);
+    dt->arch.singlestep = false;
+    singlestep_hit();
+}
+void arch_event_breakpoint(thash_t thread_hash)
+{
+    dthread_t *dt;
+    dt = dthread_get();
+    if (dt->arch.singlestep) {
+        _ev_singlestep(thread_hash);
+    } else {
+        _ev_breakpoint(thread_hash);
+    }
+}
 void arch_event_trap(dthread_t *dt)
+{
     /* Unused */
     (void)dt;
+}
 void arch_dump_regs(thash_t thash)
+{
+    /* TODO */
+}
-void arch_set_singlestep(dthread_t *dt, int enable)
+void arch_singlestep(dthread_t *dt)
+{
     int rc;
     uint32_t epc;
-    uint32_t brk;
+    breakpoint_t *b;
-    breakpoint_t *b1, *b2;
+    uint32_t old_instr;
-    brk = OPCODE_BREAK;
+    assert(active_bkpt == NULL);
+    assert(dt->arch.singlestep == false);
-    cons_printf("arch_set_singlestep(dt, %d)\n", enable);
+    cons_printf("arch_singlestep(dt)\n");
     rc = udebug_regs_read(app_phone, dt->hash, &istate);
     cons_printf("udebug_regs_read -> %d\n", rc);
     epc = istate_get_pc(&istate);
     cons_printf("EPC was 0x%08x\n", epc);
-    b1 = breakpoint_find_by_addr(epc - 4);
+    cons_printf("initial set singlestep\n");
-    b2 = breakpoint_find_by_addr(epc);
+    b = breakpoint_find_by_addr(epc);
-    if (enable && !dt->arch.singlestep) {
-        if (b1 && b1->active) {
+    if (b != NULL) {
-            dt->arch.sstep_back = b1->arch.back;
+        /* Cover breakpoint with old instruction */
-        } else if (b2) {
-            dt->arch.sstep_back = b2->arch.back;
+        old_instr = b->arch.bs.value;
-        } else {
-            cons_printf("initial set singlestep\b");
-            rc = udebug_mem_read(app_phone, &dt->arch.sstep_back, epc + 4, 4);
+        rc = bstore_push(&dt->arch.cur, epc, old_instr);
-            rc = udebug_mem_write(app_phone, &brk, epc + 4, 4);
-            if (rc < 0) { cons_printf("error writing mem\n"); return; }
-        }
-    } else if (!enable && dt->arch.singlestep) {
-        if ((b1 && b1->active) || b2) {
+        if (rc < 0) return;
-            /* Do not remove BRK instruction */
-        } else  {
-            cons_printf("remove singlestep\b");
-            rc = udebug_mem_write(app_phone, &dt->arch.sstep_back, epc + 4, 4);
-        }
+    }
+    /* Cover next instruction with BREAK */
+    rc = bstore_push(&dt->arch.next, epc + 4, OPCODE_BREAK);
+    if (rc < 0) return;
-    dt->arch.singlestep = enable;
+    dt->arch.singlestep = true;
+    dthread_resume(dt);
+}
 /** @}
  */

Subversion Repositories HelenOS

(root)//branches/tracing/uspace/app/debug/arch/mips32/src/mips32.c – Rev 3012 → 3093