Rearranged bare metal examples and minor fix to SGDK ones

Author: andwn

examples/md-cpp-test/boot.s

@@ -0,0 +1,151 @@
+.section .data
+
+/* .globl exposes symbols to the linker, and may be referred to in C code as extern */
+	.globl v_err_reg
+	.globl v_err_pc
+	.globl v_err_addr
+	.globl v_err_ext1
+	.globl v_err_ext2
+	.globl v_err_sr
+	.globl v_err_type
+
+/* Used for the crash handler (see error.c and the error handlers below) */
+v_err_reg:	ds.l 16
+v_err_pc:	ds.l 1
+v_err_addr:	ds.l 1
+v_err_ext1:	ds.w 1
+v_err_ext2: ds.w 1
+v_err_sr:	ds.w 1
+v_err_type:	ds.b 1
+
+.section .text
+
+    .org    0x00000000					/* Forces linker to put us at the beginning */
+
+RomStart:
+        dc.l    0x000000				/* Initial stack pointer address */
+		dc.l	_start					/* Program start address */
+        dc.l    BusError				/* Not thrown on MD */
+		dc.l	AddressError			/* Thrown when a W or L instruction uses an odd address */
+		dc.l	IllegalInst				/* Thrown when the CPU encounters an invalid instruction */
+		dc.l	ZeroDivide				/* Thrown when DIV receives a 0 on the left hand side */
+		dc.l	0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+		dc.l	0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+		dc.l	ExtInt, 0				/* External Interrupt */
+		dc.l	HBlank, 0				/* Horizontal Blank Interrupt */
+		dc.l	VBlank, 0				/* Vertical Blank Interrupt */
+	.rept 8
+		dc.l	0, 0, 0, 0
+	.endr
+
+RomHeader:
+        .ascii	"SEGA MEGA DRIVE "		/* First 4 bytes must be "SEGA" */
+		.ascii	"GRIND   2022.OCT"		/* Copyright and date */
+		.ascii	"Example Project                                 " /* JP Name */
+		.ascii	"Example Project                                 " /* EN Name */
+		.ascii	"GM CHANGEME-XX"		/* Serial No. */
+		dc.w	0
+		.ascii	"J               "		/* Controller support */
+		dc.l	0x000000				/* ROM Start */
+		dc.l	0x3FFFFF				/* ROM End (4MB) */
+		dc.l	0xFF0000				/* RAM Start */
+		dc.l	0xFFFFFF				/* RAM End (64KB) */
+		.ascii	"RA"					/* "RA" to enable SRAM, "  " to disable */
+		dc.w	0xF820					/* SRAM writes to odd bytes */
+		dc.l	0x200001				/* SRAM Start */
+		dc.l	0x20FFFF				/* SRAM End (32KB) */
+		.ascii	"            "
+		.ascii	"                                        "
+		.ascii	"JUE             "		/* Region */
+
+_start:
+        move    #0x2700,sr              /* Disable interrupts */
+		move.b	(0xA10001),d0           /* Check console version */
+        andi.b  #0x0F,d0                /* Version 0 = skip TMSS */
+        beq.s   NoTMSS
+        move.l  (0x100),0xA14000        /* Write 'SEGA' to TMSS register */
+NoTMSS:
+        move.w  (0xC00004),d0           /* Read VDP status */
+        move.w  #0x0100,(0xA11100)      /* Halt / Reset Z80 */
+        move.w  #0x0100,(0xA11200)
+    .globl 	_hard_reset
+_hard_reset:                            /* SYS_HardReset() resets sp and jumps here */
+        lea     0xFF0000,a0             /* First RAM address */
+        moveq   #0,d0
+        move.w  #0x3FFF,d1              /* (Size of RAM - 1) / Size of long */
+ClearRam:
+        move.l  d0,(a0)+
+        dbra    d1,ClearRam
+        lea     _stext,a0               /* Start of initialized data (BSS) in ROM */
+        lea     0xFF0000,a1             /* First RAM address */
+        move.l  #_sdata,d0              /* (Size of BSS + 1) / 2 */
+        addq.l  #1,d0
+        lsr.l   #1,d0
+        beq     NoCopy
+        subq.w  #1,d0                   /* sub extra iteration */
+CopyVar:
+        move.w  (a0)+,(a1)+             /* Copy initialized data to RAM */
+        dbra    d0,CopyVar
+NoCopy:
+        jsr     main                    /* IT BEGINS */
+        beq.s   _hard_reset             /* main returned, reset */
+
+/* Error handling */
+
+BusError:
+		move.b #0,(v_err_type)
+        bra.s  AddressDump
+
+AddressError:
+		move.b #1,(v_err_type)
+        bra.s  AddressDump
+
+IllegalInst:
+		move.b #2,(v_err_type)
+        bra.s  IllegalDump
+
+ZeroDivide:
+		move.b #3,(v_err_type)
+        bra.s  ZeroDump
+
+AddressDump:
+        move.w 4(sp),v_err_ext1
+        move.l 6(sp),v_err_addr
+        move.w 10(sp),v_err_ext2
+        move.w 12(sp),v_err_sr
+        move.l 14(sp),v_err_pc
+        bra.s  RegDump
+IllegalDump:
+        move.w 10(sp),v_err_ext1
+ZeroDump:
+        move.w 4(sp),v_err_sr
+        move.l 6(sp),v_err_pc
+RegDump:
+        move.l d0,v_err_reg+0
+        move.l d1,v_err_reg+4
+        move.l d2,v_err_reg+8
+        move.l d3,v_err_reg+12
+        move.l d4,v_err_reg+16
+        move.l d5,v_err_reg+20
+        move.l d6,v_err_reg+24
+        move.l d7,v_err_reg+28
+        move.l a0,v_err_reg+32
+        move.l a1,v_err_reg+36
+        move.l a2,v_err_reg+40
+        move.l a3,v_err_reg+44
+        move.l a4,v_err_reg+48
+        move.l a5,v_err_reg+52
+        move.l a6,v_err_reg+56
+        move.l a7,v_err_reg+60
+        jmp    _error
+
+/* Standard interrupts */
+
+ExtInt:
+		rte
+		
+HBlank:
+        rte
+
+VBlank:
+        rte

examples/md-newlib-test/Makefile

@@ -57,11 +57,7 @@ ASMO  = $(RESS:.res=.o)
 ASMO += $(Z80S:.s80=.o)
 ASMO += $(CS:%.c=asmout/%.s)
 
-# Need to keep the .elf to extract the symbol table from it
-.SECONDARY: out.elf
-
 .PHONY: all release asm debug
-
 all: release
 
 release: OPTIONS  = -O3 -fno-web -fno-gcse -fno-unit-at-a-time -fomit-frame-pointer
@@ -79,19 +75,18 @@ debug: out.bin symbol.txt
 # Generates a symbol table that is very helpful in debugging crashes
 # Cross reference symbol.txt with the addresses displayed in the crash handler
 symbol.txt: out.bin
-	$(NM) --plugin=$(PLUGIN)/$(LTO_SO) -n out.elf > symbol.txt
-
-boot.o:
-	$(AS) $(ASFLAGS) boot.s -o $@
+	@echo "Creating symbol.txt"
+	@$(NM) --plugin=$(PLUGIN)/$(LTO_SO) -n out.elf > symbol.txt
 
 %.bin: %.elf
 	@echo "Stripping ELF header..."
 	@$(OBJC) -O binary $< temp.bin
-	@dd if=temp.bin of=$@ bs=8192 conv=sync
+	@dd if=temp.bin of=$@ bs=8K conv=sync
 	@rm -f temp.bin
 
-%.elf: boot.o $(OBJS)
-	$(CC) -o $@ $(LDFLAGS) boot.o $(OBJS) $(LIBS)
+%.elf: $(OBJS)
+	@echo "Linking $@"
+	@$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS)
 
 %.o: %.c
 	@echo "CC $<"
@@ -113,7 +108,6 @@ asmout/%.s: %.c
 	$(CC) $(CCFLAGS) $(OPTIONS) $(INCS) -S $< -o $@
 
 .PHONY: clean
-
 clean:
 	rm -f $(OBJS) out.bin out.elf symbol.txt boot.o
 	rm -rf asmout

examples/md-newlib-test/boot.s examples/md-newlib-test/src/boot.sexamples/md-newlib-test/boot.s renamed to examples/md-newlib-test/src/boot.s

