added debug output on exceptions

diff --git a/src/debug.c b/src/debug.c
index d6220c0..05f0cd9 100644 (file)
--- a/src/debug.c
+++ b/src/debug.c
@@ -73,3 +73,47 @@ void dbg_putchar(int c)
                dbg_printchar(cur_x++, cur_y, c);
        }
 }
+
+static const char *exc_str[] = {
+       "unknown", "",
+       "bus error",
+       "address error",
+       "illegal instruction",
+       "divide by zero",
+       "chk",
+       "trap",
+       "priviledge violation",
+       "trace",
+       "op 1010",
+       "op 1111",
+       "", "",
+       "format error",
+       "uninitialized vector",
+       "", "", "", "", "", "", "", "",
+       "spurious interrupt"
+};
+
+struct frame {
+       uint16_t padding;
+       uint16_t status;
+       uint32_t pc;
+       /* group 2 */
+       uint16_t fmtoffs;
+       uint16_t other[1];
+} __attribute__((packed));
+
+void exc_dump(unsigned int num, struct frame *frm)
+{
+       dbg_setcursor(0, 0);
+       printf("num addr: %x\n", &num);
+
+       if(num < sizeof exc_str / sizeof *exc_str) {
+               printf("Exception %xh: %s\n", num, exc_str[num]);
+       } else {
+               printf("Exception %xh\n", num);
+       }
+
+       printf("status: %x\n", frm->status);
+       printf("pc: %x\n", frm->pc);
+       printf("fmt: %x / vector: %x\n", frm->fmtoffs >> 12, frm->fmtoffs & 0xfff);
+}

diff --git a/src/intr.s b/src/intr.s
index 6dc8433..9d2f81d 100644 (file)
--- a/src/intr.s
+++ b/src/intr.s
@@ -6,68 +6,68 @@
 | exception vectors
        .long _stacktop         | 00 reset - initial SSP
        .long start             | 01 reset - initial PC
-       .long intr_fatal        | 02 bus error
-       .long intr_fatal        | 03 address error
-       .long intr_fatal        | 04 illegal instruction
-       .long intr_fatal        | 05 zero divide
-       .long intr_fatal        | 06 chk instruction
-       .long intr_fatal        | 07 trapv instruction
-       .long intr_fatal        | 08 privilege violation
-       .long intr_fatal        | 09 trace
-       .long intr_fatal        | 0a line 1010 emulator
-       .long intr_fatal        | 0b line 1111 emulator
-       .long intr_fatal        | 0c reserved
-       .long intr_fatal        | 0d reserved
-       .long intr_fatal        | 0e format error (mc68010 only)
-       .long intr_fatal        | 0f uninitialized interrupt vector
-       .long intr_fatal        | 10 \
-       .long intr_fatal        | 11 |
-       .long intr_fatal        | 12 |
-       .long intr_fatal        | 13  > reserved
-       .long intr_fatal        | 14 |
-       .long intr_fatal        | 15 |
-       .long intr_fatal        | 16 |
-       .long intr_fatal        | 17 /
-       .long intr_fatal        | 18 spurious interrupt 
-       .long intr_fatal        | 19 level 1 interrupt
-       .long intr_fatal        | 1a level 2 interrupt
-       .long intr_fatal        | 1b level 3 interrupt
+       .long intr_berr         | 02 bus error
+       .long intr_addr         | 03 address error
+       .long intr_ill          | 04 illegal instruction
+       .long intr_div0         | 05 zero divide
+       .long intr_chk          | 06 chk instruction
+       .long intr_trap         | 07 trapv instruction
+       .long intr_segv         | 08 privilege violation
+       .long intr_trace        | 09 trace
+       .long intr_1010emu      | 0a line 1010 emulator
+       .long intr_1111emu      | 0b line 1111 emulator
+       .long intr_unk          | 0c reserved
+       .long intr_unk          | 0d reserved
+       .long intr_unk          | 0e format error (mc68010 only)
+       .long intr_uninit       | 0f uninitialized interrupt vector
+       .long intr_unk          | 10 \
+       .long intr_unk          | 11 |
+       .long intr_unk          | 12 |
+       .long intr_unk          | 13  > reserved
+       .long intr_unk          | 14 |
+       .long intr_unk          | 15 |
+       .long intr_unk          | 16 |
+       .long intr_unk          | 17 /
+       .long intr_spurious     | 18 spurious interrupt 
+       .long intr_unk          | 19 level 1 interrupt
+       .long intr_unk          | 1a level 2 interrupt
+       .long intr_unk          | 1b level 3 interrupt
        .long intr_hblank       | 1c level 4 interrupt (hblank in the mega drive)
-       .long intr_fatal        | 1d level 5 interrupt
+       .long intr_unk          | 1d level 5 interrupt
        .long intr_vblank       | 1e level 6 interrupt (vblank in the mega drive)
