nortti
/
sortix-mirror
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
sortix-mirror/sortix/Makefile

152 lines
3.1 KiB
Makefile
Raw Normal View History

Added O=-ON and PANIC_SHORT=1 variables to the makefile.
2011-11-28 14:25:00 +00:00
ifndef O
O:=-O3
endif
Initial version of Sortix.
2011-08-05 12:25:00 +00:00
ifndef CPU
CPU=x86
endif
ifeq ($(CPU),x86)
Restored support for JSSortix using very ugly hacks. :(
2011-09-08 09:10:41 +00:00
BUILDID=x86
X86FAMILY=1
Initial version of Sortix.
2011-08-05 12:25:00 +00: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 09:10:41 +00:00
BUILDID=x64
X86FAMILY=1
Initial version of Sortix.
2011-08-05 12:25:00 +00: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 13:58:08 +00:00
$(CPU)/memorymanagement.o \
x86-family/memorymanagement.o \
Initial version of Sortix.
2011-08-05 12:25:00 +00:00
$(CPU)/interrupt.o \
Moved CPU code shared by x86 and x64 into x86-family.
2011-08-12 15:17:02 +00:00
$(CPU)/gdt.o \
Ported kernel to new syscall API and started cleaning up the old one.
2011-10-26 22:05:20 +00: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 18:52:29 +00:00
$(CPU)/thread.o \
$(CPU)/scheduler.o \
x64 now compiles again and runs on real hardware. A nasty bug was fixed that caused triple faults on systems with > 1 GiB RAM.
2011-11-29 00:21:59 +00:00
$(CPU)/process.o \
Moved CPU code shared by x86 and x64 into x86-family.
2011-08-12 15:17:02 +00:00
x86-family/x86-family.o
Initial version of Sortix.
2011-08-05 12:25:00 +00:00
CPUFLAGS:=$(CPUFLAGS) -mno-mmx -mno-sse -mno-sse2 -mno-sse3 -mno-3dnow
endif
Refactored the kernel keyboard API, but kept system calls compatible. Caps lock now works as caps lock, not as shift lock. This new design will allow implementing a working tty, such that stdin is the only way to access the keyboard, instead of the current hacky way of using a special system call to read from the keyboard. Added a new system header file <sys/keycodes.h> defining the constants for every key on the keyboard. This will be used in future APIs. The main change is to split the keyboard driver into a class that reads from the keyboard, while another class handles the translation into printable characters (if possible). This allows a terminal driver based on logical key presses and printable characters, instead of a terminal driver based only on unicode-ish codes.
2012-01-07 20:09:01 +00:00
DIRS=. x64 x86 x86-family fs kb kb/layout
Initial version of Sortix.
2011-08-05 12:25:00 +00:00
Replaced SORTIX_EXTENSIONS macro with _SORTIX_SOURCE macro. <features.h> declares _SORTIX_SOURCE if no conflicting macros are declared, such as _GNU_SOURCE. Fixed g++ automatically declaring _GNU_SOURCE, but Sortix isn't GNU. Replaced SORTIX_UNIMPLEMENTED macro with __SORTIX_SHOW_UNIMPLEMENTED.
2012-02-11 17:50:12 +00:00
DEFINES:=-DSORTIX_KERNEL -U_GNU_SOURCE $(CPUDEFINES)
Restored support for JSSortix using very ugly hacks. :(
2011-09-08 09:10:41 +00:00
ifeq ($(JSSORTIX),1)
DEFINES:=$(DEFINES) -DPLATFORM_SERIAL -DJSSORTIX
BUILDID:=$(BUILDID)-js
endif
Added O=-ON and PANIC_SHORT=1 variables to the makefile.
2011-11-28 14:25:00 +00:00
ifeq ($(PANIC_SHORT),1)
DEFINES:=$(DEFINES) -DPANIC_SHORT
endif
Implemented a simple ATA PIO Mode driver that can read and write. Read operations are enabled by default, but you must set DISKWRITE=1 in makeflags before write operations are permitted. This protects against accidentally corrupting the existing filesystems on the system.
2012-01-08 13:20:39 +00:00
ifeq ($(DISKWRITE),1)
DEFINES:=$(DEFINES) -DENABLE_DISKWRITE=1
else
DEFINES:=$(DEFINES) -DENABLE_DISKWRITE=0
endif
Added O=-ON and PANIC_SHORT=1 variables to the makefile.
2011-11-28 14:25:00 +00:00
CPPFLAGSRELEASE=-s $(O)
Initial version of Sortix.
2011-08-05 12:25:00 +00:00
CPPFLAGSDEBUG=
Refactored the libmaxsi/ directory. C and C++ files are now kept together and so are the mxmpp declarations. Header files are now stored in include/ and mxmpp'd into preproc/. All other code now -I ../libmaxsi/preproc. And other stuff to make this happen, including refactoring Makefile.
2012-02-12 01:03:34 +00:00
CPPFLAGS=-I ../libmaxsi/preproc -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 17:51:47 +00:00
OBJS=$(CPUOBJS) \
kernel.o \
descriptor_tables.o \
Refactored interrupt system and got rid of old not-mine code.
2011-09-07 16:45:07 +00:00
interrupt.o \
Removed lots of deprecated suff!
2011-09-06 17:51:47 +00:00
time.o \
log.o \
Added a simple utf8 encoder in the kernel.
2012-01-18 21:06:10 +00:00
utf8.o \
Removed lots of deprecated suff!
2011-09-06 17:51:47 +00:00
panic.o \
keyboard.o \
Refactored the kernel keyboard API, but kept system calls compatible. Caps lock now works as caps lock, not as shift lock. This new design will allow implementing a working tty, such that stdin is the only way to access the keyboard, instead of the current hacky way of using a special system call to read from the keyboard. Added a new system header file <sys/keycodes.h> defining the constants for every key on the keyboard. This will be used in future APIs. The main change is to split the keyboard driver into a class that reads from the keyboard, while another class handles the translation into printable characters (if possible). This allows a terminal driver based on logical key presses and printable characters, instead of a terminal driver based only on unicode-ish codes.
2012-01-07 20:09:01 +00:00
kb/ps2.o \
kb/layout/us.o \
Removed lots of deprecated suff!
2011-09-06 17:51:47 +00:00
scheduler.o \
syscall.o \
sound.o \
pci.o \
uart.o \
Refactored the system to use the new Terminal interface. This will allow development of a better terminal providing stdin. Added new system calls settermmode(2) and gettermmode(2) declared in <sys/termmode.h>. They allow querying and changing the current mode of terminals (enabling raw keyboard data, signal handling, line buffering, UTF-8 encoding stdin, and more). However, all that is unsupported by the current terminal device driver. Added KBKEY_ENCODE and KBKEY_DECODE macros to <sys/keycodes.h> which allows encoding the kbkey format in UTF-32 characters.
2012-01-22 15:48:57 +00:00
terminal.o \
Added a class for handling terminal linebuffering.
2012-02-09 22:54:24 +00:00
linebuffer.o \
Implemented a terminal that reads from keyboard and writes to kernel log. This terminal will provide the keyboard data in a couple modes as /dev/tty.
2012-02-09 22:55:03 +00:00
logterminal.o \
Removed lots of deprecated suff!
2011-09-06 17:51:47 +00:00
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 13:36:35 +00:00
thread.o \
Multiple threads can now wait on the same pipe.
2012-01-18 16:10:44 +00:00
event.o \
Added pipe(2), write(2), and read(2).
2011-11-16 07:37:29 +00:00
io.o \
pipe.o \
Added open(2). Please note that mount points and file systems do not exist yet.
2011-11-17 22:31:41 +00: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 23:02:53 +00:00
directory.o \
Added open(2). Please note that mount points and file systems do not exist yet.
2011-11-17 22:31:41 +00:00
mount.o \
Initial signal support. Please squash improvements into this commit.
2011-09-15 20:38:40 +00:00
signal.o \
Added devfs, with files /tty and /null and mounted it at /dev.
2011-11-21 20:49:13 +00:00
fs/devfs.o \
Added an filesystem able to browse the initrd.
2011-11-20 15:25:32 +00:00
fs/initfs.o \
Added a RAM filesystem.
2011-11-18 16:49:31 +00:00
fs/ramfs.o \
Implemented a simple ATA PIO Mode driver that can read and write. Read operations are enabled by default, but you must set DISKWRITE=1 in makeflags before write operations are permitted. This protects against accidentally corrupting the existing filesystems on the system.
2012-01-08 13:20:39 +00:00
ata.o \
Initial signal support. Please squash improvements into this commit.
2011-09-15 20:38:40 +00:00
../libmaxsi/libmaxsi-sortix.a \
Added a global variable at the end of the kernel to detect its size. This lets the kernel use any memory not directly used by it or the init ramdisk. Although, now we test whether the kernel fits into the identitymapped area. It can't really grow down there, unless it wants to collide with user-space. Instead, modules and the like (when they are invented), should be put in the upper memory. Or in their own user-space process, yay, microkernel!
2011-12-23 12:09:09 +00:00
end.o # Must be last
Removed lots of deprecated suff!
2011-09-06 17:51:47 +00:00
Initial version of Sortix.
2011-08-05 12:25:00 +00: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 09:10:41 +00: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 12:25:00 +00:00
# x64 compilation
x64/boot.o: x64/boot.s
Changed the build system for 64-bit quite a bit. The kernel is now compiled 100% as 64-bit code and converted to ELF32.
2011-12-01 22:05:08 +00:00
as -64 $< -o $@
Initial version of Sortix.
2011-08-05 12:25:00 +00:00
sortix-x64.tmp: $(OBJS) x64/boot.o
Changed the build system for 64-bit quite a bit. The kernel is now compiled 100% as 64-bit code and converted to ELF32.
2011-12-01 22:05:08 +00:00
ld -N -melf_x86_64 -Ttext 100000 -o sortix-x64-internal.out x64/boot.o $(OBJS)
objcopy sortix-x64-internal.out -O elf32-i386 sortix-x64.tmp
Initial version of Sortix.
2011-08-05 12:25:00 +00:00
# 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 09:10:41 +00:00
sortix.bin: sortix-$(BUILDID).tmp
Initial version of Sortix.
2011-08-05 12:25:00 +00:00
cp -vu $< $@
%.o: %.cpp
g++ -c $< -o $@ $(CPPFLAGS)
%.o: %.s
as $(CPUASFLAGS) $< -o $@
%.o: %.asm
nasm $(CPUNASMFLAGS) $< -o $@
clean:
Made the compile process a little less verbose.
2012-02-11 18:06:00 +00:00
for D in $(DIRS); do rm -f $$D/*.o $$D/*.bin $$D/*.out $$D/*.tmp; done
Initial version of Sortix.
2011-08-05 12:25:00 +00:00
Initial signal support. Please squash improvements into this commit.
2011-09-15 20:38:40 +00:00
# Installation into sysroot
install:
mkdir -p $(SYSROOT)/usr/include/sortix
cp $(CPU)/bits.h $(SYSROOT)/usr/include/sortix/bits.h
Initial version of Sortix.
2011-08-05 12:25:00 +00:00