From ec4f58e8e362e371718f656923c2d234f8ac215c Mon Sep 17 00:00:00 2001 From: Jake Mannens Date: Sat, 7 Jul 2018 20:19:23 +1000 Subject: Added '-g' flag for GCC to all makefiles to ensure debugging information is produced. This may change later. Added the new directory 'lib' to the source tree which build lib.a, an archive containing common library routines for both the kernel and userspace code to use. Added the file string.c to the lib directory (as well as the appropriate headers in /include) which provides some basic functions from the standard C string library. Added a physical memory manager which is now located in memory.c. This memory manager tracks free pages from 1MB-8MB with a simple table and allocates memory in blocks of 4KB pages. Multiple pages can be allocated in which they are returned as a linked list. Added a 'page window' in memory.c which allows the temporary mapping of a single page at a time into the current address space. Moved all paging routines that were previously located in page.s over to memory.c where they have been re-implemented as a mixture of C and inline assembly. Moved the primative userspace routines from usrspace.s over to the new sched.c. The only remaining routine, usrcall is now located in asm.s as 'switch_to' which takes two arguments, pointers to the task structure and task state structure of the new task which is being switched to. Pages for userspace are now allocated dynamically. The user binary is loaded in at 1GB upwards. The user stack is located at the end of the 4GB address space with the lower 1GB being reserved for the kernel. Updated the link.ld file for the userspace binary to include the new starting address 0x40000000 (1GB). Renamed the symbols for the user binary blob to make them shorter. --- usrbin/Makefile | 7 +++++-- usrbin/link.ld | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'usrbin') diff --git a/usrbin/Makefile b/usrbin/Makefile index 16a607f..9a40cbc 100644 --- a/usrbin/Makefile +++ b/usrbin/Makefile @@ -4,7 +4,7 @@ SRCS = $(wildcard *.c) ASMS = $(wildcard *.s) OBJS = $(SRCS:.c=.o) $(ASMS:.s=.o) -CFLAGS = -m32 -I../include -ffreestanding -nostdinc -nostdlib -fno-stack-protector -fno-pie +CFLAGS = -m32 -I../include -ffreestanding -nostdinc -nostdlib -fno-stack-protector -fno-pie -g LDFLAGS = -m elf_i386 -T link.ld ASMFLAGS = -f elf32 @@ -24,7 +24,10 @@ build: $(TARGET) $(TARGET): $(OBJS) $(LD) -o usrbin.bin $(OBJS) - objcopy -I binary -O elf32-i386 -B i386 usrbin.bin $(TARGET) + objcopy -I binary -O elf32-i386 -B i386 usrbin.bin $(TARGET) \ + --redefine-sym _binary_usrbin_bin_start=_usrbin_start \ + --redefine-sym _binary_usrbin_bin_end=_usrbin_end \ + --redefine-sym _binary_usrbin_bin_size=_usrbin_size clean: rm -f usrbin.bin diff --git a/usrbin/link.ld b/usrbin/link.ld index c1a7a42..57edac9 100644 --- a/usrbin/link.ld +++ b/usrbin/link.ld @@ -1,7 +1,7 @@ OUTPUT_FORMAT(binary) SECTIONS { - . = 0x100000; + . = 0x40000000; .text : { *(.entry); .*(.text) } .data : { *(.data) } .bss : { *(.bss) } -- cgit v1.3