diff options
| -rw-r--r-- | sys/Makefile | 6 | ||||
| -rw-r--r-- | sys/arch/amd64/cpu/boot.S | 2 | ||||
| -rw-r--r-- | sys/kern/Makefile | 10 | ||||
| -rw-r--r-- | sys/kern/kern_init.c | 38 |
4 files changed, 55 insertions, 1 deletions
diff --git a/sys/Makefile b/sys/Makefile index bfac75a..e345114 100644 --- a/sys/Makefile +++ b/sys/Makefile @@ -4,12 +4,16 @@ SYS_CFLAGS = ARCH = .PHONY: all -all: arch +all: kern arch .PHONY: arch arch: cd arch/$(ARCH); make CC=$(CC) LD=$(LD) SYS_CFLAGS="$(SYS_CFLAGS)" +.PHONY: kern +kern: + cd kern/; make CC=$(CC) LD=$(LD) SYS_CFLAGS="$(SYS_CFLAGS)" + .PHONY: clean clean: cd arch/$(ARCH); make clean diff --git a/sys/arch/amd64/cpu/boot.S b/sys/arch/amd64/cpu/boot.S index 1d21572..12ba9e4 100644 --- a/sys/arch/amd64/cpu/boot.S +++ b/sys/arch/amd64/cpu/boot.S @@ -48,6 +48,8 @@ _start: lea bootmsg(%rip), %rdi movq bootmsg_len, %rsi call uart_write + + call kmain /* Call our kernel entrypoint */ 1: cli hlt jmp 1b diff --git a/sys/kern/Makefile b/sys/kern/Makefile new file mode 100644 index 0000000..27fe60b --- /dev/null +++ b/sys/kern/Makefile @@ -0,0 +1,10 @@ +CFILES = $(shell find . -name "*.c") +OFILES = $(CFILES:.c=.o) +CC = +SYS_CFLAGS = + +.PHONY: all +all: $(OFILES) + +%.o: %.c + $(CC) -c $< $(SYS_CFLAGS) -I../inc/ -o $@ diff --git a/sys/kern/kern_init.c b/sys/kern/kern_init.c new file mode 100644 index 0000000..b37fb84 --- /dev/null +++ b/sys/kern/kern_init.c @@ -0,0 +1,38 @@ +/* + * Copyright (c) 2025 Ian Marco Moffett and the Osmora Team. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of Hyra nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#include <sys/types.h> + +void kmain(void); + +void +kmain(void) +{ + (void)0; +} |