@@ -18,7 +18,7 @@ v_err_ext2: ds.w 1
 v_err_sr:	ds.w 1
 v_err_type:	ds.b 1
 
-.section .text
+.section .text.keepboot
 
     .org    0x00000000					/* Forces linker to put us at the beginning */
 

examples/md-skeleton/Makefile

@@ -55,11 +55,7 @@ ASMO  = $(RESS:.res=.o)
 ASMO += $(Z80S:.s80=.o)
 ASMO += $(CS:%.c=asmout/%.s)
 
-# Need to keep the .elf to extract the symbol table from it
-.SECONDARY: out.elf
-
 .PHONY: all release asm debug
-
 all: release
 
 release: OPTIONS  = -O3 -fno-web -fno-gcse -fno-unit-at-a-time -fomit-frame-pointer
@@ -77,19 +73,18 @@ debug: out.bin symbol.txt
 # Generates a symbol table that is very helpful in debugging crashes
 # Cross reference symbol.txt with the addresses displayed in the crash handler
 symbol.txt: out.bin
-	$(NM) --plugin=$(PLUGIN)/$(LTO_SO) -n out.elf > symbol.txt
-
-boot.o:
-	$(AS) $(ASFLAGS) boot.s -o $@
+	@echo "Creating symbol.txt"
+	@$(NM) --plugin=$(PLUGIN)/$(LTO_SO) -n out.elf > symbol.txt
 
 %.bin: %.elf
 	@echo "Stripping ELF header..."
 	@$(OBJC) -O binary $< temp.bin
-	@dd if=temp.bin of=$@ bs=8192 conv=sync
+	@dd if=temp.bin of=$@ bs=8K conv=sync
 	@rm -f temp.bin
 
-%.elf: boot.o $(OBJS)
-	$(CC) -o $@ $(LDFLAGS) boot.o $(OBJS) $(LIBS)
+%.elf: $(OBJS)
+	@echo "Linking $@"
+	@$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS)
 
 %.o: %.c
 	@echo "CC $<"
@@ -111,7 +106,6 @@ asmout/%.s: %.c
 	$(CC) $(CCFLAGS) $(OPTIONS) $(INCS) -S $< -o $@
 
 .PHONY: clean
-
 clean:
 	rm -f $(OBJS) out.bin out.elf symbol.txt boot.o
 	rm -rf asmout

examples/md-skeleton/boot.s examples/md-skeleton/src/boot.sexamples/md-skeleton/boot.s renamed to examples/md-skeleton/src/boot.s

@@ -18,7 +18,7 @@ v_err_ext2: ds.w 1
 v_err_sr:	ds.w 1
 v_err_type:	ds.b 1
 
-.section .text
+.section .text.keepboot
 
     .org    0x00000000					/* Forces linker to put us at the beginning */
 

examples/sgdk-skeleton/Makefile

@@ -67,10 +67,7 @@ OBJS += $(SS:.s=.o)
 ASMO  = $(RESS:.res=.o)
 ASMO += $(CS:%.c=asmout/%.s)
 
-.SECONDARY: out.elf
-
 .PHONY: all release asm debug
-
 all: release
 
 release: OPTIONS  = -O3 -fno-web -fno-gcse -fno-unit-at-a-time -fomit-frame-pointer
@@ -91,7 +88,8 @@ debug: out.bin symbol.txt
 # Generates a symbol table that is very helpful in debugging crashes
 # Cross reference symbol.txt with the addresses displayed in the crash handler
 symbol.txt: out.bin
-	$(NM) --plugin=$(PLUGIN)/$(LTO_SO) -n out.elf > symbol.txt
+	@echo "Creating symbol.txt"
+	@$(NM) --plugin=$(PLUGIN)/$(LTO_SO) -n out.elf > symbol.txt
 
 boot/sega.o: boot/rom_head.bin
 	@echo "AS boot/sega.s"
@@ -102,7 +100,7 @@ boot/rom_head.bin: boot/rom_head.o
 
 boot/rom_head.o: boot/rom_head.c
 	@echo "CC $<"
-	@$(CC) $(CFLAGS) $(INCS) -c $< -o $@
+	@$(CC) $(CCFLAGS) $(INCS) -c $< -o $@
 
 %.bin: %.elf
 	@echo "Stripping ELF header..."
