Updated with various bits from espec (memory menu, GUI, etc)

1 files changed, 851 insertions, 98 deletions

diff --git a/src/memmenu.c b/src/memmenu.c
index 3bb800c..95429f9 100644
--- a/src/memmenu.c
+++ b/src/memmenu.c
@@ -26,6 +26,7 @@
 static const char ident[]="$Id$";
 
 #include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
 #include <ctype.h>
 
@@ -33,33 +34,112 @@ static const char ident[]="$Id$";
 #include "zx81.h"
 #include "gfx.h"
 #include "gui.h"
+#include "util.h"
 
 #include <SDL.h>
 
 static const char ident_h[]=EZX81_MEMMENU_H;
 
 #ifndef TRUE
-#define TRUE 1
+#define TRUE		1
 #endif
 
 #ifndef FALSE
-#define FALSE 0
+#define FALSE		0
 #endif
 
-#define WHITE	GFXRGB(255,255,255)
-#define BLACK	GFXRGB(0,0,0)
-#define RED	GFXRGB(255,100,100)
-#define GREEN	GFXRGB(100,255,100)
-#define BLUE	GFXRGB(100,100,255)
+#define WHITE		GFXRGB(255,255,255)
+#define BLACK		GFXRGB(0,0,0)
+#define RED		GFXRGB(255,100,100)
+#define GREEN		GFXRGB(100,255,100)
+#define BLUE		GFXRGB(100,100,255)
 
-#define MENU
+#define TRACE		"trace"
+#define TRACEMEM_WIN	6
+
+
+/* ---------------------------------------- TYPES
+*/
+typedef struct
+{
+    int		no;
+    int		*active;
+    char	**expr;
+} Breakpoint;
+
+
+typedef struct
+{
+    Z80Word	addr;
+    Z80Word	val;
+} MemTrace;
+
+
+typedef struct
+{
+    Z80State	s;
+    MemTrace	hl[TRACEMEM_WIN];
+    MemTrace	de[TRACEMEM_WIN];
+    MemTrace	sp[TRACEMEM_WIN];
+} Trace;
+
+
+/* ---------------------------------------- STATIC DATA
+*/
+static FILE		*trace=NULL;
+static Breakpoint	bpoint={0,NULL,NULL};
+static const char	*brk=NULL;
+static int		lodged=FALSE;
+
+
+/* ---------------------------------------- PROTOS
+*/
+static int		Instruction(Z80 *z80, Z80Val data);
 
 
 /* ---------------------------------------- PRIVATE FUNCTIONS
 */
+static int BreaksActive(void)
+{
+    int f;
+    int ret=FALSE;
+
+    for(f=0;f<bpoint.no;f++)
+    	ret|=bpoint.active[f];
+
+    return ret;
+}
+
+
+static void SetCallback(Z80 *z80)
+{
+    if ((trace || BreaksActive()) && !lodged)
+    {
+	Z80LodgeCallback(z80,eZ80_Instruction,Instruction);
+	lodged=TRUE;
+    }
+}
+
+
+static void ClearCallback(Z80 *z80)
+{
+    if (!trace && !BreaksActive() && lodged)
+    {
+	Z80RemoveCallback(z80,eZ80_Instruction,Instruction);
+	lodged=FALSE;
+    }
+}
+
+
 static void Centre(const char *p, int y, Uint32 col)
 {
-    GFXPrint((320-strlen(p)*8)/2,y,col,"%s",p);
+    GFXPrint((GFX_WIDTH-strlen(p)*8)/2,y,col,"%s",p);
+}
+
+
+static void CentrePaper(const char *p, int y, Uint32 pen, Uint32 paper)
+{
+    GFXPrintPaper((GFX_WIDTH-strlen(p)*8)/2,y,pen,paper,"%s",p);
 }
 
 
