1
0
Fork 0
mirror of https://gitlab.com/sortix/sortix.git synced 2023-02-13 20:55:38 -05:00
sortix--sortix/sortix/Makefile

203 lines
4.1 KiB
Makefile
Raw Normal View History

2012-09-10 17:36:15 -04:00
include ../compiler.mak
include ../version.mak
include ../dirs.mak
2012-09-10 17:36:15 -04:00
ifndef OPTLEVEL
OPTLEVEL:=-O2
2011-08-05 08:25:00 -04:00
endif
ifeq ($(CPU),x86)
BUILDID=x86
X86FAMILY=1
2012-09-10 17:36:15 -04:00
CPUFLAGS=
CPULDFLAGS=
CPUOBJS:=$(CPU)/boot.o $(CPU)/base.o $(CPU)/x86.o
2011-08-05 08:25:00 -04:00
endif
ifeq ($(CPU),x64)
BUILDID=x64
X86FAMILY=1
2012-09-10 17:36:15 -04:00
CPUFLAGS=-ffreestanding -mno-red-zone
2012-09-28 17:37:32 -04:00
CPULDFLAGS=
2012-09-10 17:36:15 -04:00
CPUOBJS:=$(CPU)/base.o $(CPU)/x64.o
2011-08-05 08:25:00 -04:00
endif
ifdef X86FAMILY
CPUOBJS:=$(CPUOBJS) \
$(CPU)/memorymanagement.o \
x86-family/memorymanagement.o \
2011-08-05 08:25:00 -04:00
$(CPU)/interrupt.o \
$(CPU)/gdt.o \
x86-family/gdt.o \
$(CPU)/idt.o \
x86-family/idt.o \
$(CPU)/syscall.o \
Implemented the fork() system call and what it needed to work properly. This commit got completely out of control. Added the fork(), getpid(), getppid(), sleep(), usleep() system calls, and aliases in the Maxsi:: namespace. Fixed a bug where zero-byte allocation would fail. Worked on the DescriptorTable class which now works and can fork. Got rid of some massive print-registers statements and replaced them with the portable InterruptRegisters::LogRegisters() function. Removed the SysExecuteOld function and replaced it with Process::Execute(). Rewrote the boot sequence in kernel.cpp such that it now loads the system idle process 'idle' as PID 0, and the initization process 'init' as PID 1. Rewrote the SIGINT hack. Processes now maintain a family-tree structure and keep track of their threads. PIDs are now allocated using a simple hack. Virtual memory per-process can now be allocated using a simple hack. Processes can now be forked. Fixed the Process::Execute function such that it now resets the stack pointer to where the stack actually is - not just a magic value. Removed the old and ugly Process::_endcodesection hack. Rewrote the scheduler into a much cleaner and faster version. Debug code is now moved to designated functions. The noop kernel-thread has been replaced by a simple user-space infinite-loop program 'idle'. The Thread class has been seperated from the Scheduler except in Scheduler- related code. Thread::{Save,Load}Registers has been improved and has been moved to $(CPU)/thread.cpp. Threads can now be forked. A new CreateThread function creates threads properly and portably. Added a MicrosecondsSinceBoot() function. Fixed a crucial bug in MemoryManagement::Fork(). Added an 'idle' user-space program that is a noop infinite loop, which is used by the scheduler when there is nothing to do. Rewrote the 'init' program such that it now forks off a shell, instead of becoming the shell. Added the $$ (current PID) and $PPID (parent PPID) variables to the shell.
2011-09-21 14:52:29 -04:00
$(CPU)/thread.o \
$(CPU)/scheduler.o \
$(CPU)/process.o \
x86-family/msr.o \
x86-family/float.o \
x86-family/x86-family.o
2011-08-05 08:25:00 -04:00
CPUFLAGS:=$(CPUFLAGS) -mno-mmx -mno-sse -mno-sse2 -mno-sse3 -mno-3dnow
endif
DIRS=. x64 x86 x86-family fs kb kb/layout
2011-08-05 08:25:00 -04:00
2012-09-10 17:36:15 -04:00
DEFINES:=-DSORTIX_KERNEL -U_GNU_SOURCE
ifeq ($(PANIC_SHORT),1)
DEFINES:=$(DEFINES) -DPANIC_SHORT
endif
ifeq ($(DISKWRITE),1)
DEFINES:=$(DEFINES) -DENABLE_DISKWRITE=1
else
DEFINES:=$(DEFINES) -DENABLE_DISKWRITE=0
endif
ifeq ($(CALLTRACE),1)
DEFINES:=$(DEFINES) -DENABLE_CALLTRACE=1
else
DEFINES:=$(DEFINES) -DENABLE_CALLTRACE=0
endif
ifdef VERSION
DEFINES:=$(DEFINES) -DVERSIONSTR=\"$(VERSION)\"
endif
2012-02-13 07:16:43 -05:00
2012-09-10 17:36:15 -04:00
INCLUDES=-I. -Iinclude
2012-02-13 07:16:43 -05:00
CPPFLAGS=$(INCLUDES) $(DEFINES)
ifeq ($(DEBUG_KERNEL),1)
FLAGSDEBUG=-g3
else
2012-09-10 17:36:15 -04:00
FLAGSDEBUG=$(OPTLEVEL)
endif
2012-09-10 17:36:15 -04:00
FLAGS=$(CPUFLAGS) -Wall -Wall -Wextra -nostdlib -nostartfiles \
-nodefaultlibs -fno-stack-protector $(FLAGSDEBUG)
2012-02-13 07:16:43 -05:00
CFLAGS=$(FLAGS)
CXXFLAGS=$(FLAGS) -std=gnu++0x -fno-exceptions -fno-rtti
2012-09-10 17:36:15 -04:00
ASFLAGS=
2012-02-13 07:16:43 -05:00
STATICLIBS=\
-lc-sortix \
2012-09-28 17:37:32 -04:00
-lgcc \
2012-02-13 07:16:43 -05:00
HEADERDIRS:=$(shell find include -type d)
HEADERS:=$(shell find include -type f)
2011-09-06 13:51:47 -04:00
OBJS=$(CPUOBJS) \
kernel.o \
2012-09-22 16:24:03 -04:00
crc32.o \
string.o \
interrupt.o \
worker.o \
2011-09-06 13:51:47 -04:00
time.o \
log.o \
utf8.o \
memorymanagement.o \
calltrace.o \
$(CPU)/calltrace.o \
kthread.o \
Multithreaded kernel and improvement of signal handling. Pardon the big ass-commit, this took months to develop and debug and the refactoring got so far that a clean merge became impossible. The good news is that this commit does quite a bit of cleaning up and generally improves the kernel quality. This makes the kernel fully pre-emptive and multithreaded. This was done by rewriting the interrupt code, the scheduler, introducing new threading primitives, and rewriting large parts of the kernel. During the past few commits the kernel has had its device drivers thread secured; this commit thread secures large parts of the core kernel. There still remains some parts of the kernel that is _not_ thread secured, but this is not a problem at this point. Each user-space thread has an associated kernel stack that it uses when it goes into kernel mode. This stack is by default 8 KiB since that value works for me and is also used by Linux. Strange things tends to happen on x86 in case of a stack overflow - there is no ideal way to catch such a situation right now. The system call conventions were changed, too. The %edx register is now used to provide the errno value of the call, instead of the kernel writing it into a registered global variable. The system call code has also been updated to better reflect the native calling conventions: not all registers have to be preserved. This makes system calls faster and simplifies the assembly. In the kernel, there is no longer the event.h header or the hacky method of 'resuming system calls' that closely resembles cooperative multitasking. If a system call wants to block, it should just block. The signal handling was also improved significantly. At this point, signals cannot interrupt kernel threads (but can always interrupt user-space threads if enabled), which introduces some problems with how a SIGINT could interrupt a blocking read, for instance. This commit introduces and uses a number of new primitives such as kthread_lock_mutex_signal() that attempts to get the lock but fails if a signal is pending. In this manner, the kernel is safer as kernel threads cannot be shut down inconveniently, but in return for complexity as blocking operations must check they if they should fail. Process exiting has also been refactored significantly. The _exit(2) system call sets the exit code and sends SIGKILL to all the threads in the process. Once all the threads have cleaned themselves up and exited, a worker thread calls the process's LastPrayer() method that unmaps memory, deletes the address space, notifies the parent, etc. This provides a very robust way to terminate processes as even half-constructed processes (during a failing fork for instance) can be gracefully terminated. I have introduced a number of kernel threads to help avoid threading problems and simplify kernel design. For instance, there is now a functional generic kernel worker thread that any kernel thread can schedule jobs for. Interrupt handlers run with interrupts off (hence they cannot call kthread_ functions as it may deadlock the system if another thread holds the lock) therefore they cannot use the standard kernel worker threads. Instead, they use a special purpose interrupt worker thread that works much like the generic one expect that interrupt handlers can safely queue work with interrupts off. Note that this also means that interrupt handlers cannot allocate memory or print to the kernel log/screen as such mechanisms uses locks. I'll introduce a lock free algorithm for such cases later on. The boot process has also changed. The original kernel init thread in kernel.cpp creates a new bootstrap thread and becomes the system idle thread. Note that pid=0 now means the kernel, as there is no longer a system idle process. The bootstrap thread launches all the kernel worker threads and then creates a new process and loads /bin/init into it and then creates a thread in pid=1, which starts the system. The bootstrap thread then quietly waits for pid=1 to exit after which it shuts down/reboots/panics the system. In general, the introduction of race conditions and dead locks have forced me to revise a lot of the design and make sure it was thread secure. Since early parts of the kernel was quite hacky, I had to refactor such code. So it seems that the risk of dead locks forces me to write better code. Note that a real preemptive multithreaded kernel simplifies the construction of blocking system calls. My hope is that this will trigger a clean up of the filesystem code that current is almost beyond repair. Almost all of the kernel was modified during this refactoring. To the extent possible, these changes have been backported to older non-multithreaded kernel, but many changes were tightly coupled and went into this commit. Of interest is the implementation of the kthread_ api based on the design of pthreads; this library allows easy synchronization mechanisms and includes C++-style scoped locks. This commit also introduces new worker threads and tested mechanisms for interrupt handlers to schedule work in a kernel worker thread. A lot of code have been rewritten from scratch and has become a lot more stable and correct. Share and enjoy!
2012-08-01 11:30:34 -04:00
$(CPU)/kthread.o \
interlock.o \
$(CPU)/interlock.o \
2011-09-06 13:51:47 -04:00
panic.o \
keyboard.o \
kb/ps2.o \
kb/layout/us.o \
2011-09-06 13:51:47 -04:00
scheduler.o \
syscall.o \
sound.o \
pci.o \
com.o \
2011-09-06 13:51:47 -04:00
uart.o \
terminal.o \
linebuffer.o \
logterminal.o \
textterminal.o \
2011-09-06 13:51:47 -04:00
serialterminal.o \
textbuffer.o \
vgatextbuffer.o \
lfbtextbuffer.o \
2011-09-06 13:51:47 -04:00
descriptors.o \
device.o \
refcount.o \
video.o \
bga.o \
2011-09-06 13:51:47 -04:00
vga.o \
kernelinfo.o \
2011-09-06 13:51:47 -04:00
elf.o \
process.o \
initrd.o \
thread.o \
2011-11-16 02:37:29 -05:00
io.o \
pipe.o \
filesystem.o \
directory.o \
mount.o \
signal.o \
2012-05-27 08:31:09 -04:00
fs/util.o \
fs/devfs.o \
fs/initfs.o \
2011-11-18 11:49:31 -05:00
fs/ramfs.o \
fs/videofs.o \
ata.o \
2011-09-06 13:51:47 -04:00
2012-09-10 17:36:15 -04:00
ALLOBJS=\
$(OBJS) \
end.o
2011-08-05 08:25:00 -04:00
all: sortix.bin
.PHONY: all headers clean install install-include-dirs install-headers
headers:
2011-08-05 08:25:00 -04:00
# x64 compilation
x64/boot.o: x64/boot.s
2012-09-10 17:36:15 -04:00
$(HOSTAS) -64 $< -o $@
2011-08-05 08:25:00 -04:00
2012-09-10 17:36:15 -04:00
sortix-x64.tmp: $(ALLOBJS) x64/boot.o
2012-09-28 17:37:32 -04:00
$(HOSTCXX) -nodefaultlibs -nostartfiles -Wl,-N -Wl,-melf_x86_64_sortix -Wl,-Ttext -Wl,100000 -Wl,-z -Wl,max-page-size=0x1000 -o sortix-x64-internal.out x64/boot.o $(OBJS) $(STATICLIBS) end.o
2012-09-10 17:36:15 -04:00
$(HOSTOBJCOPY) sortix-x64-internal.out -O elf32-i386 sortix-x64.tmp
2011-08-05 08:25:00 -04:00
# x86 compilation
2012-09-10 17:36:15 -04:00
sortix-x86.tmp: $(ALLOBJS)
2012-09-28 17:37:32 -04:00
$(HOSTCXX) -nodefaultlibs -nostartfiles -Wl,-melf_i386_sortix -Wl,-Ttext -Wl,100000 -o $@ $(OBJS) $(STATICLIBS) end.o
2011-08-05 08:25:00 -04:00
# general rules
sortix.bin: sortix-$(BUILDID).tmp
2011-08-05 08:25:00 -04:00
cp -vu $< $@
%.o: %.cpp
2012-09-10 17:36:15 -04:00
$(HOSTCXX) -c $< -o $@ $(CPPFLAGS) $(CXXFLAGS)
2011-08-05 08:25:00 -04:00
%.o: %.s
2012-09-10 17:36:15 -04:00
$(HOSTAS) $< -o $@ $(ASFLAGS)
2011-08-05 08:25:00 -04:00
clean:
for D in $(DIRS); do rm -f $$D/*.o $$D/*.bin $$D/*.out $$D/*.tmp; done
2011-08-05 08:25:00 -04:00
# Installation into sysroot
2012-09-10 17:36:15 -04:00
install: install-headers install-kernel
install-include-dirs: headers
2012-09-10 17:36:15 -04:00
mkdir -p $(INSTALLINCLUDEDIR)
DIRS=$$(echo $(HEADERDIRS) | \
tr ' ' '\n' | \
sed 's/include\/*//'); \
for D in $$DIRS; do \
mkdir -p $(INSTALLINCLUDEDIR)/$$D || exit $?; \
done
install-headers: install-include-dirs headers
2012-09-10 17:36:15 -04:00
for SRC in $(HEADERS); do \
DEST=`echo $$SRC | sed 's/include\///'`; \
cp -P $$SRC $(INSTALLINCLUDEDIR)/$$DEST || exit $?; \
done
2011-08-05 08:25:00 -04:00
2012-09-10 17:36:15 -04:00
install-kernel: install-kernel-binary
install-kernel-binary:
mkdir -p $(INSTALLBOOTDIR)/$(HOST)
cp -P sortix.bin $(INSTALLBOOTDIR)/$(HOST)