@@ -111,7 +109,8 @@ boot/rom_head.o: boot/rom_head.c
 	@rm -f temp.bin
 
 %.elf: boot/sega.o $(OBJS)
-	$(CC) -o $@ $(LDFLAGS) boot/sega.o $(OBJS) $(LIBS)
+	@echo "Linking $@"
+	@$(CC) -o $@ $(LDFLAGS) boot/sega.o $(OBJS) $(LIBS)
 
 %.o: %.c
 	@echo "CC $<"
@@ -136,7 +135,6 @@ asmout/%.s: %.c
 	$(CC) $(CCFLAGS) $(OPTIONS) $(INCS) -S $< -o $@
 
 .PHONY: clean
-
 clean:
 	rm -f $(OBJS) out.bin out.elf symbol.txt
 	rm -f boot/sega.o boot/rom_head.o boot/rom_head.bin

examples/sgdk-ssfmapper/Makefile

@@ -67,31 +67,29 @@ OBJS += $(SS:.s=.o)
 ASMO  = $(RESS:.res=.o)
 ASMO += $(CS:%.c=asmout/%.s)
 
-.SECONDARY: out.elf
-
 .PHONY: all release asm debug
-
 all: release
 
 release: OPTIONS  = -O3 -fno-web -fno-gcse -fno-unit-at-a-time -fomit-frame-pointer
 release: OPTIONS += -fshort-enums -flto -fuse-linker-plugin
-release: LIBS += -L$(MARSDEV)/m68k-elf/lib -lmd
+release: LIBS += -L$(MARSDEV)/m68k-elf/lib -lmd-far
 release: out.bin symbol.txt
 
 asm: OPTIONS  = -O3 -fno-web -fno-gcse -fno-unit-at-a-time -fomit-frame-pointer
 asm: OPTIONS += -fshort-enums
-asm: LIBS += -L$(MARSDEV)/m68k-elf/lib -lmd
+asm: LIBS += -L$(MARSDEV)/m68k-elf/lib -lmd-far
 asm: asm-dir $(ASMO)
 
 # Gens-KMod, BlastEm and UMDK support GDB tracing, enabled by this target
 debug: OPTIONS = -g -Og -DDEBUG -DKDEBUG -fno-web -fno-gcse -fno-unit-at-a-time -fshort-enums
-debug: LIBS += -L$(MARSDEV)/m68k-elf/lib -lmd-debug
+debug: LIBS += -L$(MARSDEV)/m68k-elf/lib -lmd-far-debug
 debug: out.bin symbol.txt
 
 # Generates a symbol table that is very helpful in debugging crashes
 # Cross reference symbol.txt with the addresses displayed in the crash handler
 symbol.txt: out.bin
-	$(NM) --plugin=$(PLUGIN)/$(LTO_SO) -n out.elf > symbol.txt
+	@echo "Creating symbol.txt"
+	@$(NM) --plugin=$(PLUGIN)/$(LTO_SO) -n out.elf > symbol.txt
 
 boot/sega.o: boot/rom_head.bin
 	@echo "AS boot/sega.s"
@@ -102,7 +100,7 @@ boot/rom_head.bin: boot/rom_head.o
 
 boot/rom_head.o: boot/rom_head.c
 	@echo "CC $<"
-	@$(CC) $(CFLAGS) $(INCS) -c $< -o $@
+	@$(CC) $(CCFLAGS) $(INCS) -c $< -o $@
 
 %.bin: %.elf
 	@echo "Stripping ELF header..."
@@ -111,7 +109,8 @@ boot/rom_head.o: boot/rom_head.c
 	@rm -f temp.bin
 
 %.elf: boot/sega.o $(OBJS)
-	$(CC) -o $@ $(LDFLAGS) boot/sega.o $(OBJS) $(LIBS)
+	@echo "Linking $@"
+	@$(CC) -o $@ $(LDFLAGS) boot/sega.o $(OBJS) $(LIBS)
 
 %.o: %.c
 	@echo "CC $<"
@@ -136,7 +135,6 @@ asmout/%.s: %.c
 	$(CC) $(CCFLAGS) $(OPTIONS) $(INCS) -S $< -o $@
 
 .PHONY: clean
-
 clean:
 	rm -f $(OBJS) out.bin out.elf symbol.txt
 	rm -f boot/sega.o boot/rom_head.o boot/rom_head.bin