-       .long intr_fatal        | 1f level 7 interrupt
-       .long intr_fatal        | 20 trap 0
-       .long intr_fatal        | 21 trap 1
-       .long intr_fatal        | 22 trap 2
-       .long intr_fatal        | 23 trap 3
-       .long intr_fatal        | 24 trap 4
-       .long intr_fatal        | 25 trap 5
-       .long intr_fatal        | 26 trap 6
-       .long intr_fatal        | 27 trap 7
-       .long intr_fatal        | 28 trap 8
-       .long intr_fatal        | 29 trap 9
-       .long intr_fatal        | 2a trap a
-       .long intr_fatal        | 2b trap b
-       .long intr_fatal        | 2c trap c
-       .long intr_fatal        | 2d trap d
-       .long intr_fatal        | 2e trap e
-       .long intr_fatal        | 2f trap f
-       .long intr_fatal        | 30 \
-       .long intr_fatal        | 31 |
-       .long intr_fatal        | 32 |
-       .long intr_fatal        | 33 |
-       .long intr_fatal        | 34 |
-       .long intr_fatal        | 35 |
-       .long intr_fatal        | 36 |
-       .long intr_fatal        | 37 |
-       .long intr_fatal        | 38  > reserved
-       .long intr_fatal        | 39 |
-       .long intr_fatal        | 3a |
-       .long intr_fatal        | 3b |
-       .long intr_fatal        | 3c |
-       .long intr_fatal        | 3d |
-       .long intr_fatal        | 3e |
-       .long intr_fatal        | 3f /
+       .long intr_unk          | 1f level 7 interrupt
+       .long intr_unk          | 20 trap 0
+       .long intr_unk          | 21 trap 1
+       .long intr_unk          | 22 trap 2
+       .long intr_unk          | 23 trap 3
+       .long intr_unk          | 24 trap 4
+       .long intr_unk          | 25 trap 5
+       .long intr_unk          | 26 trap 6
+       .long intr_unk          | 27 trap 7
+       .long intr_unk          | 28 trap 8
+       .long intr_unk          | 29 trap 9
+       .long intr_unk          | 2a trap a
+       .long intr_unk          | 2b trap b
+       .long intr_unk          | 2c trap c
+       .long intr_unk          | 2d trap d
+       .long intr_unk          | 2e trap e
+       .long intr_unk          | 2f trap f
+       .long intr_unk          | 30 \
+       .long intr_unk          | 31 |
+       .long intr_unk          | 32 |
+       .long intr_unk          | 33 |
+       .long intr_unk          | 34 |
+       .long intr_unk          | 35 |
+       .long intr_unk          | 36 |
+       .long intr_unk          | 37 |
+       .long intr_unk          | 38  > reserved
+       .long intr_unk          | 39 |
+       .long intr_unk          | 3a |
+       .long intr_unk          | 3b |
+       .long intr_unk          | 3c |
+       .long intr_unk          | 3d |
+       .long intr_unk          | 3e |
+       .long intr_unk          | 3f /
 
 | from here on we continue in the regular .text section since we don't care
 | where this code ends up.
@@ -85,7 +85,30 @@ disable_intr:
        rts
 
 | interrupt handlers
-intr_fatal:
+       .macro intr_entry num
+       move.w #0, -(%sp)       | pad to 32bit
+       move.l %sp, -(%sp)
+       pea.l \num
+       bra.w exc_common
+       .endm
+
+intr_berr:     intr_entry 2
+intr_addr:     intr_entry 3
+intr_ill:      intr_entry 4
+intr_div0:     intr_entry 5
+intr_chk:      intr_entry 6
+intr_trap:     intr_entry 7
+intr_segv:     intr_entry 8
+intr_trace:    intr_entry 9
+intr_1010emu:  intr_entry 0xa
+intr_1111emu:  intr_entry 0xb
+intr_uninit:   intr_entry 0xf
+intr_spurious: intr_entry 0x18
+intr_unk:      intr_entry 0
+
+       .extern exc_dump
+exc_common:
+       jsr exc_dump
        stop #0x2700
 
 |      .extern vblank_handler

diff --git a/src/libc/stdlib.c b/src/libc/stdlib.c
index 8a4c8f0..caed2bc 100644 (file)
--- a/src/libc/stdlib.c
+++ b/src/libc/stdlib.c
@@ -2,8 +2,6 @@
 #include <string.h>
 #include <ctype.h>
 #include <limits.h>
-#include <assert.h>
-#include <alloca.h>
 
 int atoi(const char *str)
 {

diff --git a/src/main.c b/src/main.c
index 672e4de..c404fd1 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -21,13 +21,10 @@ int main(void)
 
        dna_init();
 
-       dbg_setcursor(0, 0);
-       printf("xyzzy");
-
        for(;;) {
                dbg_setcursor(32, 0);
                for(i=0; i<4; i++) {
-                       printf("%08x\n", (unsigned int)dbgval[i]);
+                       printf("%x\n", (unsigned int)dbgval[i]);
                }
                spr_begin();
 

diff --git a/src/pad.S b/src/pad.S
index 11e3828..3cff16b 100644 (file)
--- a/src/pad.S
+++ b/src/pad.S
@@ -1,7 +1,7 @@
        .text
 
 #include "hwregs.h"
-       .include "z80.inc"
+#include "z80.inc"
 
        .globl pad_init
 pad_init: