+#include <stdlib.h>
#include <stdarg.h>
#define u8 unsigned char
#define u32 unsigned int
#define noinline __attribute__((noinline))
+#define _packed __attribute__((packed))
+
+#define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))
#include "edos.h"
#include "asmtools.h"
+extern u16 start_hvc;
+
#define GFX_DATA_PORT 0xC00000
#define GFX_CTRL_PORT 0xC00004
#define TILE_FONT_BASE (TILE_MEM_END / 32 - FONT_LEN)
/* note: using ED menu's layout here.. */
-#define WPLAN (TILE_MEM_END + 0x0000)
+#define WPLANE (TILE_MEM_END + 0x0000)
#define HSCRL (TILE_MEM_END + 0x0800)
#define SLIST (TILE_MEM_END + 0x0C00)
#define APLANE (TILE_MEM_END + 0x1000)
/* scroll plane */
write32(GFX_CTRL_PORT, GFX_WRITE_VSRAM_ADDR(0));
- write16(GFX_DATA_PORT, (printf_ypos - 27) * 8);
+ write16(GFX_DATA_PORT, (printf_ypos - CSCREEN_H + 1) * 8);
}
}
break;
case 'x':
uval = va_arg(ap, int);
- while (fwidth > 0 && uval < (1 << (fwidth - 1) * 4)) {
+ while (fwidth > 1 && uval < (1 << (fwidth - 1) * 4)) {
buf[d++] = prefix0 ? '0' : ' ';
fwidth--;
}
return d; // wrong..
}
-void exception(void)
+static const char *exc_names[] = {
+ NULL,
+ NULL,
+ "Bus Error",
+ "Address Error",
+ "Illegal Instruction",
+ "Zero Divide",
+ "CHK Instruction",
+ "TRAPV Instruction",
+ "Privilege Violation", /* 8 8 */
+ "Trace",
+ "Line 1010 Emulator",
+ "Line 1111 Emulator",
+ NULL,
+ NULL,
+ NULL,
+ "Uninitialized Interrupt",
+ NULL, /* 10 16 */
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ "Spurious Interrupt", /* 18 24 */
+ "l1 irq",
+ "l2 irq",
+ "l3 irq",
+ "l4 irq",
+ "l5 irq",
+ "l6 irq",
+ "l7 irq",
+};
+
+struct exc_frame {
+ u32 dr[8];
+ u32 ar[8];
+ u16 ecxnum; // from handler
+ union {
+ struct {
+ u16 sr;
+ u32 pc;
+ } g _packed;
+ struct {
+ u16 fc;
+ u32 addr;
+ u16 ir;
+ u16 sr;
+ u32 pc;
+ } bae _packed; // bus/address error frame
+ };
+} _packed;
+
+int xtttt(void) { return sizeof(struct exc_frame); }
+
+void exception(const struct exc_frame *f)
{
- VDP_drawTextML("============", APLANE, 0, 0);
- VDP_drawTextML(" exception! ", APLANE, 0, 1);
- VDP_drawTextML("============", APLANE, 0, 2);
- while (1)
+ int i;
+
+ while (read16(GFX_CTRL_PORT) & 2)
;
+ write16(GFX_CTRL_PORT, 0x8000 | (VDP_MODE1 << 8) | 0x04);
+ write16(GFX_CTRL_PORT, 0x8000 | (VDP_MODE2 << 8) | 0x44);
+ /* adjust scroll */
+ write32(GFX_CTRL_PORT, GFX_WRITE_VSRAM_ADDR(0));
+ write16(GFX_DATA_PORT,
+ printf_ypos >= CSCREEN_H ?
+ (printf_ypos - CSCREEN_H + 1) * 8 : 0);
+
+ printf("exception %i ", f->ecxnum);
+ if (f->ecxnum < ARRAY_SIZE(exc_names) && exc_names[f->ecxnum] != NULL)
+ printf("(%s)", exc_names[f->ecxnum]);
+ if (f->ecxnum < 4)
+ printf(" (%s)", (f->bae.fc & 0x10) ? "r" : "w");
+ printf(" \n");
+
+ if (f->ecxnum < 4) {
+ printf(" PC: %08x SR: %04x \n", f->bae.pc, f->bae.sr);
+ printf("addr: %08x IR: %04x FC: %02x \n",
+ f->bae.addr, f->bae.ir, f->bae.fc);
+ }
+ else {
+ printf(" PC: %08x SR: %04x \n", f->g.pc, f->g.sr);
+ }
+ for (i = 0; i < 8; i++)
+ printf(" D%d: %08x A%d: %08x \n", i, f->dr[i], i, f->ar[i]);
+ printf(" \n");
}
void vbl(void)
#define MTYPE_10M 5
#define MTYPE_32X 6
-static int do_run(OsRoutine *ed, u8 b3)
+static int do_run(OsRoutine *ed, u8 b3, int tas_sync)
{
u8 mapper = 0;
return -1;
}
- while (read32(GFX_CTRL_PORT) & 2)
+ printf("starting mapper %x..\n", mapper);
+
+ while (read16(GFX_CTRL_PORT) & 2)
;
ed->VDP_setReg(VDP_MODE1, 0x04);
ed->VDP_setReg(VDP_MODE2, 0x44);
ed->usbWriteByte('k');
- run_game(mapper);
+ run_game(mapper, tas_sync);
/* should not get here.. */
return -1;
/* note: relying on ED menu's font setup here.. */
- printf("version: %02x\n", read8(0xa10001));
+ printf("version: %02x, start_hvc: %04x\n",
+ read8(0xa10001), start_hvc);
printf("ED os/fw: %x/%x\n\n", ed->osGetOsVersion(),
ed->osGetFirmVersion());
printf("done\n");
break;
case 'r':
+ case 'R':
buf[2] = ed->usbReadByte();
- ret = do_run(ed, buf[2]);
+ ret = do_run(ed, buf[2], buf[1] == 'R');
if (ret != 0) {
d = 3;
goto bad_input;