From 48b3fd3c90baf91b0335c5d3014f183c82794aeb Mon Sep 17 00:00:00 2001
From: Zane Kaminski <zanekaminski@gmail.com>
Date: Wed, 24 Jun 2020 12:46:30 -0400
Subject: [PATCH] Fixed build, added relocation info

---
 Makefile | 56 +++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 33 insertions(+), 23 deletions(-)

diff --git a/Makefile b/Makefile
index 93f8f8a..c2d35c8 100644
--- a/Makefile
+++ b/Makefile
@@ -3,16 +3,11 @@ RETRO68=/Users/zane/Retro68-build/toolchain
 
 PREFIX=$(RETRO68)/m68k-apple-macos
 CC=$(RETRO68)/bin/m68k-apple-macos-gcc
-CXX=$(RETRO68)/bin/m68k-apple-macos-g++
+LD=$(RETRO68)/bin/m68k-apple-macos-ld
 OBJCOPY=$(RETRO68)/bin/m68k-apple-macos-objcopy
 OBJDUMP=$(RETRO68)/bin/m68k-apple-macos-objdump
-REZ=$(RETRO68)/bin/Rez
 
-LDFLAGS=-lRetroConsole
-RINCLUDES=$(PREFIX)/RIncludes
-REZFLAGS=-I$(RINCLUDES)
-
-all: bin/rom.bin
+all: bin/rom.bin obj/rdisk.s obj/rdisk_reloc.s obj/rdisk_rel.sym obj/rdisk_abs.sym bin/rdisk_nonreloc.bin
 
 obj:
 	mkdir obj
@@ -20,28 +15,43 @@ obj:
 bin:
 	mkdir bin
 
-bin/sym:
-	mkdir bin/sym
-
 obj/rdisk.o: rdisk.c obj
 	$(CC) -c -O1 $< -o $@
 
-obj/rdisk.s: obj obj/rdisk.o
-	$(OBJDUMP) -d obj/rdisk.o > obj/rdisk.s
+obj/rdisk_reloc.o: obj obj/rdisk.o
+	$(LD) -Ttext=40851DB0 -o $@ obj/rdisk.o
 
-bin/rdisk.bin: bin obj/rdisk.o
+obj/rdisk.s: obj obj/rdisk.o
+	$(OBJDUMP) -d obj/rdisk.o > $@
+
+obj/rdisk_reloc.s: obj obj/rdisk_reloc.o
+	$(OBJDUMP) -d obj/rdisk_reloc.o > $@
+
+obj/rdisk_rel.sym: obj obj/rdisk.o
+	$(OBJDUMP) -t obj/rdisk.o > $@
+
+obj/rdisk_abs.sym: obj obj/rdisk_reloc.o
+	$(OBJDUMP) -t obj/rdisk_reloc.o > $@
+
+bin/rdisk.bin: bin obj/rdisk_reloc.o
+	$(OBJCOPY) -O binary obj/rdisk_reloc.o $@
+
+bin/rdisk_nonreloc.bin: bin obj/rdisk.o
 	$(OBJCOPY) -O binary obj/rdisk.o $@
 
-bin/rom.bin: bin bin/sym bin/rdisk.bin obj/rdisk.s
-	cp baserom.bin bin/rom.bin
-	printf '\x18' | dd of=bin/rom.bin bs=1 seek=335168 count=1 conv=notrunc # resource flags
-	printf '\x4F' | dd of=bin/rom.bin bs=1 seek=335216 count=1 conv=notrunc # driver flags
-	cat obj/rdisk.s | grep "<.*DiskOpen>\:" | cut -c5-8 | xxd -r -p - | dd of=bin/rom.bin bs=1 seek=335224 count=2 conv=notrunc
-	cat obj/rdisk.s | grep "<.*DiskPrime>\:" | cut -c5-8 | xxd -r -p - | dd of=bin/rom.bin bs=1 seek=335226 count=2 conv=notrunc
-	cat obj/rdisk.s | grep "<.*DiskControl>\:" | cut -c5-8 | xxd -r -p - | dd of=bin/rom.bin bs=1 seek=335228 count=2 conv=notrunc
-	cat obj/rdisk.s | grep "<.*DiskStatus>\:" | cut -c5-8 | xxd -r -p - | dd of=bin/rom.bin bs=1 seek=335230 count=2 conv=notrunc
-	cat obj/rdisk.s | grep "<.*DiskClose>\:" | cut -c5-8 | xxd -r -p - | dd of=bin/rom.bin bs=1 seek=335232 count=2 conv=notrunc
-	cat bin/rdisk.bin | dd of=bin/rom.bin bs=1 seek=335244 conv=notrunc
+bin/rom.bin: bin bin/rdisk.bin obj/rdisk_rel.sym 
+	cp baserom_braun.bin bin/rom.bin
+	cat bin/rdisk.bin | dd of=bin/rom.bin bs=1 seek=335266 skip=50 conv=notrunc # Copy driver code
+	printf '\x78' | dd of=bin/rom.bin bs=1 seek=335168 count=1 conv=notrunc # Set resource flags
+	printf '\x4F' | dd of=bin/rom.bin bs=1 seek=335216 count=1 conv=notrunc # Set driver flags
+	# Copy entry points
+	cat obj/rdisk_rel.sym | grep "Open" | cut -c5-8 | xxd -r -p - | dd of=bin/rom.bin bs=1 seek=335224 count=2 conv=notrunc
+	cat obj/rdisk_rel.sym | grep "Prime" | cut -c5-8 | xxd -r -p - | dd of=bin/rom.bin bs=1 seek=335226 count=2 conv=notrunc
+	cat obj/rdisk_rel.sym | grep "Control" | cut -c5-8 | xxd -r -p - | dd of=bin/rom.bin bs=1 seek=335228 count=2 conv=notrunc
+	cat obj/rdisk_rel.sym | grep "Status" | cut -c5-8 | xxd -r -p - | dd of=bin/rom.bin bs=1 seek=335230 count=2 conv=notrunc
+	cat obj/rdisk_rel.sym | grep "Close" | cut -c5-8 | xxd -r -p - | dd of=bin/rom.bin bs=1 seek=335232 count=2 conv=notrunc
+	# Copy ROM disk	
+	dd if=RDisk1M5 of=bin/rom.bin bs=1024 seek=512 count=1536 conv=notrunc
 
 .PHONY: clean
 clean: