debug menu unified, more debug tools

git-svn-id: file:///home/notaz/opt/svn/PicoDrive@545 be3aeb3a-fb24-0410-a615-afba39da0efa

platform/common/common.h

@@ -0,0 +1,75 @@
+// platform specific things for common menu code
+
+#ifdef __GP2X__
+#include "../gp2x/gp2x.h"
+
+#define BTN_UP    GP2X_UP
+#define BTN_DOWN  GP2X_DOWN
+#define BTN_LEFT  GP2X_LEFT
+#define BTN_RIGHT GP2X_RIGHT
+
+#define BTN_NORTH GP2X_Y
+#define BTN_SOUTH GP2X_X
+#define BTN_WEST  GP2X_A
+#define BTN_EAST  GP2X_B
+#define BTN_L     GP2X_L
+#define BTN_R     GP2X_R
+
+unsigned long wait_for_input(unsigned long interesting);
+void gp2x_pd_clone_buffer2(void);
+void menu_darken_bg(void *dst, int pixels, int darker);
+void menu_flip(void);
+
+#define SCREEN_WIDTH  320
+#define SCREEN_HEIGHT 240
+#define SCREEN_BUFFER gp2x_screen
+
+#define read_buttons(which) \
+	wait_for_input(which)
+#define menu_draw_begin() \
+	gp2x_pd_clone_buffer2()
+#define clear_screen() \
+	memset(gp2x_screen, 0, 320*240*2)
+#define darken_screen() \
+	menu_darken_bg(gp2x_screen, 320*240, 0)
+#define menu_draw_end() \
+	menu_flip()
+
+// ------------------------------------
+
+#elif defined(__GIZ__)
+
+// TODO
+//#include "../gizmondo/giz.h"
+#define SCREEN_WIDTH 321
+#define SCREEN_BUFFER menu_screen
+extern unsigned char *menu_screen;
+
+// ------------------------------------
+
+#elif defined(PSP)
+
+#include "../psp/psp.h"
+
+#define BTN_NORTH BTN_TRIANGLE
+#define BTN_SOUTH BTN_X
+#define BTN_WEST  BTN_SQUARE
+#define BTN_EAST  BTN_CIRCLE
+
+unsigned long wait_for_input(unsigned int interesting, int is_key_config);
+void menu_draw_begin(void);
+void menu_darken_bg(void *dst, const void *src, int pixels, int darker);
+void menu_draw_end(void);
+
+#define SCREEN_WIDTH  512
+#define SCREEN_HEIGHT 272
+#define SCREEN_BUFFER psp_screen
+
+#define read_buttons(which) \
+	wait_for_input(which, 0)
+#define clear_screen() \
+	memset(SCREEN_BUFFER, 0, SCREEN_WIDTH*SCREEN_HEIGHT*2)
+#define darken_screen() \
+	menu_darken_bg(psp_screen, psp_screen, SCREEN_WIDTH*SCREEN_HEIGHT, 0)
+
+#endif

platform/common/menu.c

@@ -12,21 +12,9 @@
 #include "fonts.h"
 #include "readpng.h"
 #include "lprintf.h"
+#include "common.h"
+#include "emu.h"
 
-#if   defined(__GP2X__)
- #include "../gp2x/gp2x.h"
- #define SCREEN_WIDTH 320
- #define SCREEN_BUFFER gp2x_screen
-#elif defined(__GIZ__)
- //#include "../gizmondo/giz.h"
- #define SCREEN_WIDTH 321
- #define SCREEN_BUFFER menu_screen
- extern unsigned char *menu_screen;
-#elif defined(PSP)
- #include "../psp/psp.h"
- #define SCREEN_WIDTH 512
- #define SCREEN_BUFFER psp_screen
-#endif
 
 char menuErrorMsg[64] = { 0, };
 
@@ -362,3 +350,111 @@ const char *me_region_name(unsigned int code, int auto_order)
 	}
 }
 
