summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Makefile133
-rw-r--r--src/main.c1
-rw-r--r--src/memmenu.c301
-rw-r--r--src/memmenu.h2
-rw-r--r--src/spec.h1
5 files changed, 408 insertions, 30 deletions
diff --git a/src/Makefile b/src/Makefile
index 179602c..79b1d6a 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -18,7 +18,7 @@
#
# -------------------------------------------------------------------------
#
-# $Id: Makefile,v 1.3 2004-01-04 23:28:26 ianc Exp $
+# $Id: Makefile,v 1.4 2004-01-05 01:07:07 ianc Exp $
#
@@ -69,3 +69,134 @@ depend:
cd z80; make depend ; cd ..
# DO NOT DELETE THIS LINE -- make depend depends on it
+
+main.o: /usr/include/stdlib.h /usr/include/sys/cdefs.h
+main.o: /usr/include/sys/_types.h /usr/include/machine/_types.h
+main.o: /usr/include/stdio.h /usr/local/include/SDL/SDL.h
+main.o: /usr/local/include/SDL/SDL_main.h /usr/local/include/SDL/SDL_types.h
+main.o: /usr/local/include/SDL/SDL_getenv.h
+main.o: /usr/local/include/SDL/SDL_error.h
+main.o: /usr/local/include/SDL/begin_code.h
+main.o: /usr/local/include/SDL/close_code.h
+main.o: /usr/local/include/SDL/SDL_rwops.h /usr/local/include/SDL/SDL_timer.h
+main.o: /usr/local/include/SDL/SDL_audio.h
+main.o: /usr/local/include/SDL/SDL_byteorder.h
+main.o: /usr/local/include/SDL/SDL_cdrom.h
+main.o: /usr/local/include/SDL/SDL_joystick.h
+main.o: /usr/local/include/SDL/SDL_events.h
+main.o: /usr/local/include/SDL/SDL_active.h
+main.o: /usr/local/include/SDL/SDL_keyboard.h
+main.o: /usr/local/include/SDL/SDL_keysym.h
+main.o: /usr/local/include/SDL/SDL_mouse.h /usr/local/include/SDL/SDL_video.h
+main.o: /usr/local/include/SDL/SDL_mutex.h /usr/local/include/SDL/SDL_quit.h
+main.o: /usr/local/include/SDL/SDL_version.h z80/z80.h spec.h gfx.h gui.h
+main.o: memmenu.h config.h exit.h
+spec.o: /usr/include/stdlib.h /usr/include/sys/cdefs.h
+spec.o: /usr/include/sys/_types.h /usr/include/machine/_types.h
+spec.o: /usr/include/stdio.h /usr/include/string.h /usr/include/strings.h
+spec.o: spec.h z80/z80.h /usr/local/include/SDL/SDL.h
+spec.o: /usr/local/include/SDL/SDL_main.h /usr/local/include/SDL/SDL_types.h
+spec.o: /usr/local/include/SDL/SDL_getenv.h
+spec.o: /usr/local/include/SDL/SDL_error.h
+spec.o: /usr/local/include/SDL/begin_code.h
+spec.o: /usr/local/include/SDL/close_code.h
+spec.o: /usr/local/include/SDL/SDL_rwops.h /usr/local/include/SDL/SDL_timer.h
+spec.o: /usr/local/include/SDL/SDL_audio.h
+spec.o: /usr/local/include/SDL/SDL_byteorder.h
+spec.o: /usr/local/include/SDL/SDL_cdrom.h
+spec.o: /usr/local/include/SDL/SDL_joystick.h
+spec.o: /usr/local/include/SDL/SDL_events.h
+spec.o: /usr/local/include/SDL/SDL_active.h
+spec.o: /usr/local/include/SDL/SDL_keyboard.h
+spec.o: /usr/local/include/SDL/SDL_keysym.h
+spec.o: /usr/local/include/SDL/SDL_mouse.h /usr/local/include/SDL/SDL_video.h
+spec.o: /usr/local/include/SDL/SDL_mutex.h /usr/local/include/SDL/SDL_quit.h
+spec.o: /usr/local/include/SDL/SDL_version.h gfx.h gui.h config.h exit.h
+config.o: /usr/include/stdlib.h /usr/include/sys/cdefs.h
+config.o: /usr/include/sys/_types.h /usr/include/machine/_types.h
+config.o: /usr/include/stdio.h /usr/include/string.h /usr/include/strings.h
+config.o: exit.h config.h
+gfx.o: /usr/include/stdlib.h /usr/include/sys/cdefs.h
+gfx.o: /usr/include/sys/_types.h /usr/include/machine/_types.h
+gfx.o: /usr/include/stdio.h /usr/include/string.h /usr/include/strings.h
+gfx.o: /usr/include/stdarg.h gfx.h /usr/local/include/SDL/SDL.h
+gfx.o: /usr/local/include/SDL/SDL_main.h /usr/local/include/SDL/SDL_types.h
+gfx.o: /usr/local/include/SDL/SDL_getenv.h /usr/local/include/SDL/SDL_error.h
+gfx.o: /usr/local/include/SDL/begin_code.h
+gfx.o: /usr/local/include/SDL/close_code.h /usr/local/include/SDL/SDL_rwops.h
+gfx.o: /usr/local/include/SDL/SDL_timer.h /usr/local/include/SDL/SDL_audio.h
+gfx.o: /usr/local/include/SDL/SDL_byteorder.h
+gfx.o: /usr/local/include/SDL/SDL_cdrom.h
+gfx.o: /usr/local/include/SDL/SDL_joystick.h
+gfx.o: /usr/local/include/SDL/SDL_events.h
+gfx.o: /usr/local/include/SDL/SDL_active.h
+gfx.o: /usr/local/include/SDL/SDL_keyboard.h
+gfx.o: /usr/local/include/SDL/SDL_keysym.h /usr/local/include/SDL/SDL_mouse.h
+gfx.o: /usr/local/include/SDL/SDL_video.h /usr/local/include/SDL/SDL_mutex.h
+gfx.o: /usr/local/include/SDL/SDL_quit.h /usr/local/include/SDL/SDL_version.h
+gfx.o: exit.h config.h font.h
+gui.o: /usr/include/stdlib.h /usr/include/sys/cdefs.h
+gui.o: /usr/include/sys/_types.h /usr/include/machine/_types.h
+gui.o: /usr/include/stdio.h /usr/include/string.h /usr/include/strings.h
+gui.o: /usr/include/stdarg.h /usr/include/ctype.h /usr/include/runetype.h
+gui.o: gui.h /usr/local/include/SDL/SDL.h /usr/local/include/SDL/SDL_main.h
+gui.o: /usr/local/include/SDL/SDL_types.h /usr/local/include/SDL/SDL_getenv.h
+gui.o: /usr/local/include/SDL/SDL_error.h /usr/local/include/SDL/begin_code.h
+gui.o: /usr/local/include/SDL/close_code.h /usr/local/include/SDL/SDL_rwops.h
+gui.o: /usr/local/include/SDL/SDL_timer.h /usr/local/include/SDL/SDL_audio.h
+gui.o: /usr/local/include/SDL/SDL_byteorder.h
+gui.o: /usr/local/include/SDL/SDL_cdrom.h
+gui.o: /usr/local/include/SDL/SDL_joystick.h
+gui.o: /usr/local/include/SDL/SDL_events.h
+gui.o: /usr/local/include/SDL/SDL_active.h
+gui.o: /usr/local/include/SDL/SDL_keyboard.h
+gui.o: /usr/local/include/SDL/SDL_keysym.h /usr/local/include/SDL/SDL_mouse.h
+gui.o: /usr/local/include/SDL/SDL_video.h /usr/local/include/SDL/SDL_mutex.h
+gui.o: /usr/local/include/SDL/SDL_quit.h /usr/local/include/SDL/SDL_version.h
+gui.o: gfx.h exit.h
+memmenu.o: /usr/include/stdlib.h /usr/include/sys/cdefs.h
+memmenu.o: /usr/include/sys/_types.h /usr/include/machine/_types.h
+memmenu.o: /usr/include/stdio.h /usr/include/string.h /usr/include/strings.h
+memmenu.o: /usr/include/ctype.h /usr/include/runetype.h memmenu.h z80/z80.h
+memmenu.o: spec.h /usr/local/include/SDL/SDL.h
+memmenu.o: /usr/local/include/SDL/SDL_main.h
+memmenu.o: /usr/local/include/SDL/SDL_types.h
+memmenu.o: /usr/local/include/SDL/SDL_getenv.h
+memmenu.o: /usr/local/include/SDL/SDL_error.h
+memmenu.o: /usr/local/include/SDL/begin_code.h
+memmenu.o: /usr/local/include/SDL/close_code.h
+memmenu.o: /usr/local/include/SDL/SDL_rwops.h
+memmenu.o: /usr/local/include/SDL/SDL_timer.h
+memmenu.o: /usr/local/include/SDL/SDL_audio.h
+memmenu.o: /usr/local/include/SDL/SDL_byteorder.h
+memmenu.o: /usr/local/include/SDL/SDL_cdrom.h
+memmenu.o: /usr/local/include/SDL/SDL_joystick.h
+memmenu.o: /usr/local/include/SDL/SDL_events.h
+memmenu.o: /usr/local/include/SDL/SDL_active.h
+memmenu.o: /usr/local/include/SDL/SDL_keyboard.h
+memmenu.o: /usr/local/include/SDL/SDL_keysym.h
+memmenu.o: /usr/local/include/SDL/SDL_mouse.h
+memmenu.o: /usr/local/include/SDL/SDL_video.h
+memmenu.o: /usr/local/include/SDL/SDL_mutex.h
+memmenu.o: /usr/local/include/SDL/SDL_quit.h
+memmenu.o: /usr/local/include/SDL/SDL_version.h gfx.h gui.h
+exit.o: /usr/include/stdlib.h /usr/include/sys/cdefs.h
+exit.o: /usr/include/sys/_types.h /usr/include/machine/_types.h
+exit.o: /usr/include/stdarg.h exit.h /usr/local/include/SDL/SDL.h
+exit.o: /usr/local/include/SDL/SDL_main.h /usr/local/include/SDL/SDL_types.h
+exit.o: /usr/local/include/SDL/SDL_getenv.h
+exit.o: /usr/local/include/SDL/SDL_error.h
+exit.o: /usr/local/include/SDL/begin_code.h
+exit.o: /usr/local/include/SDL/close_code.h
+exit.o: /usr/local/include/SDL/SDL_rwops.h /usr/include/stdio.h
+exit.o: /usr/local/include/SDL/SDL_timer.h /usr/local/include/SDL/SDL_audio.h
+exit.o: /usr/local/include/SDL/SDL_byteorder.h
+exit.o: /usr/local/include/SDL/SDL_cdrom.h
+exit.o: /usr/local/include/SDL/SDL_joystick.h
+exit.o: /usr/local/include/SDL/SDL_events.h
+exit.o: /usr/local/include/SDL/SDL_active.h
+exit.o: /usr/local/include/SDL/SDL_keyboard.h
+exit.o: /usr/local/include/SDL/SDL_keysym.h
+exit.o: /usr/local/include/SDL/SDL_mouse.h /usr/local/include/SDL/SDL_video.h
+exit.o: /usr/local/include/SDL/SDL_mutex.h /usr/local/include/SDL/SDL_quit.h
+exit.o: /usr/local/include/SDL/SDL_version.h
diff --git a/src/main.c b/src/main.c
index ce331f5..79f0994 100644
--- a/src/main.c
+++ b/src/main.c
@@ -97,6 +97,7 @@ int main(int argc, char *argv[])
Z80SingleStep(z80);
Z80GetState(z80,&s2);
+ /* TODO: Remove debug */
if (s2.PC==0)
{
printf("PC zero - prev %4.4x\n",s1.PC);
diff --git a/src/memmenu.c b/src/memmenu.c
index 9e1726b..807e49f 100644
--- a/src/memmenu.c
+++ b/src/memmenu.c
@@ -53,6 +53,13 @@ static const char ident_h[]=ESPEC_MEMMENU_H;
#define GREEN GFXRGB(100,255,100)
#define BLUE GFXRGB(100,100,255)
+#define TRACE "trace"
+
+
+/* ---------------------------------------- STATIC DATA
+*/
+FILE *trace=NULL;
+
/* ---------------------------------------- PRIVATE FUNCTIONS
*/
@@ -68,7 +75,9 @@ static void DisplayMenu(void)
{
"1. Disassemble/Hex dump",
"2. Disassemble to file ",
- "3. Return ",
+ "3. Start/Stop trace log",
+ "4. Playback trace log ",
+ "5. Return ",
NULL
};
@@ -77,13 +86,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,6 +114,30 @@ static const char *FlagString(Z80Byte flag)
}
+void DisplayZ80State(Z80State *s, int y, Uint32 col)
+{
+ 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,
+ "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);
+}
+
+
static int StrEq(const char *a, const char *b)
{
while(*a && *b && tolower(*a)==tolower(*b))
@@ -173,6 +206,17 @@ static int EnterAddress(const char *prompt, 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,7 +232,8 @@ 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;
@@ -198,7 +243,7 @@ static void DoDisassem(Z80 *z80, const Z80State *s)
char *p;
int y;
- y=16+f*8;
+ y=24+f*8;
GFXPrint(0,y,GREEN,"%4.4x",curr);
@@ -336,6 +381,214 @@ static void DoDisassemFile(Z80 *z80, const Z80State *s)
}
+static int Instruction(Z80 *z80, Z80Val data)
+{
+ Z80State s;
+
+ Z80GetState(z80,&s);
+ fwrite(&s,sizeof s,1,trace);
+
+ return TRUE;
+}
+
+
+static void EnableTrace(Z80 *z80, Z80State *s)
+{
+ if (!trace)
+ {
+ trace=fopen(TRACE,"wb");
+
+ if (trace)
+ {
+ GUIMessage("NOTICE","Created trace log");
+ Z80LodgeCallback(z80,Z80_Instruction,Instruction);
+ }
+ else
+ {
+ GUIMessage("ERROR","Failed to create trace log");
+ }
+ }
+}
+
+
+static void DisableTrace(Z80 *z80)
+{
+ if (trace)
+ {
+ GUIMessage("NOTICE","Closing current trace log");
+ fclose(trace);
+ trace=NULL;
+ Z80LodgeCallback(z80,Z80_Instruction,NULL);
+ }
+}
+
+
+static void PlaybackTrace(Z80 *z80)
+{
+ FILE *fp;
+ int quit;
+ long prev_pos;
+ long pos;
+ long max_pos;
+ Z80Word pc;
+ Z80State s;
+
+ fp=fopen(TRACE,"rb");
+
+ if (!fp)
+ {
+ GUIMessage("ERROR","Couldn't open tracefile: " TRACE);
+ return;
+ }
+
+ fseek(fp,0,SEEK_END);
+
+ max_pos=ftell(fp)/sizeof s;
+
+ if (max_pos==0)
+ {
+ GUIMessage("ERROR","Empty tracefile: " TRACE);
+ 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 s,SEEK_SET);
+ fread(&s,sizeof s,1,fp);
+
+ DisplayZ80State(&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 ",s.PC);
+
+ strcpy(str,Z80Disassemble(z80,&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
+ ("PLAYBACK HELP","%s",
+ "ESC - Exit\n"
+ "Enter - Step number to display\n"
+ "P - Search for PC\n"
+ "Cursor Up - Prev step\n"
+ "Cursor Down - Next step\n"
+ "Page Up - Back 50 steps\n"
+ "Page Down - Forward 50 steps\n"
+ "Cursor Left - Back 1000 steps\n"
+ "Cursor 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(&s,sizeof s,1,fp))==1)
+ {
+ pos++;
+ if (s.PC==pc)
+ break;
+ }
+
+ if (rd!=1)
+ {
+ GUIMessage("NOTICE","Address not found");
+ pos=prev_pos;
+ }
+ }
+ 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);
+}
+
+
/* ---------------------------------------- EXPORTED INTERFACES
*/
void MemoryMenu(Z80 *z80)
@@ -366,8 +619,20 @@ void MemoryMenu(Z80 *z80)
DoDisassemFile(z80,&s);
break;
- case SDLK_ESCAPE:
case SDLK_3:
+ if (!trace)
+ EnableTrace(z80,&s);
+ else
+ DisableTrace(z80);
+ break;
+
+ case SDLK_4:
+ DisableTrace(z80);
+ PlaybackTrace(z80);
+ break;
+
+ case SDLK_ESCAPE:
+ case SDLK_5:
quit=TRUE;
break;
@@ -383,31 +648,9 @@ void MemoryMenu(Z80 *z80)
void DisplayState(Z80 *z80)
{
Z80State s;
- int y;
Z80GetState(z80,&s);
-
- 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;
-
- GFXPrintPaper(0,y,RED,BLACK,"IFF1=%2.2x IFF2=%2.2x",s.IFF1,s.IFF2);
- y+=8;
-
- y+=8;
- GFXPrintPaper(0,y,RED,BLACK,"%s\n",SPECInfo(z80));
- y+=8;
+ DisplayZ80State(&s,136,RED);
}
diff --git a/src/memmenu.h b/src/memmenu.h
index 524069f..660242f 100644
--- a/src/memmenu.h
+++ b/src/memmenu.h
@@ -22,6 +22,8 @@
Provides a menu driven interface for analysing memory
+ Requires access to the INSTRUCTION Z80 callback.
+
*/
#ifndef ESPEC_MEMMENU_H
diff --git a/src/spec.h b/src/spec.h
index 762444e..558ba6a 100644
--- a/src/spec.h
+++ b/src/spec.h
@@ -22,6 +22,7 @@
Provides the emulation for the SPEC
+ Requires access to the HOOK and FETCH Z80 callbacks
*/
#ifndef ESPEC_SPECH
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-19 23:53:22 +0000