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

146 lines
3.1 KiB
Makefile
Raw Normal View History

Initial version of Sortix.
2011-08-05 08:25:00 -04:00
ifndef CPU
CPU=x86
endif
ifeq ($(CPU),x86)
Restored support for JSSortix using very ugly hacks. :(
2011-09-08 05:10:41 -04:00
BUILDID=x86
X86FAMILY=1
Initial version of Sortix.
2011-08-05 08:25:00 -04:00
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)
Restored support for JSSortix using very ugly hacks. :(
2011-09-08 05:10:41 -04:00
BUILDID=x64
X86FAMILY=1
Initial version of Sortix.
2011-08-05 08:25:00 -04:00
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) \
Rewrote memory management again and added support for x64 and forking.
2011-10-02 09:58:08 -04:00
$(CPU)/memorymanagement.o \
x86-family/memorymanagement.o \
Initial version of Sortix.
2011-08-05 08:25:00 -04:00
$(CPU)/interrupt.o \
Moved CPU code shared by x86 and x64 into x86-family.
2011-08-12 11:17:02 -04:00
$(CPU)/gdt.o \
Ported kernel to new syscall API and started cleaning up the old one.
2011-10-26 18:05:20 -04:00
$(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 \
Moved CPU code shared by x86 and x64 into x86-family.
2011-08-12 11:17:02 -04:00
x86-family/x86-family.o
Initial version of Sortix.
2011-08-05 08:25:00 -04:00
CPUFLAGS:=$(CPUFLAGS) -mno-mmx -mno-sse -mno-sse2 -mno-sse3 -mno-3dnow
endif
Added sortix/fs to the sortix/Makefile DIRS variable.
2011-11-18 19:08:51 -05:00
DIRS=. x64 x86 x86-family fs
Initial version of Sortix.
2011-08-05 08:25:00 -04:00
DEFINES:=-DSORTIX_KERNEL $(CPUDEFINES)
Restored support for JSSortix using very ugly hacks. :(
2011-09-08 05:10:41 -04:00
ifeq ($(JSSORTIX),1)
DEFINES:=$(DEFINES) -DPLATFORM_SERIAL -DJSSORTIX
BUILDID:=$(BUILDID)-js
endif
Initial version of Sortix.
2011-08-05 08:25:00 -04:00
CPPFLAGSRELEASE=-s -O3
CPPFLAGSDEBUG=
Moved CPU code shared by x86 and x64 into x86-family.
2011-08-12 11:17:02 -04:00
CPPFLAGS=-I.. -I. $(CPUDEFINES) $(CPUFLAGS) -std=gnu++0x -Wall -Wextra -nostdlib -fno-builtin -nostartfiles -nodefaultlibs -fno-exceptions -fno-rtti -fno-stack-protector $(DEFINES) $(CPPFLAGSRELEASE)
Removed lots of deprecated suff!
2011-09-06 13:51:47 -04:00
OBJS=$(CPUOBJS) \
kernel.o \
descriptor_tables.o \
Refactored interrupt system and got rid of old not-mine code.
2011-09-07 12:45:07 -04:00
interrupt.o \
Removed lots of deprecated suff!
2011-09-06 13:51:47 -04:00
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 \
Oh my god, did I include thread.cpp into kernel.cpp!?
2011-11-07 08:36:35 -05:00
thread.o \
Added pipe(2), write(2), and read(2).
2011-11-16 02:37:29 -05:00
io.o \
pipe.o \
Added open(2). Please note that mount points and file systems do not exist yet.
2011-11-17 17:31:41 -05:00
filesystem.o \
Added readdirents(2), which ls(1) now uses, and added dir devices. The initfs and ramfs are now able to list their contents.
2011-11-20 18:02:53 -05:00
directory.o \
Added open(2). Please note that mount points and file systems do not exist yet.
2011-11-17 17:31:41 -05:00
mount.o \
Added an filesystem able to browse the initrd.
2011-11-20 10:25:32 -05:00
fs/initfs.o \
Added a RAM filesystem.
2011-11-18 11:49:31 -05:00
fs/ramfs.o \
Removed lots of deprecated suff!
2011-09-06 13:51:47 -04:00
../libmaxsi/libmaxsi-sortix.a
Initial version of Sortix.
2011-08-05 08:25:00 -04:00
JSOBJS:=$(subst .o,-js.o,$(OBJS))
all: sortix.bin
# jssortix compilation
jssortix: jssortix.bin
Restored support for JSSortix using very ugly hacks. :(
2011-09-08 05:10:41 -04:00
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 $@
Initial version of Sortix.
2011-08-05 08:25:00 -04:00
# 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
Restored support for JSSortix using very ugly hacks. :(
2011-09-08 05:10:41 -04:00
sortix.bin: sortix-$(BUILDID).tmp
Initial version of Sortix.
2011-08-05 08:25:00 -04:00
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"
Copy permalink