/sys/lib/dist/mkfile: adjust 2GB for pi3 and zynq img

[plan9front.git] / sys / lib / acid / 386

diff --git a/sys/lib/acid/386 b/sys/lib/acid/386
index 5ae46fd8367e961e2ed008d7c4fd10cf8ca72d43..fb7a8ad29142d1243d62513080ddeefa6502987a 100644 (file)
--- a/sys/lib/acid/386
+++ b/sys/lib/acid/386
@@ -4,6 +4,8 @@ defn acidinit()                 // Called after all the init modules are loaded
 {
        bplist = {};
        bpfmt = 'b';
+       wplist = {};
+       wpflush();
 
        srcpath = {
                "./",
@@ -84,13 +86,18 @@ defn pstop(pid)
        local l;
        local pc;
 
-       pc = *PC;
+       pc = (*PC)\i;
+       
+       if notes && regexp("^sys: watchpoint ", notes[0]) then
+               pc--;
 
        print(pid,": ", reason(*TRAP), "\t");
-       print(fmt(pc, 'a'), "\t", fmt(pc, 'i'), "\n");
+       print(fmt(pc, 'a'), "\t", pc, "\n");
 
        if notes then {
-               if notes[0] != "sys: breakpoint" then {
+               if regexp("^sys: watchpoint ", notes[0]) then
+                       wpprocess();
+               else if notes[0] != "sys: breakpoint" then {
                        print("Notes pending:\n");
                        l = notes;
                        while l do {