@@ -67,8 +147,19 @@ static void DisplayMenu(void)
 {
     static const char *menu[]=
     {
-    	"1. Disassemble/Hex dump",
-    	"2. Return              ",
+    	"1   - Disassemble/Hex dump  ",
+    	"2   - Disassemble to file   ",
+	"3   - Start/Stop trace log  ",
+	"4   - Playback trace log    ",
+	"5   - Add a new breakpoint  ",
+	"6   - Set active breakpoints",
+	"7   - Remove a breakpoint   ",
+	"8   - Clear all breakpoints ",
+	"9   - Monitor               ",
+	"R   - Reset                 ",
+	"S   - Show current CPU state",
+	"X   - Exit (without confirm)",
+    	"ESC - Return                ",
 	NULL
     };
 
@@ -77,13 +168,13 @@ static void DisplayMenu(void)
     GFXClear(BLACK);
 
     Centre("MEMORY MENU",0,WHITE);
-    Centre("Select an option",8,WHITE);
+    Centre("Select an option",10,RED);
 
     f=0;
 
     while(menu[f])
     {
-    	Centre(menu[f],20+f*10,WHITE);
+    	Centre(menu[f],25+f*10,WHITE);
 	f++;
     }
 }
@@ -105,66 +196,56 @@ static const char *FlagString(Z80Byte flag)
 }
 
 
-static int StrEq(const char *a, const char *b)
-{
-    while(*a && *b && tolower(*a)==tolower(*b))
-    {
-    	a++;
-	b++;
-    }
-
-    if (*a || *b)
-	return FALSE;
-    else
-	return TRUE;
-}
-
-
-static Z80Word Address(Z80 *z80, const char *p)
+int DisplayZ80State(Z80State *s, int y, Uint32 col)
 {
-    Z80State s;
-
-    Z80GetState(z80,&s);
+    GFXPrintPaper(0,y,col,BLACK,
+		  "PC=%4.4x  A=%2.2x     F=%s",
+		  s->PC,s->AF>>8,FlagString(s->AF&0xff));
+    y+=8;
+    GFXPrintPaper(0,y,col,BLACK,
+    		  "BC=%4.4x  DE=%4.4x  HL=%4.4x",
+		  s->BC,s->DE,s->HL);
+    y+=8;
+    GFXPrintPaper(0,y,col,BLACK,
+    		  "IX=%4.4x  IY=%4.4x  SP=%4.4x",
+		  s->IX,s->IY,s->SP);
+    y+=8;
+    GFXPrintPaper(0,y,col,BLACK,
+    		  "AF'=%4.4x BC'=%4.4x DE'=%4.4x HL'=%4.4x",
+		  s->AF_,s->BC_,s->DE_,s->HL_);
+    y+=8;
+    GFXPrintPaper(0,y,col,BLACK,
+    		  "I=%2.2x     IM=%2.2x    R=%2.2x",
+		  s->I,s->IM,s->R);
+    y+=8;
+    GFXPrintPaper(0,y,col,BLACK,
+    		  "IFF1=%2.2x  IFF2=%2.2x",
+		  s->IFF1,s->IFF2);
 
-    if (StrEq(p,"AF"))
-    	return s.AF;
-    else if (StrEq(p,"BC"))
-    	return s.BC;
-    else if (StrEq(p,"DE"))
-    	return s.DE;
-    else if (StrEq(p,"HL"))
-    	return s.HL;
-    else if (StrEq(p,"IX"))
-    	return s.IX;
-    else if (StrEq(p,"IY"))
-    	return s.IY;
-    else if (StrEq(p,"SP"))
-    	return s.SP;
-    else if (StrEq(p,"PC"))
-    	return s.PC;
-
-    return (Z80Word)strtoul(p,NULL,0);
+    return y+8;
 }
 
 
-static int EnterAddress(Z80 *z80, Z80Word *w)
+static int EnterAddress(const char *prompt, Z80 *z80, Z80Word *w)
 {
-    unsigned long ul;
     const char *p;
+    char *error;
+    long l;
 
-    p=GUIInputString("Address?","");
+    p=GUIInputString(prompt ? prompt : "Address?","");
 
     if (*p)
     {
-	ul=Address(z80,p);
-
-	if (ul>0xffff)
+	if (!Z80Expression(z80,p,&l,&error))
 	{
-	    GUIMessage("ERROR","Bad address");
+	    GUIMessage(eMessageBox,
+		       "ERROR","%s",error ? error:"Invalid expression");
+
+	    free(error);
 	}
 	else
 	{
-	    *w=(Z80Word)ul;
+	    *w=(Z80Word)l;
 	    return TRUE;
 	}
     }
@@ -173,6 +254,17 @@ static int EnterAddress(Z80 *z80, Z80Word *w)
 }
 
 
+static void EnterLong(const char *prompt, long *l)
+{
+    const char *p;
+
+    p=GUIInputString(prompt ? prompt : "Value?","");
+
+    if (*p)
+    	*l=strtol(p,NULL,0);
+}
+
+
 static void DoDisassem(Z80 *z80, const Z80State *s)
 {
     static int hexmode=FALSE;
@@ -188,31 +280,45 @@ static void DoDisassem(Z80 *z80, const Z80State *s)
 
 	GFXClear(BLACK);
 
-    	Centre("Press F1 for help",0,RED);
+    	Centre("DISASSEMBLY",0,WHITE);
+    	Centre("Press F1 for help",9,RED);
 
 	curr=pc;
 
-	for(f=0;f<21;f++)
+	for(f=0;f<GFX_HEIGHT/8-8;f++)
 	{
 	    char s[80];
 	    char *p;
 	    int y;
 
-	    y=16+f*8;
+	    y=24+f*8;
 
 	    GFXPrint(0,y,GREEN,"%4.4x",curr);
 
 	    if (hexmode)
 	    {
 		int n;
+		char asc[9];
 
 	    	for(n=0;n<8;n++)
 		{
-		    GFXPrint(40+n*24,y,WHITE,"%2.2x",
-		    		(int)ZX81ReadForDisassem(z80,curr));
+		    Z80Byte b;
+
+		    b=ZX81ReadForDisassem(z80,curr);
+
+		    GFXPrint(40+n*24,y,WHITE,"%2.2x",(int)b);
 
 		    curr++;
+
+		    if (isprint(b))
+		    	asc[n]=b;
+		    else
+		    	asc[n]='.';
 		}
+
+		asc[8]=0;
+
+		GFXPrint(40+8*24,y,RED,"%s",asc);
 	    }
 	    else
 	    {
@@ -234,16 +340,16 @@ static void DoDisassem(Z80 *z80, const Z80State *s)
 	{
 	    case SDLK_F1:
 		GUIMessage
-		    ("DISASSEMBLY HELP","%s",
-		       "ESC - Exit\n"
-		       "H - Switch between disassembly/hex\n"
-		       "Enter - Enter address to display\n"
-		       "Cursor Up - Prev op\n"
-		       "Cursor Down - Next op\n"
-		       "Page Up - Move back a page\n"
-		       "Page Down - Move forward a page\n"
-		       "Cursor Left - Move PC by -1024\n"
-		       "Cursor Right - Move PC by 1024");
+		    (eMessageBox, "DISASSEMBLY HELP","%s",
+		       "ESC         - Exit              \n"
+		       "H           - Disassembly/hex   \n"
+		       "Enter       - Enter address     \n"
+		       "Up          - Prev byte         \n"
+		       "Down        - Next op           \n"
+		       "Page Up     - Back 1 page       \n"
+		       "Page Down   - Forward 1 page    \n"
+		       "Left        - Forward 1024 bytes\n"
+		       "Right       - Back 1024 bytes   ");
 		break;
 
 	    case SDLK_ESCAPE:
@@ -256,7 +362,7 @@ static void DoDisassem(Z80 *z80, const Z80State *s)
 
 	    case SDLK_RETURN:
 	    case SDLK_KP_ENTER:
-		EnterAddress(z80,&pc);
+		EnterAddress(NULL,z80,&pc);
 	    	break;
 
 	    case SDLK_UP:
@@ -296,22 +402,619 @@ static void DoDisassem(Z80 *z80, const Z80State *s)
 }
 
 
+static void DoDisassemFile(Z80 *z80, const Z80State *s)
+{
+    static char fname[FILENAME_MAX]="";
+    FILE *fp;
+    Z80Word start;
+    Z80Word len;
+    Z80Word prev;
+    const char *p;
+
+    EnterAddress("Disassemble from?",z80,&start);
+    EnterAddress("For how many bytes?",z80,&len);
+
+    p=GUIInputString("To file?",fname);
+
+    if (!strlen(p))
+    	return;
+
+    strcpy(fname,p);
+
+    if (!(fp=fopen(fname,"w")))
+    {
+    	GUIMessage(eMessageBox,"ERROR","Couldn't create file:\n%s",fname);
+	return;
+    }
+
+    prev=len;
+
+    while(len<=prev)
+    {
+    	Z80Word orig=start;
+
+	fprintf(fp,"%4.4x: %s\n",orig,Z80Disassemble(z80,&start));
+	prev=len;
+	len-=(start-orig);
+    }
+
+    fclose(fp);
+}
+
+
+static void GetMemTrace(Z80 *z80, MemTrace *t, Z80Word from, int count)
+{
+    int f;
+
+    f=0;
+
+    while(f<count)
+    {
+	Z80Word w;
+
+	w=(Z80Word)ZX81ReadForDisassem(z80,from)|
+	  (Z80Word)ZX81ReadForDisassem(z80,from+1)<<8;
+
+	t[f].addr=from;
+	t[f].val=w;
+
+    	from+=2;
+	f++;
+    }
+}
+
+
+static int Instruction(Z80 *z80, Z80Val data)
+{
+    int f;
+
+    if (trace)
+    {
+	Trace t;
+
+	Z80GetState(z80,&t.s);
+
+	GetMemTrace(z80,t.hl,t.s.HL-(TRACEMEM_WIN/2+1),TRACEMEM_WIN);
+	GetMemTrace(z80,t.de,t.s.DE-(TRACEMEM_WIN/2+1),TRACEMEM_WIN);
+	GetMemTrace(z80,t.sp,t.s.SP-(TRACEMEM_WIN/2+1),TRACEMEM_WIN);
+
+	fwrite(&t,sizeof t,1,trace);
+    }
+
+    for(f=0;f<bpoint.no;f++)
+	if (bpoint.active[f])
+	{
+	    long l;
+
+	    if (Z80Expression(z80,bpoint.expr[f],&l,NULL))
+	    {
+		if (l)
+		    brk=bpoint.expr[f];
+	    }
+	}
+
+    return TRUE;
+}
+
+
+static void EnableTrace(Z80 *z80, Z80State *s)
+{
+    if (!trace)
+    {
+    	trace=fopen(TRACE,"wb");
+
+	if (trace)
+	{
+	    GUIMessage(eMessageBox,"NOTICE","Created trace log");
+	    SetCallback(z80);
+	}
+	else
+	{
+	    GUIMessage(eMessageBox,"ERROR","Failed to create trace log");
+	}
+    }
+}
+
+
+static void DisableTrace(Z80 *z80)
+{
+    if (trace)
+    {
+	GUIMessage(eMessageBox,"NOTICE","Closing current trace log");
+    	fclose(trace);
+	trace=NULL;
+	ClearCallback(z80);
+    }
+}
+
+
+static void DisplayTraceMem(int x, int y, const char *name,
+			    MemTrace *m, Z80Word expect)
+{
+    int f;
+
+    GFXPrint(x,y,GREEN,"%s",name);
+
+    for(f=0;f<TRACEMEM_WIN;f++)
+    {
+	Uint32 paper;
+
+	if (m[f].addr==expect)
+	    paper=RED;
+	else
+	    paper=BLACK;
+
+    	GFXPrintPaper(x,y+f*8+12,GREEN,paper,"%4.4x",m[f].addr);
+    	GFXPrintPaper(x+32,y+f*8+12,WHITE,paper," %4.4x",m[f].val);
+    }
+}
+
+static void PlaybackTrace(Z80 *z80)
+{
+    static int showmem=FALSE;
+    FILE *fp;
+    int quit;
+    long prev_pos;
+    long pos;
+    long max_pos;
+    Z80Word pc;
+    Trace t;
+
+    fp=fopen(TRACE,"rb");
+
+    if (!fp)
+    {
+	GUIMessage(eMessageBox,"ERROR","Couldn't open trace file");
+	return;
+    }
+
+    fseek(fp,0,SEEK_END);
+
+    max_pos=ftell(fp)/sizeof t;
+
+    if (max_pos==0)
+    {
+	GUIMessage(eMessageBox,"ERROR","Empty trace file");
+	fclose(fp);
+	return;
+    }
+
+    pos=0;
+    prev_pos=pos;
+    pc=0;
+    quit=FALSE;
+
+    while(!quit)
+    {
+	SDL_Event *e;
+	size_t rd;
+	int f;
+
+	GFXClear(BLACK);
+
+    	Centre("TRACE PLAYBACK",0,WHITE);
+    	Centre("Press F1 for help",9,RED);
+
+	fseek(fp,pos*sizeof t,SEEK_SET);
+	fread(&t,sizeof t,1,fp);
+
+	if (showmem)
+	{
+	    DisplayTraceMem(0,136,"MEM (SP)",t.sp,t.s.SP);
+	    DisplayTraceMem(100,136,"MEM (HL)",t.hl,t.s.HL);
+	    DisplayTraceMem(200,136,"MEM (DE)",t.de,t.s.DE);
+	}
+	else
+	    DisplayZ80State(&t.s,136,WHITE);
+
+	for(f=0;f<10;f++)
+	{
+	    char str[80];
+	    char *p;
+	    int paper;
+	    int y;
+
+	    y=24+f*8;
+
+	    if (f==0)
+		paper=RED;
+	    else
+		paper=BLACK;
+
+	    GFXPrintPaper(0,y,GREEN,paper,"%4.4x ",t.s.PC);
+
+	    strcpy(str,Z80Disassemble(z80,&t.s.PC));
+	    p=strtok(str,";");
+	    GFXPrintPaper(40,y,WHITE,paper,"%s",str);
+	}
+
+	GFXPrint(0,112,GREEN,"Current step: %ld",pos+1);
+	GFXPrint(0,120,GREEN,"Total steps : %ld",max_pos);
+
+	prev_pos=pos;
+
+	GFXEndFrame(FALSE);
+
+	e=GFXWaitKey();
+
+	switch(e->key.keysym.sym)
+	{
+	    case SDLK_F1:
+		GUIMessage
+		    (eMessageBox,"PLAYBACK HELP","%s",
+		       "ESC       - Exit                     \n"
+		       "Enter     - Step number              \n"
+		       "P         - Search for PC            \n"
+		       "M         - Toggle CPU state/memory  \n"
+		       "Up        - Prev step                \n"
+		       "Down      - Next step                \n"
+		       "Page Up   - Back 50 steps            \n"
+		       "Page Down - Forward 50 steps         \n"
+		       "Left      - Back 1000 steps          \n"
+		       "Right     - Forward 1000 steps       \n \n"
+		       "NOTE: Disassembly is as memory is NOW");
+		break;
+
+	    case SDLK_ESCAPE:
+	    	quit=TRUE;
+		break;
+
+	    case SDLK_RETURN:
+	    case SDLK_KP_ENTER:
+		EnterLong("Step number?",&pos);
+		pos--;
+		break;
+
+	    case SDLK_p:
+		if (EnterAddress("PC to search for?",z80,&pc))
+		{
+		    while((rd=fread(&t,sizeof t,1,fp))==1)
+		    {
+			pos++;
+			if (t.s.PC==pc)
+			    break;
+		    }
+
+		    if (rd!=1)
+		    {
+		    	GUIMessage(eMessageBox,"NOTICE","Address not found");
+			pos=prev_pos;
+		    }
+		}
+	    	break;
+
+	    case SDLK_m:
+		showmem=!showmem;
+	    	break;
+
+	    case SDLK_UP:
+		pos--;
+	    	break;
+
+	    case SDLK_DOWN:
+		pos++;
+	    	break;
+
+	    case SDLK_PAGEUP:
+		pos-=50;
+		break;
+
+	    case SDLK_PAGEDOWN:
+	    	pos+=50;
+		break;
+
+	    case SDLK_LEFT:
+	    	pos-=1000;
+		break;
+
+	    case SDLK_RIGHT:
+	    	pos+=1000;
+		break;
+
+	    default:
+	    	break;
+	}
+
+	/* Check position before next loop
+	*/
+	if (pos<0)
+	    pos=0;
+
+	if (pos>=max_pos)
+	    pos=max_pos-1;
+    }
+
+    fclose(fp);
+}
+
+
+static void DoAddBreakpoint(Z80 *z80)
+{
+    const char *expr;
+    char *error;
+    long l;
+
+    expr=GUIInputString("Expression?","");
+
+    if (!*expr)
+    	return;
+
+    if (!Z80Expression(z80,expr,&l,&error))
+    {
+	if (error)
+	{
+	    GUIMessage(eMessageBox,"INVALID EXPRESSION","%s",error);
+	    free(error);
+	}
+	else
+	{
+	    GUIMessage(eMessageBox,"ERROR","Expression is invalid");
+	    free(error);
+	}
+    }
+    else
+    {
+	bpoint.no++;
+	bpoint.expr=Realloc(bpoint.expr,bpoint.no * sizeof(*bpoint.expr));
+	bpoint.active=Realloc(bpoint.active,bpoint.no * sizeof(*bpoint.active));
+
+	bpoint.expr[bpoint.no-1]=StrCopy(expr);
+	bpoint.active[bpoint.no-1]=TRUE;
+
+	SetCallback(z80);
+    }
+}
+
+
+static void DoActiveBreakpoint(Z80 *z80)
+{
+    if (bpoint.no==0)
+    {
+	GUIMessage(eMessageBox,"NOTICE","No breakpoints to set");
+	return;
+    }
+
+    GFXClear(BLACK);
+
+    GUIListOption("SELECT ACTIVE BREAKPOINTS",
+		  bpoint.no,bpoint.expr,bpoint.active);
+}
+
+
+static void DoRemoveBreakpoint(Z80 *z80)
+{
+    int sel;
+
+    if (bpoint.no==0)
+    {
+	GUIMessage(eMessageBox,"NOTICE","No breakpoints to delete");
+	return;
+    }
+
+    GFXClear(BLACK);
+
+    sel=GUIListSelect("BREAKPOINT TO DELETE",bpoint.no,bpoint.expr);
+
+    while (sel!=-1)
+    {
+	int f;
+
+	free(bpoint.expr[sel]);
+
+	for(f=sel;f<bpoint.no-1;f++)
+	{
+	    bpoint.expr[f]=bpoint.expr[f+1];
+	    bpoint.active[f]=bpoint.active[f+1];
+	}
+
+	bpoint.no--;
+
+	if (bpoint.no==0)
+	{
+	    free(bpoint.expr);
+	    bpoint.expr=NULL;
+	    bpoint.active=NULL;
+	}
+	else
+	{
+	    bpoint.expr=Realloc(bpoint.expr,
+				bpoint.no * sizeof(*bpoint.expr));
+	    bpoint.active=Realloc(bpoint.active,
+				  bpoint.no * sizeof(*bpoint.active));
+	}
+
+	ClearCallback(z80);
+
+	sel=GUIListSelect("BREAKPOINT TO DELETE",bpoint.no,bpoint.expr);
+    }
+}
+
+
+static void DoClearBreakpoint(Z80 *z80)
+{
+    if (GUIMessage(eYesNoBox,"BREAKPOINTS","Clear all breakpoints"))
+    {
+	int f;
+
+	for(f=0;f<bpoint.no;f++)
+	    free(bpoint.expr[f]);
+
+	free(bpoint.expr);
+	bpoint.expr=NULL;
+	bpoint.no=0;
+
+	ClearCallback(z80);
+    }
+}
+
+
+static void DoMonitor(Z80 *z80)
+{
+    static int showmem=FALSE;
+    int quit=FALSE;
+    int running=FALSE;
+    int step=FALSE;
+
+    ZX81EnableScreen(FALSE);
+
+    while(!quit)
+    {
+	MemTrace mt[TRACEMEM_WIN];
+	const char *brk;
+	SDL_Event *e;
+	Z80State s;
+	int f;
+
+	step=FALSE;
+
+	GFXClear(BLACK);
+
+    	CentrePaper("MONITOR",0,WHITE,BLACK);
+    	CentrePaper("Press F1 for help",9,RED,BLACK);
+
+	Z80GetState(z80,&s);
+
+	if (showmem)
+	{
+	    GetMemTrace(z80,mt,s.SP-(TRACEMEM_WIN/2+1),TRACEMEM_WIN);
+	    DisplayTraceMem(0,136,"MEM (SP)",mt,s.SP);
+	    GetMemTrace(z80,mt,s.HL-(TRACEMEM_WIN/2+1),TRACEMEM_WIN);
+	    DisplayTraceMem(100,136,"MEM (HL)",mt,s.HL);
+	    GetMemTrace(z80,mt,s.DE-(TRACEMEM_WIN/2+1),TRACEMEM_WIN);
+	    DisplayTraceMem(200,136,"MEM (DE)",mt,s.DE);
+	}
+	else
+	{
+	    int y;
+
+	    y=DisplayZ80State(&s,136,WHITE);
+	    GFXPrint(0,y,GREEN,"%s",ZX81Info(z80));
+	}
+
+	for(f=0;f<10;f++)
+	{
+	    char str[80];
+	    char *p;
+	    int paper;
+	    int y;
+
+	    y=24+f*8;
+
+	    if (f==0)
+		paper=RED;
+	    else
+		paper=BLACK;
+
+	    GFXPrintPaper(0,y,GREEN,paper,"%4.4x ",s.PC);
+
+	    strcpy(str,Z80Disassemble(z80,&s.PC));
+	    p=strtok(str,";");
+	    GFXPrintPaper(40,y,WHITE,paper,"%s",str);
+	}
+
+	GFXEndFrame(FALSE);
+
+	if (running)
+	{
+	    e=GFXGetKey();
+
+	    if (e && e->key.state!=SDL_PRESSED)
+	    	e=NULL;
+	}
+	else
+	    e=GFXWaitKey();
+
+	if (e)
+	{
+	    switch(e->key.keysym.sym)
+	    {
+		case SDLK_F1:
+		    GUIMessage
+			(eMessageBox,"PLAYBACK HELP","%s",
+			   "ESC   - Exit                     \n"
+			   "ENTER - Single step processor    \n"
+			   "R     - Run till break or stop   \n"
+			   "SPACE - Stop running             \n"
+			   "M     - Toggle CPU state/memory  \n"
+			   "5     - Add a new breakpoint     \n"
+			   "6     - Set active breakpoints   \n"
+			   "7     - Remove a breakpoint      \n"
+			   "8     - Clear all breakpoints    ");
+		    break;
+
+		case SDLK_RETURN:
+		case SDLK_KP_ENTER:
+		    step=TRUE;
+		    break;
+
+		case SDLK_ESCAPE:
+		    quit=TRUE;
+		    break;
+
+		case SDLK_r:
+		    running=TRUE;
+		    break;
+
+		case SDLK_SPACE:
+		    running=FALSE;
+		    break;
+
+		case SDLK_m:
+		    showmem=!showmem;
+		    break;
+
+		case SDLK_5:
+		    DoAddBreakpoint(z80);
+		    break;
+
+		case SDLK_6:
+		    DoActiveBreakpoint(z80);
+		    break;
+
+		case SDLK_7:
+		    DoRemoveBreakpoint(z80);
+		    break;
+
+		case SDLK_8:
+		    DoClearBreakpoint(z80);
+		    break;
+
+		default:
+		    break;
+	    }
+	}
+
+	if (running || step)
+	    Z80SingleStep(z80);
+
+	if (running && (brk=Break()))
+	{
+	    GUIMessage(eMessageBox,"BREAKPOINT","%s",brk);
+	    running=FALSE;
+	}
+    }
+
+    ZX81EnableScreen(TRUE);
+}
+
+
 /* ---------------------------------------- EXPORTED INTERFACES
 */
-void MemoryMenu(Z80 *z80)
+int MemoryMenu(Z80 *z80)
 {
     SDL_Event *e;
+    int done=FALSE;
     int quit=FALSE;
     Z80State s;
+    int y;
 
     Z80GetState(z80,&s);
 
     GFXKeyRepeat(TRUE);
 
-    while(!quit)
+    while(!done)
     {
 	DisplayMenu();
-	DisplayState(z80);
 	GFXEndFrame(FALSE);
 
 	e=GFXWaitKey();
@@ -322,17 +1025,78 @@ void MemoryMenu(Z80 *z80)
 	    	DoDisassem(z80,&s);
 		break;
 
-	    case SDLK_ESCAPE:
 	    case SDLK_2:
+	    	DoDisassemFile(z80,&s);
+	    	break;
+
+	    case SDLK_3:
+		if (!trace)
+		    EnableTrace(z80,&s);
+		else
+		    DisableTrace(z80);
+	    	break;
+
+	    case SDLK_4:
+		DisableTrace(z80);
+	    	PlaybackTrace(z80);
+		break;
+
+	    case SDLK_5:
+		DoAddBreakpoint(z80);
+	    	break;
+
+	    case SDLK_6:
+		DoActiveBreakpoint(z80);
+	    	break;
+
+	    case SDLK_7:
+		DoRemoveBreakpoint(z80);
+	    	break;
+
+	    case SDLK_8:
+		DoClearBreakpoint(z80);
+	    	break;
+
+	    case SDLK_9:
+		DoMonitor(z80);
+	    	break;
+
+	    case SDLK_r:
+	    	if (GUIMessage(eYesNoBox,"RESET","Sure?"))
+		{
+		    Z80Reset(z80);
+		    ZX81Reset(z80);
+		}
+		break;
+
+	    case SDLK_x:
+	    	done=TRUE;
 	    	quit=TRUE;
 		break;
 
+	    case SDLK_s:
+		GFXClear(BLACK);
+		Centre("CURRENT STATE",0,WHITE);
+		Centre("Press a key",9,RED);
+		y=DisplayZ80State(&s,20,WHITE);
+		GFXPrint(0,y,GREEN,"%s",ZX81Info(z80));
+		GFXEndFrame(FALSE);
+		GFXWaitKey();
+		break;
+
+	    case SDLK_ESCAPE:
+	    	done=TRUE;
+		break;
+
 	    default:
 	    	break;
 	}
     }
 
     GFXKeyRepeat(FALSE);
+
+    GFXClear(BLACK);
+    return quit;
 }
 
 
@@ -342,31 +1106,20 @@ void DisplayState(Z80 *z80)
     int y;
 
     Z80GetState(z80,&s);
+    y=DisplayZ80State(&s,GFX_HEIGHT/2,RED);
+    GFXPrintPaper(0,y,GREEN,BLACK,"%s",ZX81Info(z80));
+}
 
-    y=136;
-
-    GFXPrintPaper(0,y,RED,BLACK,"PC=%4.4x  A=%2.2x     F=%s",
-                    s.PC,s.AF>>8,FlagString(s.AF&0xff));
-    y+=8;
-
-    GFXPrintPaper(0,y,RED,BLACK,"BC=%4.4x  DE=%4.4x  HL=%4.4x",s.BC,s.DE,s.HL);
-    y+=8;
-
-    GFXPrintPaper(0,y,RED,BLACK,"IX=%4.4x  IY=%4.4x  SP=%4.4x",s.IX,s.IY,s.SP);
-    y+=8;
 
-    GFXPrintPaper(0,y,RED,BLACK,"I=%2.2x     IM=%2.2x    R=%2.2x",s.I,s.IM,s.R);
-    y+=8;
+const char *Break(void)
+{
+    const char *ret;
 
-    GFXPrintPaper(0,y,RED,BLACK,"IFF1=%2.2x  IFF2=%2.2x",s.IFF1,s.IFF2);
-    y+=8;
+    ret=brk;
+    brk=NULL;
 
-    y+=8;
-    GFXPrintPaper(0,y,RED,BLACK,"%s\n",ZX81Info(z80));
-    y+=8;
+    return ret;
 }
 
 
-
-
 /* END OF FILE */