summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNao Pross <naopross@thearcway.org>2017-05-02 16:14:41 +0200
committerNao Pross <naopross@thearcway.org>2017-05-02 16:14:41 +0200
commit1ec8f14f03322e3fe1f56f4abcbc85f5c2934dfc (patch)
treeee02eed9bdffd1db5bff20d3b9fa47b89f0e264b
parentMerge branch 'master' into naopross (diff)
downloadz80uPC-1ec8f14f03322e3fe1f56f4abcbc85f5c2934dfc.tar.gz
z80uPC-1ec8f14f03322e3fe1f56f4abcbc85f5c2934dfc.zip
fix for sdcc makefile
fix for the old makefile, because it could't compile more than one source file. new libc directory with mem.c to start implementing the standard C library (or at least the part we need).
Diffstat (limited to '')
-rw-r--r--sw/z80/crt0.s125
-rw-r--r--sw/z80/kernel/include/types.h2
-rw-r--r--sw/z80/libc/mem.c7
-rw-r--r--sw/z80/makefile20
4 files changed, 122 insertions, 32 deletions
diff --git a/sw/z80/crt0.s b/sw/z80/crt0.s
index d0ae3ca..7701ca6 100644
--- a/sw/z80/crt0.s
+++ b/sw/z80/crt0.s
@@ -1,30 +1,103 @@
- .area _HEADER (ABS)
- ;; reset vector
- .org 0
- jp init
-
- .org 0x08
- reti
- .org 0x10
- reti
- .org 0x18
- reti
- .org 0x20
- reti
- .org 0x28
- reti
- .org 0x30
- reti
- .org 0x38
- reti
-
- .org 0x100
+;--------------------------------------------------------------------------
+; crt0.s - Generic crt0.s for a Z80
+;
+; Copyright (C) 2000, Michael Hope
+;
+; This library is free software; you can redistribute it and/or modify it
+; under the terms of the GNU General Public License as published by the
+; Free Software Foundation; either version 2, or (at your option) any
+; later version.
+;
+; This library is distributed in the hope that it will be useful,
+; but WITHOUT ANY WARRANTY; without even the implied warranty of
+; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+; GNU General Public License for more details.
+;
+; You should have received a copy of the GNU General Public License
+; along with this library; see the file COPYING. If not, write to the
+; Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
+; MA 02110-1301, USA.
+;
+; As a special exception, if you link this library with other files,
+; some of which are compiled with SDCC, to produce an executable,
+; this library does not by itself cause the resulting executable to
+; be covered by the GNU General Public License. This exception does
+; not however invalidate any other reasons why the executable file
+; might be covered by the GNU General Public License.
+;--------------------------------------------------------------------------
+ .module crt0
+ .globl _main
+
+ .area _HEADER (ABS)
+ ;; Reset vector
+ .org 0
+ jp init
+
+ .org 0x08
+ reti
+ .org 0x10
+ reti
+ .org 0x18
+ reti
+ .org 0x20
+ reti
+ .org 0x28
+ reti
+ .org 0x30
+ reti
+ .org 0x38
+ reti
+
+ .org 0x100
init:
- ;; set stack
- ld sp,#0xFFFF
+ ;; Set stack pointer directly above top of memory.
+ ld sp,#0xFFFF
+
+ ;; Initialise global variables
+ call gsinit
+ call _main
+ jp _exit
+
+ ;; Ordering of segments for the linker.
+ .area _HOME
+ .area _CODE
+ .area _INITIALIZER
+ .area _GSINIT
+ .area _GSFINAL
+
+ .area _DATA
+ .area _INITIALIZED
+ .area _BSEG
+ .area _BSS
+ .area _HEAP
+
+ .area _CODE
+
+__clock::
+ ld a,#2
+ rst 0x08
+ ret
+
+_exit::
+ ;; Exit - special code to the emulator
+ ld a,#0
+ rst 0x08
+1$:
+ halt
+ jr 1$
+
+ .area _GSINIT
+gsinit::
+ ; ld bc, #l__INITIALIZER
+ ld a, b
+ or a, c
+ jr Z, gsinit_next
+ ; ld de, #s__INITIALIZED
+ ; ld hl, #s__INITIALIZER
+ ldir
+gsinit_next:
- ;; call C main function
- call _main
+ .area _GSFINAL
+ ret
-.globl _main
diff --git a/sw/z80/kernel/include/types.h b/sw/z80/kernel/include/types.h
index adde214..c24b311 100644
--- a/sw/z80/kernel/include/types.h
+++ b/sw/z80/kernel/include/types.h
@@ -6,4 +6,6 @@
#define int16_t int
#define uint16_t unsigned int
+#define size_t uint16_t
+
#endif
diff --git a/sw/z80/libc/mem.c b/sw/z80/libc/mem.c
new file mode 100644
index 0000000..667a752
--- /dev/null
+++ b/sw/z80/libc/mem.c
@@ -0,0 +1,7 @@
+#include "types.h"
+#include "mem.h"
+
+void *malloc(size_t size)
+{
+ :
+}
diff --git a/sw/z80/makefile b/sw/z80/makefile
index ecdd9a4..3d682ca 100644
--- a/sw/z80/makefile
+++ b/sw/z80/makefile
@@ -4,6 +4,7 @@
OSNAME := helvetiOS
CSOURCES := $(wildcard kernel/*.c) $(wildcard libc/*.c)
+OBJECTS := $(patsubst %.c,build/%.rel,$(CSOURCES))
HEXFILE := build/$(OSNAME).hex
BINARY := build/$(OSNAME).bin
@@ -12,26 +13,33 @@ BINARY := build/$(OSNAME).bin
CC := sdcc
-CFLAGS := -mz80 --no-std-crt0 crt0.rel \
+CFLAGS := -mz80 \
-I kernel/include -I libc/include -DDEBUG
-LDFLAGS := --code-loc 0x0800 --data-loc 0x8000
+LDFLAGS := -mz80 --no-std-crt0 crt0.rel \
+ --code-loc 0x0800 --data-loc 0x8000
+.PHONY: dirs dis clean
all: $(BINARY)
# build binary
-$(BINARY): $(CSOURCES) crt0.rel
- mkdir -p build
- $(CC) $(CFLAGS) $(LDFLSGS) $(CSOURCES) -o $(HEXFILE)
+$(BINARY): $(OBJECTS) dirs
+ $(CC) $(LDFLAGS) $(OBJECTS) -o $(HEXFILE)
xxd -r -p $(HEXFILE) $(BINARY)
+$(OBJECTS): build/%.rel : %.c $(CSOURCES) dirs crt0.rel
+ $(CC) $(CFLAGS) -c $< -o $@
+
crt0.rel: crt0.s
sdasz80 -o $<
+dirs:
+ mkdir -p build build/kernel build/libc
+
dis: $(BINARY)
z80dasm -a -g 0h $< -o $(OSNAME).s
clean:
- - rm build/*
+ - rm -rd build/*
- rm $(OSNAME).s
- rm crt0.rel