+// ------------ debug menu ------------
+
+#include <sys/stat.h>
+#include <sys/types.h>
+
+#include <Pico/Pico.h>
+#include <Pico/Debug.h>
+
+void SekStepM68k(void);
+
+static void draw_text_debug(const char *str, int skip, int from)
+{
+	const char *p;
+	int len, line;
+
+	p = str;
+	while (skip-- > 0)
+	{
+		while (*p && *p != '\n') p++;
+		if (*p == 0 || p[1] == 0) return;
+		p++;
+	}
+
+	str = p;
+	for (line = from; line < SCREEN_HEIGHT/10; line++)
+	{
+		while (*p && *p != '\n') p++;
+		len = p - str;
+		if (len > 55) len = 55;
+		smalltext_out16_lim(1, line*10, str, 0xffff, len);
+		if (*p == 0) break;
+		p++; str = p;
+	}
+}
+
+static void draw_frame_debug(void)
+{
+	char layer_str[48] = "layers:             ";
+	if (PicoDrawMask & PDRAW_LAYERB_ON)      memcpy(layer_str +  8, "B", 1);
+	if (PicoDrawMask & PDRAW_LAYERA_ON)      memcpy(layer_str + 10, "A", 1);
+	if (PicoDrawMask & PDRAW_SPRITES_LOW_ON) memcpy(layer_str + 12, "spr_lo", 6);
+	if (PicoDrawMask & PDRAW_SPRITES_HI_ON)  memcpy(layer_str + 19, "spr_hi", 6);
+
+	clear_screen();
+	emu_forcedFrame(0);
+	smalltext_out16(4, SCREEN_HEIGHT-8, layer_str, 0xffff);
+}
+
+void debug_menu_loop(void)
+{
+	int inp, mode = 0;
+	int spr_offs = 0, dumped = 0;
+
+	while (1)
+	{
+		switch (mode)
+		{
+			case 0: menu_draw_begin();
+				draw_text_debug(PDebugMain(), 0, 0);
+				if (dumped) {
+					smalltext_out16(SCREEN_WIDTH-6*10, SCREEN_HEIGHT-8, "dumped", 0xffff);
+					dumped = 0;
+				}
+				break;
+			case 1: draw_frame_debug(); break;
+			case 2: clear_screen();
+				emu_forcedFrame(0);
+				darken_screen();
+				PDebugShowSpriteStats(SCREEN_BUFFER, SCREEN_WIDTH); break;
+			case 3: clear_screen();
+				PDebugShowPalette(SCREEN_BUFFER, SCREEN_WIDTH);
+				PDebugShowSprite((unsigned short *)SCREEN_BUFFER + SCREEN_WIDTH*120+SCREEN_WIDTH/2+16,
+					SCREEN_WIDTH, spr_offs);
+				draw_text_debug(PDebugSpriteList(), spr_offs, 6);
+				break;
+		}
+		menu_draw_end();
+
+		inp = read_buttons(BTN_EAST|BTN_SOUTH|BTN_WEST|BTN_L|BTN_R|BTN_UP|BTN_DOWN|BTN_LEFT|BTN_RIGHT);
+		if (inp & BTN_SOUTH) return;
+		if (inp & BTN_L) { mode--; if (mode < 0) mode = 3; }
+		if (inp & BTN_R) { mode++; if (mode > 3) mode = 0; }
+		switch (mode)
+		{
+			case 0:
+				if (inp & BTN_EAST) SekStepM68k();
+				if ((inp & (BTN_WEST|BTN_LEFT)) == (BTN_WEST|BTN_LEFT)) {
+					mkdir("dumps", 0777);
+					PDebugDumpMem();
+					dumped = 1;
+				}
+				break;
+			case 1:
+				if (inp & BTN_LEFT)  PicoDrawMask ^= PDRAW_LAYERB_ON;
+				if (inp & BTN_RIGHT) PicoDrawMask ^= PDRAW_LAYERA_ON;
+				if (inp & BTN_DOWN)  PicoDrawMask ^= PDRAW_SPRITES_LOW_ON;
+				if (inp & BTN_UP)    PicoDrawMask ^= PDRAW_SPRITES_HI_ON;
+				break;
+			case 3:
+				if (inp & BTN_DOWN)  spr_offs++;
+				if (inp & BTN_UP)    spr_offs--;
+				if (spr_offs < 0) spr_offs = 0;
+				break;
+		}
+	}
+}
+
+

platform/common/menu.h

@@ -6,6 +6,7 @@ void text_out16(int x, int y, const char *texto, ...);
 void smalltext_out16(int x, int y, const char *texto, int color);
 void smalltext_out16_lim(int x, int y, const char *texto, int color, int max);
 void menu_draw_selection(int x, int y, int w);
+void debug_menu_loop(void);
 
 extern char menuErrorMsg[64];