2afe9d1fd6
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.
138 lines
3 KiB
Makefile
138 lines
3 KiB
Makefile
ifndef CPU
|
|
CPU=x86
|
|
endif
|
|
|
|
ifeq ($(CPU),x86)
|
|
BUILDID=x86
|
|
X86FAMILY=1
|
|
CPUDEFINES=-DPLATFORM_X86
|
|
CPUFLAGS=-m32
|
|
CPULDFLAGS=-melf_i386
|
|
CPUASFLAGS=-32
|
|
CPUNASMFLAGS=-felf32
|
|
CPUOBJS=$(CPU)/boot.o $(CPU)/base.o $(CPU)/x86.o
|
|
endif
|
|
|
|
ifeq ($(CPU),x64)
|
|
BUILDID=x64
|
|
X86FAMILY=1
|
|
CPUDEFINES=-DPLATFORM_X64
|
|
CPUFLAGS=-m64 -ffreestanding -mcmodel=large -mno-red-zone
|
|
CPULDFLAGS=-melf64-little -z max-page-size=0x1000
|
|
CPUASFLAGS=-64
|
|
CPUNASMFLAGS=-felf64
|
|
CPUOBJS=$(CPU)/base.o $(CPU)/x64.o
|
|
endif
|
|
|
|
ifdef X86FAMILY
|
|
CPUOBJS:=$(CPUOBJS) \
|
|
$(CPU)/memorymanagement.o \
|
|
x86-family/memorymanagement.o \
|
|
$(CPU)/interrupt.o \
|
|
$(CPU)/gdt.o \
|
|
$(CPU)/syscall.o \
|
|
$(CPU)/thread.o \
|
|
$(CPU)/scheduler.o \
|
|
x86-family/x86-family.o
|
|
CPUFLAGS:=$(CPUFLAGS) -mno-mmx -mno-sse -mno-sse2 -mno-sse3 -mno-3dnow
|
|
endif
|
|
|
|
DIRS=. x64 x86 x86-family
|
|
|
|
DEFINES:=-DSORTIX_KERNEL $(CPUDEFINES)
|
|
ifeq ($(JSSORTIX),1)
|
|
DEFINES:=$(DEFINES) -DPLATFORM_SERIAL -DJSSORTIX
|
|
BUILDID:=$(BUILDID)-js
|
|
endif
|
|
CPPFLAGSRELEASE=-s -O3
|
|
CPPFLAGSDEBUG=
|
|
CPPFLAGS=-I.. -I. $(CPUDEFINES) $(CPUFLAGS) -std=gnu++0x -Wall -Wextra -nostdlib -fno-builtin -nostartfiles -nodefaultlibs -fno-exceptions -fno-rtti -fno-stack-protector $(DEFINES) $(CPPFLAGSRELEASE)
|
|
OBJS=$(CPUOBJS) \
|
|
kernel.o \
|
|
descriptor_tables.o \
|
|
interrupt.o \
|
|
time.o \
|
|
log.o \
|
|
panic.o \
|
|
keyboard.o \
|
|
scheduler.o \
|
|
syscall.o \
|
|
sound.o \
|
|
pci.o \
|
|
uart.o \
|
|
vgaterminal.o \
|
|
serialterminal.o \
|
|
descriptors.o \
|
|
device.o \
|
|
vga.o \
|
|
elf.o \
|
|
process.o \
|
|
initrd.o \
|
|
../libmaxsi/libmaxsi-sortix.a
|
|
|
|
JSOBJS:=$(subst .o,-js.o,$(OBJS))
|
|
|
|
all: sortix.bin
|
|
|
|
# jssortix compilation
|
|
|
|
jssortix: jssortix.bin
|
|
|
|
sortix-x86-js.tmp: $(OBJS)
|
|
ld -melf_i386 -Ttext 100000 -o sortix-x86-js-internal.out $(OBJS)
|
|
objcopy -O binary sortix-x86-js-internal.out $@
|
|
|
|
# x64 compilation
|
|
x64/boot.o: x64/boot.s
|
|
as -32 $< -o $@
|
|
|
|
sortix-x64.tmp: $(OBJS) x64/boot.o
|
|
ld -N -melf_x86_64 -Ttext 110000 -o sortix-x64-internal.out $(OBJS)
|
|
objcopy -O binary sortix-x64-internal.out sortix-x64-internal.tmp
|
|
objcopy --add-section kernel64=sortix-x64-internal.tmp \
|
|
--set-section-flag kernel64=alloc,data,load,contents \
|
|
$(CPU)/boot.o
|
|
ld -melf_i386 -Ttext 100000 $(CPU)/boot.o -o $@
|
|
# move section to 0x11000
|
|
objcopy --change-section-address kernel64=1114112 $@
|
|
|
|
# x86 compilation
|
|
|
|
sortix-x86.tmp: $(OBJS)
|
|
ld -melf_i386 -Ttext 100000 -o $@ $(OBJS)
|
|
|
|
# general rules
|
|
|
|
sortix.bin: sortix-$(BUILDID).tmp
|
|
cp -vu $< $@
|
|
|
|
%.o: %.cpp
|
|
g++ -c $< -o $@ $(CPPFLAGS)
|
|
|
|
%.o: %.s
|
|
as $(CPUASFLAGS) $< -o $@
|
|
|
|
%.o: %.asm
|
|
nasm $(CPUNASMFLAGS) $< -o $@
|
|
|
|
clean:
|
|
for D in $(DIRS); do rm -fv $$D/*.o $$D/*.bin $$D/*.out $$D/*.tmp; done
|
|
|
|
# Local machine
|
|
|
|
install: sortix.bin
|
|
cp sortix.bin /boot
|
|
|
|
uninstall:
|
|
rm -f /boot/sortix.bin
|
|
|
|
# Remote machine
|
|
|
|
install-remote: sortix.bin
|
|
scp -r ./ 192.168.2.6:/home/sortie/Desktop/sortix
|
|
scp sortix.bin root@192.168.2.6:/boot
|
|
ssh root@192.168.2.6 "init 6"
|
|
|
|
uninstall-remote:
|
|
ssh root@192.168.2.6 "rm /boot/sortix.bin"
|