- the big mergecheit

z80debug.cpp

@@ -801,6 +801,7 @@ namespace z80debug
         } else if (strcmp(cmd, "r")==0 || strcmp(cmd, "reset")==0) {
             z80::reset();
             z80::connect_port(0xfe, zx_ula::port_in, zx_ula::port_out);
+            history::reset();
             z80debug::refresh();
             z80analyze::refresh();
         } else if (strcmp(cmd, "b")==0 || strcmp(cmd, "break")==0) {
@@ -897,6 +898,7 @@ namespace z80debug
             else if (strcmp(cmd, "d")==0) { getcmd(); int value = getnum(cmd); z80::getRegs()[5] = value; }
             else if (strcmp(cmd, "l")==0) { getcmd(); int value = getnum(cmd); z80::getRegs()[6] = value; }
             else if (strcmp(cmd, "h")==0) { getcmd(); int value = getnum(cmd); z80::getRegs()[7] = value; }
+            else if (strcmp(cmd, "pc")==0) { getcmd(); int value = getnum(cmd); z80::getRegs()[24] = value&0xff; z80::getRegs()[25] = (value>>8)&0xff; }
             else { sendToConsoleLog("Syntax error: invalid register"); return; }
         } else if (strcmp(cmd, "g")==0 || strcmp(cmd, "goto")==0) {
             getcmd();
@@ -1149,6 +1151,12 @@ namespace z80debug
 
     namespace history
     {
+        void reset()
+        {
+            buffer[0]=buffer[1]=0;
+            cursor=pos=top=0;
+        }
+
         void store()
         {
             buffer[++top] = z80::getPC();