From 15ab50c1d0ca949b9678a03cfc8929f4cfee2878 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Wed, 23 Jan 2019 19:22:40 +0000 Subject: [PATCH] tiny68k: build with new core code --- Kernel/platform-tiny68k/Makefile | 10 ++++++++-- Kernel/platform-tiny68k/README | 9 ++++++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/Kernel/platform-tiny68k/Makefile b/Kernel/platform-tiny68k/Makefile index 14a20276..5533f7ae 100644 --- a/Kernel/platform-tiny68k/Makefile +++ b/Kernel/platform-tiny68k/Makefile @@ -8,9 +8,12 @@ ASRCS += tricks.S DSRCS = ../dev/devide.c ../dev/mbr.c ../dev/blkdev.c ../dev/devide_discard.c DOBJS = $(patsubst ../dev/%.c,%.o, $(DSRCS)) +LSRCS = ../lib/68000exception.c +LOBJS = $(patsubst ../lib/%.c,%.o, $(LSRCS)) + COBJS = $(CSRCS:.c=$(BINEXT)) AOBJS = $(ASRCS:.S=.o) -OBJS = $(COBJS) $(AOBJS) $(DOBJS) +OBJS = $(COBJS) $(AOBJS) $(DOBJS) $(LOBJS) CROSS_CCOPTS += -I../dev/ @@ -25,6 +28,9 @@ $(AOBJS): %.o: %.S $(DOBJS): %.o: ../dev/%.c $(CROSS_CC) $(CROSS_CCOPTS) -c $< +$(LOBJS): %.o: ../lib/%.c + $(CROSS_CC) $(CROSS_CCOPTS) -c $< + tricks.S: ../lib/68000flat.S clean: @@ -34,7 +40,7 @@ image: $(CROSS_LD) -M -o fuzix.elf -T fuzix.ld \ crt0.o \ p68000.o ../start.o ../version.o ../lowlevel-68000.o \ - tricks.o main.o ../timer.o ../kdata.o devices.o \ + tricks.o main.o ../timer.o ../kdata.o 68000exception.o devices.o \ ../devio.o ../filesys.o ../process.o ../inode.o ../syscall_fs.o \ ../syscall_proc.o ../syscall_other.o ../mm.o ../flat.o \ ../tty.o ../devsys.o ../usermem.o ../syscall_fs2.o \ diff --git a/Kernel/platform-tiny68k/README b/Kernel/platform-tiny68k/README index 2840af09..291dc8d2 100644 --- a/Kernel/platform-tiny68k/README +++ b/Kernel/platform-tiny68k/README @@ -58,9 +58,8 @@ To Do Propogate synchronous trap changes to Z80+MMU and Z180 illegal and maybe generically jp 0 and 0 corruptor ? -Move lots of p68000.S code into lowlevel-68000.S -Need some kind of CPU specific C file (or a general one with ifdefs ?) and -then move lots of platform/main.c into it. +Clean up switchout/switchin/dofork/forkreturn. We only ever return from a +fork() as the parent so the d0.w push/pop can go everywhere 68K has space to add ptrace? @@ -109,3 +108,7 @@ DONE Switch from one process in memory model to flat model with parent first DONE All I/O going via buffers DONE Dynamic udata allocation DONE Do we need the extra irqstack any more ? +DONE Move lots of p68000.S code into lowlevel-68000.S +DONE Need some kind of CPU specific C file (or a general one with ifdefs ?) and + then move lots of platform/main.c into it. + -- 2.34.1