From c1e2eb09c2195f6f0439648fcaa732ce44668c8c Mon Sep 17 00:00:00 2001 From: Adrien Bourmault Date: Mon, 1 Apr 2019 14:58:01 +0200 Subject: [PATCH 01/13] Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b3653f9..7f6f85a 100644 --- a/Makefile +++ b/Makefile @@ -193,7 +193,7 @@ $(KOBJDIR)/kernel/sched.o: $(KERNELDIR)/kernel/proc/sched.c $(KERNELDIR)/include .PHONY: test test: all - @qemu-system-x86_64 -m 5G -hda $(BUILDDIR)/bin/disk.img \ + @qemu-system-x86_64 -m 4G -hda $(BUILDDIR)/bin/disk.img \ -d cpu_reset,guest_errors,pcall,int 2> $(BUILDDIR)/qemu.log & .PHONY: test32 test32: all From cfb4ae7b099263d0fe46da9baba30aa5a0d42a65 Mon Sep 17 00:00:00 2001 From: Adrien Bourmault Date: Sat, 6 Apr 2019 21:19:31 +0200 Subject: [PATCH 02/13] test --- kaleid/kernel/init/init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kaleid/kernel/init/init.c b/kaleid/kernel/init/init.c index a0e978b..3855d3a 100644 --- a/kaleid/kernel/init/init.c +++ b/kaleid/kernel/init/init.c @@ -151,7 +151,7 @@ noreturn void BtStartKern(multiboot_info_t *mbInfo, uint mbMagic) PsInitSched(); KeStartPanic("Test Panic %x", 4); - + // End this machine's suffering KeCrashSystem(); } From 1a051fc5b4464a4c81bc713fca2b139726e5b79f Mon Sep 17 00:00:00 2001 From: Adrien Bourmault Date: Sat, 6 Apr 2019 21:21:34 +0200 Subject: [PATCH 03/13] timeout changed --- boot/grub/grub.cfg | 2 +- kaleid/kernel/init/init.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/boot/grub/grub.cfg b/boot/grub/grub.cfg index 4efc73e..97bc428 100755 --- a/boot/grub/grub.cfg +++ b/boot/grub/grub.cfg @@ -22,7 +22,7 @@ # along with OS/K. If not, see . # #=----------------------------------------------------------------------------=# -set timeout=5 +set timeout=0 set default=0 #Set the default menu entry diff --git a/kaleid/kernel/init/init.c b/kaleid/kernel/init/init.c index 3855d3a..d84884c 100644 --- a/kaleid/kernel/init/init.c +++ b/kaleid/kernel/init/init.c @@ -150,7 +150,7 @@ noreturn void BtStartKern(multiboot_info_t *mbInfo, uint mbMagic) MmInitHeap(); PsInitSched(); - KeStartPanic("Test Panic %x", 4); + KeStartPanic("Test Panic %d", 4); // End this machine's suffering KeCrashSystem(); From 3550fadbf9273d33ce05aa83b8f85fa99febcc72 Mon Sep 17 00:00:00 2001 From: Adrien Bourmault Date: Tue, 9 Apr 2019 14:59:18 +0200 Subject: [PATCH 04/13] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e6f8557..b187161 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ To compile this project from sources, you must first install the dependencies ``` apt update && apt upgrade -apt install grub-pc dosfstools make nasm qemu +apt install grub-pc-bin dosfstools make nasm qemu tree ``` You also need to have the [x86-64 ELF gcc cross-compiler](https://www.os-k.eu/build-tools/cross-cc.tar.xz) and its "bin" repertory in your PATH. From 91e5bbf83dc8462630b5ad773ae5d03385924ae3 Mon Sep 17 00:00:00 2001 From: Adrien Bourmault Date: Tue, 9 Apr 2019 15:01:33 +0200 Subject: [PATCH 05/13] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b187161..a240f4b 100644 --- a/README.md +++ b/README.md @@ -11,11 +11,11 @@ For changelog, see [ChangeLog](ChangeLog) For structure of the sources, see [ProjectTree](ProjectTree) +For our IRC channel, see #os.k-devel on [Freenode](https://webchat.freenode.net) + Note that every file within OS/K is written using spaces for tabulation, with each tabulation being 4 spaces long. -IRC Channel: #os.k-devel on Freenode - #### Compile from sources To compile this project from sources, you must first install the dependencies From 0addc2e9524ace9a2c818c23ad428bf8b57b226a Mon Sep 17 00:00:00 2001 From: Adrien Bourmault Date: Tue, 9 Apr 2019 15:04:21 +0200 Subject: [PATCH 06/13] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a240f4b..b815425 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ For changelog, see [ChangeLog](ChangeLog) For structure of the sources, see [ProjectTree](ProjectTree) -For our IRC channel, see #os.k-devel on [Freenode](https://webchat.freenode.net) +For our IRC channel, see `#os.k-devel` on [Freenode](https://webchat.freenode.net) Note that every file within OS/K is written using spaces for tabulation, with each tabulation being 4 spaces long. @@ -25,7 +25,7 @@ apt update && apt upgrade apt install grub-pc-bin dosfstools make nasm qemu tree ``` -You also need to have the [x86-64 ELF gcc cross-compiler](https://www.os-k.eu/build-tools/cross-cc.tar.xz) and its "bin" repertory in your PATH. +You also need to have the [x86-64 ELF gcc cross-compiler](https://www.os-k.eu/build-tools/cross-cc.tar.xz) and its ``bin`` directory in your PATH. To compile, simply use at the root of this project : ``` From ac626ae40831013ed2f028cb5b0a7072fa26e766 Mon Sep 17 00:00:00 2001 From: Adrien Bourmault Date: Tue, 9 Apr 2019 17:16:13 +0200 Subject: [PATCH 07/13] Makefile update --- Makefile | 221 +++++++++++---------------- ProjectTree | 39 +++-- build/obj/boot/.placeholder | 0 build/obj/kaleid/kernel/.placeholder | 0 kaleid/kernel/cpu/idt.c | 2 +- 5 files changed, 111 insertions(+), 151 deletions(-) delete mode 100644 build/obj/boot/.placeholder delete mode 100644 build/obj/kaleid/kernel/.placeholder diff --git a/Makefile b/Makefile index 4c19ff2..2c4a3d0 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,9 @@ # along with OS/K. If not, see . # #=----------------------------------------------------------------------------=# +.PHONY: all test test32 debug gdb install_mbr clean OS/K +all : OS/K + ## VARIABLES ----------------------------------------------------------------- # #Programs @@ -35,7 +38,7 @@ COPTIM=-O2 CWARNS=-Wall -Wextra -Werror=implicit-function-declaration CINCLUDES=-Iinclude CFLAGS1=-nostdlib -ffreestanding -mcmodel=large -std=gnu11 -CFLAGS2= -c -g -mno-red-zone -mno-mmx -mno-sse -mno-sse2 -fno-strict-aliasing +CFLAGS2= -c -g -mno-red-zone -mno-mmx -mno-sse -mno-sse2 CFLAGS=$(CFLAGS1) $(CFLAGS2) KCC=$(CCNAME) $(COPTIM) $(CWARNS) $(CFLAGS) $(CINCLUDES) -D_OSK_SOURCE -D_KALEID_KERNEL @@ -50,19 +53,16 @@ LOBJDIR=build/obj/boot BINDIR=build/bin BUILDDIR=build +vpath %.c $(KALEIDDIR) + #Color codes CL='\033[0;32m' CL2='\033[1;36m' CL3='\033[0m' NC='\033[1;37m' -.PHONY: all -all : OS/K - -## KALEID MAKEFILE ----------------------------------------------------------- # - -# Common objects -kal_com_obj= $(KOBJDIR)/atoi.o $(KOBJDIR)/ctype.o \ +# Lib C +LibCObj= $(KOBJDIR)/atoi.o $(KOBJDIR)/ctype.o \ $(KOBJDIR)/itoa.o $(KOBJDIR)/mem.o \ $(KOBJDIR)/rand.o $(KOBJDIR)/sprintf.o \ $(KOBJDIR)/status.o $(KOBJDIR)/string.o \ @@ -72,118 +72,17 @@ kal_com_obj= $(KOBJDIR)/atoi.o $(KOBJDIR)/ctype.o \ $(KOBJDIR)/utoa.o $(KOBJDIR)/ltoa.o \ $(KOBJDIR)/ultoa.o -$(KOBJDIR)/atoi.o: $(KALEIDDIR)/libc/atoi.c $(INCLUDEDIR)/*/*.h - @$(KCC) -D_NEED_ATOI $< -o $@ - @echo ${CL2}[$@] ${CL}Compiled.${CL3} -$(KOBJDIR)/atol.o: $(KALEIDDIR)/libc/atoi.c $(INCLUDEDIR)/*/*.h - @$(KCC) -D_NEED_ATOL $< -o $@ - @echo ${CL2}[$@] ${CL}Compiled.${CL3} -$(KOBJDIR)/atou.o: $(KALEIDDIR)/libc/atoi.c $(INCLUDEDIR)/*/*.h - @$(KCC) -D_NEED_ATOU $< -o $@ - @echo ${CL2}[$@] ${CL}Compiled.${CL3} -$(KOBJDIR)/atoul.o: $(KALEIDDIR)/libc/atoi.c $(INCLUDEDIR)/*/*.h - @$(KCC) -D_NEED_ATOUL $< -o $@ - @echo ${CL2}[$@] ${CL}Compiled.${CL3} -$(KOBJDIR)/ctype.o: $(KALEIDDIR)/libc/ctype.c $(INCLUDEDIR)/*/*.h - @$(KCC) $< -o $@ - @echo ${CL2}[$@] ${CL}Compiled.${CL3} -$(KOBJDIR)/itoa.o: $(KALEIDDIR)/libc/itoa.c $(INCLUDEDIR)/*/*.h - @$(KCC) -D_NEED_ITOA $< -o $@ - @echo ${CL2}[$@] ${CL}Compiled.${CL3} -$(KOBJDIR)/ltoa.o: $(KALEIDDIR)/libc/itoa.c $(INCLUDEDIR)/*/*.h - @$(KCC) -D_NEED_LTOA $< -o $@ - @echo ${CL2}[$@] ${CL}Compiled.${CL3} -$(KOBJDIR)/utoa.o: $(KALEIDDIR)/libc/itoa.c $(INCLUDEDIR)/*/*.h - @$(KCC) -D_NEED_UTOA $< -o $@ - @echo ${CL2}[$@] ${CL}Compiled.${CL3} -$(KOBJDIR)/ultoa.o: $(KALEIDDIR)/libc/itoa.c $(INCLUDEDIR)/*/*.h - @$(KCC) -D_NEED_ULTOA $< -o $@ - @echo ${CL2}[$@] ${CL}Compiled.${CL3} -$(KOBJDIR)/mem.o: $(KALEIDDIR)/libc/mem.c $(INCLUDEDIR)/*/*.h - @$(KCC) -fno-strict-aliasing $< -o $@ - @echo ${CL2}[$@] ${CL}Compiled.${CL3} -$(KOBJDIR)/rand.o: $(KALEIDDIR)/libc/rand.c $(INCLUDEDIR)/*/*.h - @$(KCC) $< -o $@ - @echo ${CL2}[$@] ${CL}Compiled.${CL3} -$(KOBJDIR)/sprintf.o: $(KALEIDDIR)/libc/sprintf.c $(INCLUDEDIR)/*/*.h - @$(KCC) $< -o $@ - @echo ${CL2}[$@] ${CL}Compiled.${CL3} -$(KOBJDIR)/status.o: $(KALEIDDIR)/libc/status.c $(INCLUDEDIR)/*/*.h - @$(KCC) $< -o $@ - @echo ${CL2}[$@] ${CL}Compiled.${CL3} -$(KOBJDIR)/string.o: $(KALEIDDIR)/libc/string.c $(INCLUDEDIR)/*/*.h - @$(KCC) $< -o $@ - @echo ${CL2}[$@] ${CL}Compiled.${CL3} -$(KOBJDIR)/strtol.o: $(KALEIDDIR)/libc/strtol.c $(INCLUDEDIR)/*/*.h - @$(KCC) $< -o $@ - @echo ${CL2}[$@] ${CL}Compiled.${CL3} - -$(KOBJDIR)/argv.o: $(KALEIDDIR)/extras/argv.c $(INCLUDEDIR)/*/*.h - @$(KCC) $< -o $@ - @echo ${CL2}[$@] ${CL}Compiled.${CL3} -$(KOBJDIR)/prog.o: $(KALEIDDIR)/extras/prog.c $(INCLUDEDIR)/*/*.h - @$(KCC) $< -o $@ - @echo ${CL2}[$@] ${CL}Compiled.${CL3} - -$(KOBJDIR)/kernel/buf.o: $(KALEIDDIR)/libbuf/buf.c $(INCLUDEDIR)/*/*.h - @$(KCC) $< -o $@ - @echo ${CL2}[$@] ${CL}Compiled.${CL3} -$(KOBJDIR)/kernel/bput.o: $(KALEIDDIR)/libbuf/bput.c $(INCLUDEDIR)/*/*.h - @$(KCC) $< -o $@ - @echo ${CL2}[$@] ${CL}Compiled.${CL3} -$(KOBJDIR)/kernel/bprint.o: $(KALEIDDIR)/libbuf/bprint.c $(INCLUDEDIR)/*/*.h - @$(KCC) $< -o $@ - @echo ${CL2}[$@] ${CL}Compiled.${CL3} - -# Kernel objects -kal_kern_obj= $(KOBJDIR)/kernel/cpuid.o $(KOBJDIR)/kernel/init.o \ - $(KOBJDIR)/kernel/table.o $(KOBJDIR)/kernel/cursor.o \ - $(KOBJDIR)/kernel/log.o $(KOBJDIR)/kernel/vga.o \ - $(KOBJDIR)/kernel/panic.o $(KOBJDIR)/kernel/map.o \ - $(KOBJDIR)/kernel/heap.o $(KOBJDIR)/kernel/malloc.o \ - $(KOBJDIR)/kernel/buf.o $(KOBJDIR)/kernel/sched.o \ - $(KOBJDIR)/kernel/bput.o $(KOBJDIR)/kernel/bprint.o \ - $(KOBJDIR)/kernel/gdt.o - -$(KOBJDIR)/kernel/cpuid.o: $(KALEIDDIR)/kernel/cpu/cpuid.c $(INCLUDEDIR)/*/*.h - @$(KCC) $< -o $@ - @echo ${CL2}[$@] ${CL}Compiled.${CL3} -$(KOBJDIR)/kernel/idt.o: $(KALEIDDIR)/kernel/cpu/idt.c $(INCLUDEDIR)/*/*.h - @$(KCC) $< -o $@ - @echo ${CL2}[$@] ${CL}Compiled.${CL3} -$(KOBJDIR)/kernel/init.o: $(KALEIDDIR)/kernel/init/init.c $(INCLUDEDIR)/*/*.h - @$(KCC) $< -o $@ - @echo ${CL2}[$@] ${CL}Compiled.${CL3} -$(KOBJDIR)/kernel/table.o: $(KALEIDDIR)/kernel/init/table.c $(INCLUDEDIR)/*/*.h - @$(KCC) $< -o $@ - @echo ${CL2}[$@] ${CL}Compiled.${CL3} -$(KOBJDIR)/kernel/cursor.o: $(KALEIDDIR)/kernel/io/cursor.c $(INCLUDEDIR)/*/*.h - @$(KCC) $< -o $@ - @echo ${CL2}[$@] ${CL}Compiled.${CL3} -$(KOBJDIR)/kernel/log.o: $(KALEIDDIR)/kernel/ke/log.c $(INCLUDEDIR)/*/*.h - @$(KCC) $< -o $@ - @echo ${CL2}[$@] ${CL}Compiled.${CL3} -$(KOBJDIR)/kernel/vga.o: $(KALEIDDIR)/kernel/io/vga.c $(INCLUDEDIR)/*/*.h - @$(KCC) $< -o $@ - @echo ${CL2}[$@] ${CL}Compiled.${CL3} -$(KOBJDIR)/kernel/panic.o: $(KALEIDDIR)/kernel/ke/panic.c $(INCLUDEDIR)/*/*.h - @$(KCC) $< -o $@ - @echo ${CL2}[$@] ${CL}Compiled.${CL3} -$(KOBJDIR)/kernel/map.o: $(KALEIDDIR)/kernel/mm/map.c $(INCLUDEDIR)/*/*.h - @$(KCC) $< -o $@ - @echo ${CL2}[$@] ${CL}Compiled.${CL3} -$(KOBJDIR)/kernel/heap.o: $(KALEIDDIR)/kernel/mm/heap.c $(INCLUDEDIR)/*/*.h - @$(KCC) $< -o $@ - @echo ${CL2}[$@] ${CL}Compiled.${CL3} -$(KOBJDIR)/kernel/malloc.o: $(KALEIDDIR)/kernel/mm/malloc.c $(INCLUDEDIR)/*/*.h - @$(KCC) $< -o $@ -$(KOBJDIR)/kernel/gdt.o: $(KALEIDDIR)/kernel/mm/gdt.c $(INCLUDEDIR)/*/*.h - @$(KCC) $< -o $@ - @echo ${CL2}[$@] ${CL}Compiled.${CL3} -$(KOBJDIR)/kernel/sched.o: $(KALEIDDIR)/kernel/ps/sched.c $(INCLUDEDIR)/*/*.h - @$(KCC) $< -o $@ - @echo ${CL2}[$@] ${CL}Compiled.${CL3} +# Kernel sources +KernSources=libbuf/buf.c libbuf/bput.c \ + libbuf/bprint.c kernel/cpu/cpuid.c \ + kernel/cpu/idt.c kernel/init/init.c \ + kernel/init/table.c kernel/io/cursor.c \ + kernel/ke/log.c kernel/io/vga.c \ + kernel/ke/panic.c kernel/mm/map.c \ + kernel/mm/heap.c kernel/mm/malloc.c \ + kernel/mm/gdt.c kernel/ps/sched.c \ +KernObj=$(patsubst %.c,$(KOBJDIR)/%.o,$(KernSources)) ## MISC MAKEFILE ------------------------------------------------------------- # ./ProjectTree: ./.stylehlp_sh @@ -192,24 +91,83 @@ $(KOBJDIR)/kernel/sched.o: $(KALEIDDIR)/kernel/ps/sched.c $(INCLUDEDIR)/*/*.h @tree --dirsfirst >> ./ProjectTree @echo ${CL2}[$@] ${CL}Generated.${CL3} +$(KOBJDIR): + @mkdir -p $(KOBJDIR) + +## Lib C MAKEFILE ------------------------------------------------------------ # +$(KOBJDIR)/atoi.o: $(KALEIDDIR)/libc/atoi.c $(INCLUDEDIR)/*/*.h | $(KOBJDIR) + @$(KCC) -D_NEED_ATOI $< -o $@ + @echo ${CL2}[$@] ${CL}Compiled.${CL3} +$(KOBJDIR)/atol.o: $(KALEIDDIR)/libc/atoi.c $(INCLUDEDIR)/*/*.h | $(KOBJDIR) + @$(KCC) -D_NEED_ATOL $< -o $@ + @echo ${CL2}[$@] ${CL}Compiled.${CL3} +$(KOBJDIR)/atou.o: $(KALEIDDIR)/libc/atoi.c $(INCLUDEDIR)/*/*.h | $(KOBJDIR) + @$(KCC) -D_NEED_ATOU $< -o $@ + @echo ${CL2}[$@] ${CL}Compiled.${CL3} +$(KOBJDIR)/atoul.o: $(KALEIDDIR)/libc/atoi.c $(INCLUDEDIR)/*/*.h | $(KOBJDIR) + @$(KCC) -D_NEED_ATOUL $< -o $@ + @echo ${CL2}[$@] ${CL}Compiled.${CL3} +$(KOBJDIR)/itoa.o: $(KALEIDDIR)/libc/itoa.c $(INCLUDEDIR)/*/*.h | $(KOBJDIR) + @$(KCC) -D_NEED_ITOA $< -o $@ + @echo ${CL2}[$@] ${CL}Compiled.${CL3} +$(KOBJDIR)/ltoa.o: $(KALEIDDIR)/libc/itoa.c $(INCLUDEDIR)/*/*.h | $(KOBJDIR) + @$(KCC) -D_NEED_LTOA $< -o $@ + @echo ${CL2}[$@] ${CL}Compiled.${CL3} +$(KOBJDIR)/utoa.o: $(KALEIDDIR)/libc/itoa.c $(INCLUDEDIR)/*/*.h | $(KOBJDIR) + @$(KCC) -D_NEED_UTOA $< -o $@ + @echo ${CL2}[$@] ${CL}Compiled.${CL3} +$(KOBJDIR)/ultoa.o: $(KALEIDDIR)/libc/itoa.c $(INCLUDEDIR)/*/*.h | $(KOBJDIR) + @$(KCC) -D_NEED_ULTOA $< -o $@ + @echo ${CL2}[$@] ${CL}Compiled.${CL3} +$(KOBJDIR)/mem.o: $(KALEIDDIR)/libc/mem.c $(INCLUDEDIR)/*/*.h | $(KOBJDIR) + @$(KCC) -fno-strict-aliasing $< -o $@ + @echo ${CL2}[$@] ${CL}Compiled.${CL3} +$(KOBJDIR)/ctype.o: $(KALEIDDIR)/libc/ctype.c $(INCLUDEDIR)/*/*.h | $(KOBJDIR) + @$(KCC) $< -o $@ + @echo ${CL2}[$@] ${CL}Compiled.${CL3} +$(KOBJDIR)/rand.o: $(KALEIDDIR)/libc/rand.c $(INCLUDEDIR)/*/*.h | $(KOBJDIR) + @$(KCC) $< -o $@ + @echo ${CL2}[$@] ${CL}Compiled.${CL3} +$(KOBJDIR)/sprintf.o: $(KALEIDDIR)/libc/sprintf.c $(INCLUDEDIR)/*/*.h | $(KOBJDIR) + @$(KCC) $< -o $@ + @echo ${CL2}[$@] ${CL}Compiled.${CL3} +$(KOBJDIR)/status.o: $(KALEIDDIR)/libc/status.c $(INCLUDEDIR)/*/*.h | $(KOBJDIR) + @$(KCC) $< -o $@ + @echo ${CL2}[$@] ${CL}Compiled.${CL3} +$(KOBJDIR)/string.o: $(KALEIDDIR)/libc/string.c $(INCLUDEDIR)/*/*.h | $(KOBJDIR) + @$(KCC) $< -o $@ + @echo ${CL2}[$@] ${CL}Compiled.${CL3} +$(KOBJDIR)/strtol.o: $(KALEIDDIR)/libc/strtol.c $(INCLUDEDIR)/*/*.h | $(KOBJDIR) + @$(KCC) $< -o $@ + @echo ${CL2}[$@] ${CL}Compiled.${CL3} +$(KOBJDIR)/argv.o: $(KALEIDDIR)/extras/argv.c $(INCLUDEDIR)/*/*.h | $(KOBJDIR) + @$(KCC) $< -o $@ + @echo ${CL2}[$@] ${CL}Compiled.${CL3} +$(KOBJDIR)/prog.o: $(KALEIDDIR)/extras/prog.c $(INCLUDEDIR)/*/*.h | $(KOBJDIR) + @$(KCC) $< -o $@ + @echo ${CL2}[$@] ${CL}Compiled.${CL3} + +## KERNEL MAKEFILE ----------------------------------------------------------- # +$(KOBJDIR)/%.o: %.c $(INCLUDEDIR)/*/*.h + @mkdir -p $(shell dirname $@) + @$(KCC) $< -o $@ + @echo ${CL2}[$@] ${CL}Compiled.${CL3} + ## MAIN MAKEFILE ------------------------------------------------------------- # -.PHONY: test test: all @qemu-system-x86_64 -m 4G -hda $(BUILDDIR)/bin/disk.img \ -d cpu_reset,guest_errors,pcall,int 2> $(BUILDDIR)/qemu.log & -.PHONY: test32 + test32: all @qemu-system-i386 -hda $(BUILDDIR)/bin/disk.img -d cpu_reset,guest_errors,pcall,int 2> $(BUILDDIR)/qemu.log & -.PHONY: debug debug: all @qemu-system-x86_64 -m 64M -hda $(BUILDDIR)/bin/disk.img -no-reboot \ -no-shutdown -d cpu_reset,guest_errors,pcall,int 2> $(BUILDDIR)/qemu.log & @ndisasm $(BINDIR)/kaleid -o 0x00100000 -b 64 > $(BUILDDIR)/kaleid64_disasm.asm @ndisasm $(BINDIR)/kaleid -o 0x00100000 -b 32 > $(BUILDDIR)/kaleid32_disasm.asm -.PHONY: gdb gdb: all @qemu-system-x86_64 -m 64M -hda $(BUILDDIR)/bin/disk.img -no-reboot \ -no-shutdown -d cpu_reset,guest_errors,pcall,int -s 2> $(BUILDDIR)/qemu.log & @@ -221,7 +179,6 @@ gdb: all -ex "symbol-file $(BINDIR)/kaleid" \ -ex "break BtStartKern" \ -.PHONY: install_mbr install_mbr: $(BINDIR)/disk.img $(MBRDIR)/grub.cfg @mkdir -p $(BINDIR)/disk @echo ${CL2}[$@] ${NC}Installing MBR on image...${CL3} @@ -230,12 +187,10 @@ install_mbr: $(BINDIR)/disk.img $(MBRDIR)/grub.cfg @rmdir $(BINDIR)/disk @echo ${CL2}[$@] ${CL}Success.${CL3} -.PHONY: clean clean: -@$(MBRDIR)/umount.sh $(BINDIR)/disk || /bin/true - @rm -Rvf ./ProjectTree - @rm -Rvf $(BINDIR)/* $(OBJDIR)/*.o \ - $(OBJDIR)/*/*.o $(OBJDIR)/*/*.x86_64 $(OBJDIR)/*/*/*.o + @rm -Rvf ./ProjectTree $(BUILDDIR)/*.log + @rm -Rvf $(BINDIR)/* $(KernObj) $(LibCObj) $(OBJDIR)/* @echo ${CL2}[[$@]] ${CL}Cleaned.${CL3} $(BINDIR)/kaleid: $(LOBJDIR)/kaleid.x86_64 @@ -243,17 +198,16 @@ $(BINDIR)/kaleid: $(LOBJDIR)/kaleid.x86_64 @x86_64-elf-objcopy -I elf64-x86-64 -O elf32-i386 $(LOBJDIR)/kaleid.x86_64 $(BINDIR)/kaleid @echo ${CL2}[$@] ${CL}Success.${CL3} -$(LOBJDIR)/kaleid.x86_64: $(kal_kern_obj) $(kal_com_obj) $(LOBJDIR)/loader.o +$(LOBJDIR)/kaleid.x86_64: $(LibCObj) $(KernObj) $(LOBJDIR)/loader.o @echo ${CL2}[$@] ${NC}Linking kernel objects...${CL3} - @$(LD) $(LDFLAGS) -T $(BUILDDIR)/kernel.ld \ - $(LOBJDIR)/loader.o \ - $(KOBJDIR)/*.o \ - $(KOBJDIR)/kernel/*.o \ + @$(LD) $(LDFLAGS) -T $(BUILDDIR)/kernel.ld \ + $(LOBJDIR)/loader.o $(KernObj) $(LibCObj) \ -o $(LOBJDIR)/kaleid.x86_64 @echo ${CL2}[$@] ${CL}Success.${CL3} $(LOBJDIR)/loader.o: $(LOADERDIR)/loader.asm $(LOADERDIR)/*/*.inc @echo ${CL2}[$@] ${NC}Making loader...${CL3} + @mkdir -p $(shell dirname $@) @$(ASM) $(ASMFLAGS) $(LOADERDIR)/loader.asm -o $(LOBJDIR)/loader.o > /dev/null @echo ${CL2}[$@] ${CL}Success.${CL3} @@ -264,7 +218,6 @@ $(BINDIR)/disk.img: $(MBRDIR)/create_disk.sh @make install_mbr @echo ${CL2}[$@]${NC} Constructing disk image...${CL3} -.PHONY:OS/K OS/K: $(BINDIR)/kaleid $(BINDIR)/disk.img ./ProjectTree @mkdir -p $(BINDIR)/disk @echo ${CL2}[[$@]] ${NC}Integrating kernel...${CL3} diff --git a/ProjectTree b/ProjectTree index 41c126d..a8b117d 100644 --- a/ProjectTree +++ b/ProjectTree @@ -56,21 +56,29 @@ │   │   │   └── loader.o │   │   └── kaleid │   │   ├── kernel +│   │   │   ├── cpu +│   │   │   │   ├── cpuid.o +│   │   │   │   └── idt.o +│   │   │   ├── init +│   │   │   │   ├── init.o +│   │   │   │   └── table.o +│   │   │   ├── io +│   │   │   │   ├── cursor.o +│   │   │   │   └── vga.o +│   │   │   ├── ke +│   │   │   │   ├── log.o +│   │   │   │   └── panic.o +│   │   │   ├── mm +│   │   │   │   ├── gdt.o +│   │   │   │   ├── heap.o +│   │   │   │   ├── malloc.o +│   │   │   │   └── map.o +│   │   │   └── ps +│   │   │   └── sched.o +│   │   ├── libbuf │   │   │   ├── bprint.o │   │   │   ├── bput.o -│   │   │   ├── buf.o -│   │   │   ├── cpuid.o -│   │   │   ├── cursor.o -│   │   │   ├── gdt.o -│   │   │   ├── heap.o -│   │   │   ├── init.o -│   │   │   ├── log.o -│   │   │   ├── malloc.o -│   │   │   ├── map.o -│   │   │   ├── panic.o -│   │   │   ├── sched.o -│   │   │   ├── table.o -│   │   │   └── vga.o +│   │   │   └── buf.o │   │   ├── argv.o │   │   ├── atoi.o │   │   ├── atol.o @@ -89,8 +97,7 @@ │   │   ├── ultoa.o │   │   └── utoa.o │   ├── grub.log -│   ├── kernel.ld -│   └── qemu.log +│   └── kernel.ld ├── include │   ├── base │   │   ├── assert.h @@ -167,4 +174,4 @@ ├── ProjectTree └── README.md -28 directories, 114 files +35 directories, 114 files diff --git a/build/obj/boot/.placeholder b/build/obj/boot/.placeholder deleted file mode 100644 index e69de29..0000000 diff --git a/build/obj/kaleid/kernel/.placeholder b/build/obj/kaleid/kernel/.placeholder deleted file mode 100644 index e69de29..0000000 diff --git a/kaleid/kernel/cpu/idt.c b/kaleid/kernel/cpu/idt.c index 469796c..cdcf44c 100644 --- a/kaleid/kernel/cpu/idt.c +++ b/kaleid/kernel/cpu/idt.c @@ -21,7 +21,7 @@ // You should have received a copy of the GNU General Public License // // along with OS/K. If not, see . // //----------------------------------------------------------------------------// - +#include // // Registers the new idt in the idtr register. From 0b95ba91f201589251e105245741911f07bae846 Mon Sep 17 00:00:00 2001 From: Adrien Bourmault Date: Tue, 9 Apr 2019 23:35:31 +0200 Subject: [PATCH 08/13] Makefile big enhancement --- Makefile | 153 ++++++++++++++++++-------------------- ProjectTree | 40 +++++----- kaleid/kernel/init/init.c | 2 + 3 files changed, 95 insertions(+), 100 deletions(-) diff --git a/Makefile b/Makefile index 2c4a3d0..9be191e 100644 --- a/Makefile +++ b/Makefile @@ -23,26 +23,36 @@ #=----------------------------------------------------------------------------=# .PHONY: all test test32 debug gdb install_mbr clean OS/K -all : OS/K ## VARIABLES ----------------------------------------------------------------- # -#Programs +# Debug +mode ?= debug + +# Programs ASM=nasm LD=ld CCNAME=x86_64-elf-gcc - ASMFLAGS=-f elf64 LDFLAGS=-melf_x86_64 COPTIM=-O2 CWARNS=-Wall -Wextra -Werror=implicit-function-declaration CINCLUDES=-Iinclude CFLAGS1=-nostdlib -ffreestanding -mcmodel=large -std=gnu11 -CFLAGS2= -c -g -mno-red-zone -mno-mmx -mno-sse -mno-sse2 +CFLAGS2= -c -mno-red-zone -mno-mmx -mno-sse -mno-sse2 CFLAGS=$(CFLAGS1) $(CFLAGS2) + +ifeq ($(mode), release) +CFLAGS += -D_NO_DEBUG +dep += dust +endif +ifeq ($(mode), debug) +CFLAGS += -g +endif + KCC=$(CCNAME) $(COPTIM) $(CWARNS) $(CFLAGS) $(CINCLUDES) -D_OSK_SOURCE -D_KALEID_KERNEL -#Folders +# Folders MBRDIR=boot/grub LOADERDIR=boot/loader KALEIDDIR=kaleid @@ -52,37 +62,42 @@ KOBJDIR=build/obj/kaleid LOBJDIR=build/obj/boot BINDIR=build/bin BUILDDIR=build - vpath %.c $(KALEIDDIR) -#Color codes +# Color codes CL='\033[0;32m' CL2='\033[1;36m' CL3='\033[0m' NC='\033[1;37m' -# Lib C -LibCObj= $(KOBJDIR)/atoi.o $(KOBJDIR)/ctype.o \ - $(KOBJDIR)/itoa.o $(KOBJDIR)/mem.o \ - $(KOBJDIR)/rand.o $(KOBJDIR)/sprintf.o \ - $(KOBJDIR)/status.o $(KOBJDIR)/string.o \ - $(KOBJDIR)/strtol.o $(KOBJDIR)/argv.o \ - $(KOBJDIR)/prog.o $(KOBJDIR)/atol.o \ - $(KOBJDIR)/atou.o $(KOBJDIR)/atoul.o \ - $(KOBJDIR)/utoa.o $(KOBJDIR)/ltoa.o \ - $(KOBJDIR)/ultoa.o + +## SOURCES INSCRIPTION-------------------------------------------------------- # + +# Lib C sources +LibCSources= libc/atoi.c libc/itoa.c \ + libc/mem.c libc/ctype.c \ + libc/rand.c libc/sprintf.c \ + libc/status.c libc/string.c \ + libc/strtol.c extras/argv.c \ + extras/prog.c # Kernel sources -KernSources=libbuf/buf.c libbuf/bput.c \ - libbuf/bprint.c kernel/cpu/cpuid.c \ - kernel/cpu/idt.c kernel/init/init.c \ - kernel/init/table.c kernel/io/cursor.c \ - kernel/ke/log.c kernel/io/vga.c \ - kernel/ke/panic.c kernel/mm/map.c \ - kernel/mm/heap.c kernel/mm/malloc.c \ - kernel/mm/gdt.c kernel/ps/sched.c \ +KernSources= libbuf/buf.c libbuf/bput.c \ + libbuf/bprint.c kernel/cpu/cpuid.c \ + kernel/cpu/idt.c kernel/init/init.c \ + kernel/init/table.c kernel/io/cursor.c \ + kernel/ke/log.c kernel/io/vga.c \ + kernel/ke/panic.c kernel/mm/map.c \ + kernel/mm/heap.c kernel/mm/malloc.c \ + kernel/mm/gdt.c kernel/ps/sched.c \ KernObj=$(patsubst %.c,$(KOBJDIR)/%.o,$(KernSources)) +LibCObj=$(patsubst %.c,$(KOBJDIR)/%.o,$(LibCSources)) + + +## KALEID MAKEFILE ----------------------------------------------------------- # + +all : OS/K $(dep) ## MISC MAKEFILE ------------------------------------------------------------- # ./ProjectTree: ./.stylehlp_sh @@ -94,67 +109,37 @@ KernObj=$(patsubst %.c,$(KOBJDIR)/%.o,$(KernSources)) $(KOBJDIR): @mkdir -p $(KOBJDIR) -## Lib C MAKEFILE ------------------------------------------------------------ # -$(KOBJDIR)/atoi.o: $(KALEIDDIR)/libc/atoi.c $(INCLUDEDIR)/*/*.h | $(KOBJDIR) - @$(KCC) -D_NEED_ATOI $< -o $@ - @echo ${CL2}[$@] ${CL}Compiled.${CL3} -$(KOBJDIR)/atol.o: $(KALEIDDIR)/libc/atoi.c $(INCLUDEDIR)/*/*.h | $(KOBJDIR) - @$(KCC) -D_NEED_ATOL $< -o $@ - @echo ${CL2}[$@] ${CL}Compiled.${CL3} -$(KOBJDIR)/atou.o: $(KALEIDDIR)/libc/atoi.c $(INCLUDEDIR)/*/*.h | $(KOBJDIR) - @$(KCC) -D_NEED_ATOU $< -o $@ - @echo ${CL2}[$@] ${CL}Compiled.${CL3} -$(KOBJDIR)/atoul.o: $(KALEIDDIR)/libc/atoi.c $(INCLUDEDIR)/*/*.h | $(KOBJDIR) - @$(KCC) -D_NEED_ATOUL $< -o $@ - @echo ${CL2}[$@] ${CL}Compiled.${CL3} -$(KOBJDIR)/itoa.o: $(KALEIDDIR)/libc/itoa.c $(INCLUDEDIR)/*/*.h | $(KOBJDIR) - @$(KCC) -D_NEED_ITOA $< -o $@ - @echo ${CL2}[$@] ${CL}Compiled.${CL3} -$(KOBJDIR)/ltoa.o: $(KALEIDDIR)/libc/itoa.c $(INCLUDEDIR)/*/*.h | $(KOBJDIR) - @$(KCC) -D_NEED_LTOA $< -o $@ - @echo ${CL2}[$@] ${CL}Compiled.${CL3} -$(KOBJDIR)/utoa.o: $(KALEIDDIR)/libc/itoa.c $(INCLUDEDIR)/*/*.h | $(KOBJDIR) - @$(KCC) -D_NEED_UTOA $< -o $@ - @echo ${CL2}[$@] ${CL}Compiled.${CL3} -$(KOBJDIR)/ultoa.o: $(KALEIDDIR)/libc/itoa.c $(INCLUDEDIR)/*/*.h | $(KOBJDIR) - @$(KCC) -D_NEED_ULTOA $< -o $@ - @echo ${CL2}[$@] ${CL}Compiled.${CL3} -$(KOBJDIR)/mem.o: $(KALEIDDIR)/libc/mem.c $(INCLUDEDIR)/*/*.h | $(KOBJDIR) - @$(KCC) -fno-strict-aliasing $< -o $@ - @echo ${CL2}[$@] ${CL}Compiled.${CL3} -$(KOBJDIR)/ctype.o: $(KALEIDDIR)/libc/ctype.c $(INCLUDEDIR)/*/*.h | $(KOBJDIR) - @$(KCC) $< -o $@ - @echo ${CL2}[$@] ${CL}Compiled.${CL3} -$(KOBJDIR)/rand.o: $(KALEIDDIR)/libc/rand.c $(INCLUDEDIR)/*/*.h | $(KOBJDIR) - @$(KCC) $< -o $@ - @echo ${CL2}[$@] ${CL}Compiled.${CL3} -$(KOBJDIR)/sprintf.o: $(KALEIDDIR)/libc/sprintf.c $(INCLUDEDIR)/*/*.h | $(KOBJDIR) - @$(KCC) $< -o $@ - @echo ${CL2}[$@] ${CL}Compiled.${CL3} -$(KOBJDIR)/status.o: $(KALEIDDIR)/libc/status.c $(INCLUDEDIR)/*/*.h | $(KOBJDIR) - @$(KCC) $< -o $@ - @echo ${CL2}[$@] ${CL}Compiled.${CL3} -$(KOBJDIR)/string.o: $(KALEIDDIR)/libc/string.c $(INCLUDEDIR)/*/*.h | $(KOBJDIR) - @$(KCC) $< -o $@ - @echo ${CL2}[$@] ${CL}Compiled.${CL3} -$(KOBJDIR)/strtol.o: $(KALEIDDIR)/libc/strtol.c $(INCLUDEDIR)/*/*.h | $(KOBJDIR) - @$(KCC) $< -o $@ - @echo ${CL2}[$@] ${CL}Compiled.${CL3} -$(KOBJDIR)/argv.o: $(KALEIDDIR)/extras/argv.c $(INCLUDEDIR)/*/*.h | $(KOBJDIR) - @$(KCC) $< -o $@ - @echo ${CL2}[$@] ${CL}Compiled.${CL3} -$(KOBJDIR)/prog.o: $(KALEIDDIR)/extras/prog.c $(INCLUDEDIR)/*/*.h | $(KOBJDIR) - @$(KCC) $< -o $@ +## LIB C MAKEFILE ------------------------------------------------------------ # +$(KOBJDIR)/libc/atoi.o: $(KALEIDDIR)/libc/atoi.c $(INCLUDEDIR)/*/*.h | $(KOBJDIR) + @mkdir -p $(shell dirname $@) + @$(KCC) -D_NEED_ATOI $< -o $@.1 + @$(KCC) -D_NEED_ATOL $< -o $@.2 + @$(KCC) -D_NEED_ATOU $< -o $@.3 + @$(KCC) -D_NEED_ATOUL $< -o $@.4 + @$(LD) -r $@.1 $@.2 $@.3 $@.4 -o $@ @echo ${CL2}[$@] ${CL}Compiled.${CL3} -## KERNEL MAKEFILE ----------------------------------------------------------- # -$(KOBJDIR)/%.o: %.c $(INCLUDEDIR)/*/*.h +$(KOBJDIR)/libc/itoa.o: $(KALEIDDIR)/libc/itoa.c $(INCLUDEDIR)/*/*.h | $(KOBJDIR) @mkdir -p $(shell dirname $@) - @$(KCC) $< -o $@ + @$(KCC) -D_NEED_ITOA $< -o $@.1 + @$(KCC) -D_NEED_LTOA $< -o $@.2 + @$(KCC) -D_NEED_UTOA $< -o $@.3 + @$(KCC) -D_NEED_ULTOA $< -o $@.4 + @$(LD) -r $@.1 $@.2 $@.3 $@.4 -o $@ + @echo ${CL2}[$@] ${CL}Compiled.${CL3} + +$(KOBJDIR)/libc/mem.o: $(KALEIDDIR)/libc/mem.c $(INCLUDEDIR)/*/*.h | $(KOBJDIR) + @mkdir -p $(shell dirname $@) + @$(KCC) -fno-strict-aliasing $< -o $@ @echo ${CL2}[$@] ${CL}Compiled.${CL3} ## MAIN MAKEFILE ------------------------------------------------------------- # +$(KOBJDIR)/%.o: %.c $(INCLUDEDIR)/*/*.h | $(KOBJDIR) + @mkdir -p $(shell dirname $@) + @$(KCC) $< -o $@ + @echo ${CL2}[$@] ${CL}Compiled.${CL3} + test: all @qemu-system-x86_64 -m 4G -hda $(BUILDDIR)/bin/disk.img \ -d cpu_reset,guest_errors,pcall,int 2> $(BUILDDIR)/qemu.log & @@ -187,11 +172,15 @@ install_mbr: $(BINDIR)/disk.img $(MBRDIR)/grub.cfg @rmdir $(BINDIR)/disk @echo ${CL2}[$@] ${CL}Success.${CL3} +dust: + -@$(MBRDIR)/umount.sh $(BINDIR)/disk || /bin/true + @rm -Rf $(OBJDIR)/* + @echo ${CL2}[$@] ${CL}Cleaned.${CL3} clean: -@$(MBRDIR)/umount.sh $(BINDIR)/disk || /bin/true @rm -Rvf ./ProjectTree $(BUILDDIR)/*.log - @rm -Rvf $(BINDIR)/* $(KernObj) $(LibCObj) $(OBJDIR)/* - @echo ${CL2}[[$@]] ${CL}Cleaned.${CL3} + @rm -Rvf $(BINDIR)/* $(OBJDIR)/* + @echo ${CL2}[$@] ${CL}Cleaned.${CL3} $(BINDIR)/kaleid: $(LOBJDIR)/kaleid.x86_64 @echo ${CL2}[$@] ${NC}Objcopy...${CL3} @@ -220,7 +209,7 @@ $(BINDIR)/disk.img: $(MBRDIR)/create_disk.sh OS/K: $(BINDIR)/kaleid $(BINDIR)/disk.img ./ProjectTree @mkdir -p $(BINDIR)/disk - @echo ${CL2}[[$@]] ${NC}Integrating kernel...${CL3} + @echo ${CL2}[[$@]] ${NC}Integrating kernel, $(mode) mode.${CL3} -@$(MBRDIR)/umount.sh $(BINDIR)/disk || /bin/true @$(MBRDIR)/mount.sh $(BINDIR)/disk.img $(BINDIR)/disk @cp $(BINDIR)/kaleid $(BINDIR)/disk/boot/kaleid diff --git a/ProjectTree b/ProjectTree index a8b117d..bb8d75a 100644 --- a/ProjectTree +++ b/ProjectTree @@ -55,6 +55,9 @@ │   │   │   ├── kaleid.x86_64 │   │   │   └── loader.o │   │   └── kaleid +│   │   ├── extras +│   │   │   ├── argv.o +│   │   │   └── prog.o │   │   ├── kernel │   │   │   ├── cpu │   │   │   │   ├── cpuid.o @@ -79,23 +82,24 @@ │   │   │   ├── bprint.o │   │   │   ├── bput.o │   │   │   └── buf.o -│   │   ├── argv.o -│   │   ├── atoi.o -│   │   ├── atol.o -│   │   ├── atoul.o -│   │   ├── atou.o -│   │   ├── ctype.o -│   │   ├── itoa.o -│   │   ├── ltoa.o -│   │   ├── mem.o -│   │   ├── prog.o -│   │   ├── rand.o -│   │   ├── sprintf.o -│   │   ├── status.o -│   │   ├── string.o -│   │   ├── strtol.o -│   │   ├── ultoa.o -│   │   └── utoa.o +│   │   └── libc +│   │   ├── atoi.o +│   │   ├── atoi.o.1 +│   │   ├── atoi.o.2 +│   │   ├── atoi.o.3 +│   │   ├── atoi.o.4 +│   │   ├── ctype.o +│   │   ├── itoa.o +│   │   ├── itoa.o.1 +│   │   ├── itoa.o.2 +│   │   ├── itoa.o.3 +│   │   ├── itoa.o.4 +│   │   ├── mem.o +│   │   ├── rand.o +│   │   ├── sprintf.o +│   │   ├── status.o +│   │   ├── string.o +│   │   └── strtol.o │   ├── grub.log │   └── kernel.ld ├── include @@ -174,4 +178,4 @@ ├── ProjectTree └── README.md -35 directories, 114 files +37 directories, 116 files diff --git a/kaleid/kernel/init/init.c b/kaleid/kernel/init/init.c index d84884c..115dc09 100644 --- a/kaleid/kernel/init/init.c +++ b/kaleid/kernel/init/init.c @@ -150,6 +150,8 @@ noreturn void BtStartKern(multiboot_info_t *mbInfo, uint mbMagic) MmInitHeap(); PsInitSched(); + KalAssert(0); + KeStartPanic("Test Panic %d", 4); // End this machine's suffering From 6e38478e144787f033d63392097e1d27030bad7c Mon Sep 17 00:00:00 2001 From: Adrien Bourmault Date: Tue, 9 Apr 2019 23:36:30 +0200 Subject: [PATCH 09/13] Makefile big enhancement --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9be191e..b1518b6 100644 --- a/Makefile +++ b/Makefile @@ -81,6 +81,8 @@ LibCSources= libc/atoi.c libc/itoa.c \ libc/strtol.c extras/argv.c \ extras/prog.c +KernObj=$(patsubst %.c,$(KOBJDIR)/%.o,$(KernSources)) + # Kernel sources KernSources= libbuf/buf.c libbuf/bput.c \ libbuf/bprint.c kernel/cpu/cpuid.c \ @@ -91,7 +93,6 @@ KernSources= libbuf/buf.c libbuf/bput.c \ kernel/mm/heap.c kernel/mm/malloc.c \ kernel/mm/gdt.c kernel/ps/sched.c \ -KernObj=$(patsubst %.c,$(KOBJDIR)/%.o,$(KernSources)) LibCObj=$(patsubst %.c,$(KOBJDIR)/%.o,$(LibCSources)) From 7167d958f70f2a0750be9e74daec2987016ec9ac Mon Sep 17 00:00:00 2001 From: Adrien Bourmault Date: Tue, 9 Apr 2019 23:40:57 +0200 Subject: [PATCH 10/13] Update ChangeLog --- ChangeLog | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7cb68d1..c5582fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -40,4 +40,8 @@ - We have implemented a buffer library for our terminal - The stack is now 8MB long and isn't anymore in conflict with the kernel space xD - The terminal is now better (with sprintf functions) - +2019/04/09 More improvements + - The terminal is now buffered (static) and we have made a big reorganization of the project + - The Makefile suffered a lot, so we improved it + - panic doesn't need to lock the terminal + - We have a (basic) heap and memory allocator From 3f5e36599f0c4f5d28b2be95c91902dee385137d Mon Sep 17 00:00:00 2001 From: Adrien Bourmault Date: Wed, 10 Apr 2019 10:55:22 +0200 Subject: [PATCH 11/13] Makefile Update --- Makefile | 7 ++++--- kaleid/kernel/init/init.c | 4 +--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index b1518b6..4e9a9fc 100644 --- a/Makefile +++ b/Makefile @@ -22,7 +22,7 @@ # along with OS/K. If not, see . # #=----------------------------------------------------------------------------=# -.PHONY: all test test32 debug gdb install_mbr clean OS/K +.PHONY: all test test32 debug gdb install_mbr dust clean OS/K ## VARIABLES ----------------------------------------------------------------- # @@ -31,7 +31,8 @@ mode ?= debug # Programs ASM=nasm -LD=ld +LD=x86_64-elf-ld +OBJCOPY=x86_64-elf-objcopy CCNAME=x86_64-elf-gcc ASMFLAGS=-f elf64 LDFLAGS=-melf_x86_64 @@ -185,7 +186,7 @@ clean: $(BINDIR)/kaleid: $(LOBJDIR)/kaleid.x86_64 @echo ${CL2}[$@] ${NC}Objcopy...${CL3} - @x86_64-elf-objcopy -I elf64-x86-64 -O elf32-i386 $(LOBJDIR)/kaleid.x86_64 $(BINDIR)/kaleid + @$(OBJCOPY) -I elf64-x86-64 -O elf32-i386 $(LOBJDIR)/kaleid.x86_64 $(BINDIR)/kaleid @echo ${CL2}[$@] ${CL}Success.${CL3} $(LOBJDIR)/kaleid.x86_64: $(LibCObj) $(KernObj) $(LOBJDIR)/loader.o diff --git a/kaleid/kernel/init/init.c b/kaleid/kernel/init/init.c index 115dc09..96b4c63 100644 --- a/kaleid/kernel/init/init.c +++ b/kaleid/kernel/init/init.c @@ -150,9 +150,7 @@ noreturn void BtStartKern(multiboot_info_t *mbInfo, uint mbMagic) MmInitHeap(); PsInitSched(); - KalAssert(0); - - KeStartPanic("Test Panic %d", 4); + //KeStartPanic("Test Panic %d", 4); // End this machine's suffering KeCrashSystem(); From 2690e90e81a9ef4b4afdd78d4b99fcd42048fd22 Mon Sep 17 00:00:00 2001 From: Adrien Bourmault Date: Wed, 10 Apr 2019 10:55:47 +0200 Subject: [PATCH 12/13] Makefile Update --- build/obj/kaleid/libc/atoi.o.1 | Bin 0 -> 3776 bytes build/obj/kaleid/libc/atoi.o.2 | Bin 0 -> 3752 bytes build/obj/kaleid/libc/atoi.o.3 | Bin 0 -> 3776 bytes build/obj/kaleid/libc/atoi.o.4 | Bin 0 -> 3800 bytes build/obj/kaleid/libc/itoa.o.1 | Bin 0 -> 5752 bytes build/obj/kaleid/libc/itoa.o.2 | Bin 0 -> 5656 bytes build/obj/kaleid/libc/itoa.o.3 | Bin 0 -> 4528 bytes build/obj/kaleid/libc/itoa.o.4 | Bin 0 -> 4520 bytes 8 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 build/obj/kaleid/libc/atoi.o.1 create mode 100644 build/obj/kaleid/libc/atoi.o.2 create mode 100644 build/obj/kaleid/libc/atoi.o.3 create mode 100644 build/obj/kaleid/libc/atoi.o.4 create mode 100644 build/obj/kaleid/libc/itoa.o.1 create mode 100644 build/obj/kaleid/libc/itoa.o.2 create mode 100644 build/obj/kaleid/libc/itoa.o.3 create mode 100644 build/obj/kaleid/libc/itoa.o.4 diff --git a/build/obj/kaleid/libc/atoi.o.1 b/build/obj/kaleid/libc/atoi.o.1 new file mode 100644 index 0000000000000000000000000000000000000000..ae12bfdab70d1e51bd5ea33d4c4c4d61376fe305 GIT binary patch literal 3776 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 literal 0 HcmV?d00001 diff --git a/build/obj/kaleid/libc/atoi.o.3 b/build/obj/kaleid/libc/atoi.o.3 new file mode 100644 index 0000000000000000000000000000000000000000..da6d5714b0e8bda93a1d44e000c7e4fbed5ec0d3 GIT binary patch literal 3776 zcmbVO&yN#z6o22DUAE9|x66X=iqVn?NTltq5jYD`AXU<#J6{F$4(J@@bO4LQGeYx&CWx!-nTlo5mF zOuTV97d|5ba!2JzbJQlooH1gqk@vic%o#C=lVdh&j#w+1G)~TdBO{}oAYtDNi)c6c z5q@36&n8I2-oA>8$*1;_fshoWz8k}eH^)f?Y9EP2TSC8y>O~aukxoz~S9P-A)(jdJ z)QbDJS}Ca0YPO)>P_qEV+%`Pm#wH3Vmna;O`!lFXwW~OlcZ)lUlWOZ&>0vZ|0`mDI z2%*74;1&<(pUa<^!n}#Mn(*WaFFDtBX4!sJWURK~tf4PWoaRTe3f+ltYu~HQ% zZBR@zn$FTMJT#I zo%4L%Y1aHsy#bw|;rE)lR`+5J;3Z+F+MpRv&VQieYMW9vq6AG-880a<0^_<*sh6GY z7+6P97_BC-y4oN&IR4s7d1-F0e6adVb+%mTHo9R``}4jRwKS?hSc!DAav=;@>vq>u zIF1=X;c0}DUZCe&I?z$4fvOiZ+Vks&4pa{8FIQUS%IjzoC(Zd*(8Fw%wY5m=IPrpJ zCul)0h&!!7H_MH-7l9uJt#Tithahf;QDQ+!l!QGWdUT$-q#9q#27eRr{;&g>f}mp$ zYVEMAYk>~eYbT@decednS{PT(rA3k1pu}d_tNR+VrNi;1rNiYX@lyAuHww60Qc@RA zfm$!A9phuUFYrer{82tLbMa!abh@~4UijEBbipLs=R z*rL3b4w1+{d#kvT4N07@SU+gtr#Su*3;&7rB@4gB`bi7F%lcauex3C*7Cz2-aZ?$R zI{#taxA0?ZA6xh##xGeos~~+#e3{4}Ec-_|&X0_fn!V>gGWOYNm%hbbp63$Ble{mm zE_npM$#EaE>;;!uBKz#qCvzluISjnZf{m9Mr=GHXK{Y<#O}sjC9CE|kB1PKws)=4t zpxX2j532PzhN?lEy54K8c7nAK&y4KV>yiFYG(T)?u=FA?Xz7jKekagkPcI?WM%e9Y z+@Wa--CkXbysiug*Z-ibjE;0Ca-R}sfdzTK1eg02eFqBk{4(Vs=b~;1|w+j+6}9wjrJk%YT;>$(&Js`WLnHe~cK#lsZu~w1)@kjFnJS;h&-P zF#k`eD5R|^>wk-%@Ne;iWNx=__YM2obxHkVcnyVN{mY+Twtspn5P!jk<)+v-Ie(iA pr9SAL!1kx#)PD95f?1yb?WAN#`WA?Omtp?X{HJ|g44K>h{{sV`F+>0W literal 0 HcmV?d00001 diff --git a/build/obj/kaleid/libc/atoi.o.4 b/build/obj/kaleid/libc/atoi.o.4 new file mode 100644 index 0000000000000000000000000000000000000000..7ae10191e3833f8b832b2929c80ec93e4d9224bf GIT binary patch literal 3800 zcmb_e&2Jl35P#2`4<~jUCn+ITKr&xR3wUiql|mtDlmKZY3IR0-;NY(97u&?%jds_N z=1`*CS}q{90t6CBoGLC{KuG)pa6zaCgv5ov0I33T;ZSDY&N%B=_ktM7o|)g9?;Sty zdoRBHQbJ0>B*lt2))*Dy*Rf-HRg0_QgqRWKTjjscf5&Hcet#UChqRj1VbXlWJj(*` zgiNBAkRzHUMv+-sUc3M-F%&~iRuD;QB#|7}R-|QhMgoV1hFfk(VGh>7ZukhkK8MeU zh~nM44vJ1K?Ta8Xac%OmEEGQ$guakAib&&LyAJAA6nzzfh^{F-LV6g?(sJASQ*Ni_ zMOjMA*JMeEiR6QDKpkdgL7t54q0w)JoRW`aW>QvWJ~Jh!N3-{X>7yc*S^)?QW`&hG zn|dy_IRir_9LgS+a&txkHu4a}8a>^!I+uGs2aVbCTrP54%x%tK;MKX0)^g}EHY}`U z6fyzH#=)0VXyxjWgo19Y<;q~0zIG%Co=)xdU;{4a@T3AR=wD6RcoT< z*4o{=Dps993E_lZ%dX*GhnM$MU^g*k%@4sel3_4W5fIlZNSVk&VCDOsUkOE}QbRYf z@yd37yHD-hA8^F8G!fiIvZFb zcF8gb+&aExVkqJheL5>v?`OzJ#4Q1ria}V(bZibhQ?z8c&xO_{+C#V@^-|&08WGMr zo`vyoz*$C1{$D^GKb&g{4}lo}EmFmO#2J4A69K_}rwP^GPZ;D=5v=3Hr&@~P80%Bg z&lva{6o19QzbAd&z<(iq%fSC4ecQnQAiZkfH%V_9_#D-cS5HM9ClyxCQH6*J9en{Lt)pQ&=Gbu2!yTCx~g^? zm6p5X!I_qwYSmZou-5i!eU^^zxDD0s-EO&x?eW#bu6dn~f-5*mp_-K)-|4{L-Ty&( z2!gZXd2-BE5_q1BoBBK);9J=$8xTKF0pYDe6aL;Y5APY{3xu0D@s{?w`wL^l3EwL) z=705H0$(#G#^?ODacHQb47P*%zeN4-(NbamxTj|SYk-+C0TNdT{1KHHnYLJ`iJ|!h z<$X5hi=t_JX#j?HhvZ*EB}S(ITW~h0|DUN*_Q(G5em46L0W)I)B)+EnyQsv-wDsU@ zP=5Z4-f60c#P5*xZ)iE$O literal 0 HcmV?d00001 diff --git a/build/obj/kaleid/libc/itoa.o.1 b/build/obj/kaleid/libc/itoa.o.1 new file mode 100644 index 0000000000000000000000000000000000000000..e00fc7db6c58e84b042ae80ffc8635561256c397 GIT binary patch literal 5752 zcmbtYU2Ggz6~1@wrdfNFT|1^=$3U9*6^9=ggcl zGdrHVz^y#zJKy=c_uMH;_wXBNPq+RO zyZlJI-TsFOkHp^8=z-CL`}U6>6ct!c$Vw5m+O*BWp2uH3Sd(GYG^c^@a&5 zdv_t{TDwiXD&&3a9I>pQXXkE1FADhuwr;bmXYh$*yDfw`1vPiWUsNurTXJ5+*pRnL ztq!L7F2%GEJ>gj}QFom4rTx%_FALc#AB^@zRCF-fD|c+|`2++!AR>{&KnbA;LYqTU zPWQ<^=+dX4!abuxMGr;37@6)nGVssdtoWtTbCqE_=Smqlr@#;+9fHp{%=k63lXzzDX7;Ig9S_j z=uHZooe{O`xt$T8BrL@O!y%$VqA7+pSbNZM%~4A+PX ziCc1EgSF=!#|*=l9BP5#TMm_B_`8mDtU2daWXQfrbUV4`8SZwdIfnZjYL?+~hgx7* za;RBu#@8Hbjv;qIiMn(a{-W#0kXI{3hT%`hONpko!OE*n=q$q<4mHQnZN)4ZHwkyg zXBfIGnrFx>!;PESV6E;{oMFi8lwzLY8hP2VtnsYDk>PLMbPRb%7zBmK)1(&7m?3`S?gN$B<|3IZ1phz>A^V%1tMP7sOu-O^j?X=A)vClrvKdotho^PXfDfg7DqGRZ`Qb`=DJRNCuF}lw z!%Nw^E=0Le%O-Pp2g#WYuqR7)%`Uq#BvU)38j>oTjH{u>Grviw{&3;_^vEIAl{|gq z_k$|;TW>5MEK|8)~SaMPVX~i@CC&8!Q$d46`CR9rl3Z|~t8(AY?Hj2X2jA2?n3ehy`<)WeIQC=QnLB$s?s(ump)wmG(aB=(XkHj9ELQ=Nk3lT0QZU9e}=8P`=h&s_4QyX)!f9c_{u_X!9<+$8x)^pyCHT|SLBlMqJ6IzTn7&3lQ=OLaCNi>s?HY(@GhIS{4s{d2m#LX zW6}@!_{S;#VITiz(vSK0f0BN}$G=JXoR9xF<$uh_|C{uzkI#^Q$;VF-f5FF-D%O1b zE2Mv$B!+wY_H*K~KfEVM@j96Ap}KE*{Ba-uPWn3@9`g)Rk@tN32gLu)!(*OZl>c8I z9`jV_6L81JkA-YPQ5^3t&$Eko6j*YV;&=G?GV!1D@oy79;o-Lshhl+vuKNJ#kNJ4+ z?-O_7bszsrs!_fR?|r`*V+g;47)C9&GV#AS{CwQ9+P+?Yk*uGqHnK|~8>THwj7+_f zO*Zu9hDheKjjTv6)$1Z@)=)wBR5ArBI_34HW^u7>6l&mV;q1~9{93YBspUF6vu4&P z>X^)pu9OX({UNzX=4#cd4!>=-lU`aZnAxgM>-c{K_5*w5?J4FQ#|I4l?%JB$Z`KC^ z;E^0>g5)xN_|l~B0Eu<@UF#?Q)5QCK@%UVkn!sC$H2naaRM+xfaSA{3I<5`-gkv@81k?{+vLGSLkr_cLg~de&59a z4*f1u-S5-)200x5_*wvmetT%5{5ymk4uAX^;DXj4rx%;!asB*F#yos}Rsj2RqWy8I z|6No(!|#j#KP#wyhU#-2tdCpb@Bd}sFelFwpfzrjW64*LRhHiY@1XcaTr3Q%>m3}& z@~2=#Oxx|aE>nEkVQj$jXZl9~g4SOOSU*x6&wUB1jk&K-{g-H>eZb+Z&>xRCPC9CU e-0>AU|9l5$3$L4XyhjDaU!?iJ#*QTY@&5(f1PY1( literal 0 HcmV?d00001 diff --git a/build/obj/kaleid/libc/itoa.o.2 b/build/obj/kaleid/libc/itoa.o.2 new file mode 100644 index 0000000000000000000000000000000000000000..a49d01166b6b0e58bc285f433fb6cb7c8fc76271 GIT binary patch literal 5656 zcmbtYU2Ggz6+U-nldQeTt{u0EO_01;h7#zme-g*}kK-iuBn`xFY(-53_Ih``yXpRf z+1=KO5UpZ@*n%lg5KRHuq7Q9ViH9OV`v6o#N>ib#fP{#UP$~pMC=WnWsR2aHId{&P z9gjCJaHE~`o$vhId(XXh<~mOvJ@JsC6i8EW02-RG05{qictpbyxF7BV>+;GetA59- z-@Z^-_*ZK!YrW2nPg%R)iGA^_s97J}IP^LtwbJid^_#cW$GX9)|IWH%eQ@{4;^^tc z4*_fwR^`WZc`txCJ{t6Of|AwB%q zGZQN-D^~sYfBihl#O}et?c0Y3`?v4hHMC=RcxYGuE-2uHLOM}c*K4E3zQ><@*id28 z47FYhV}lkUSAexk4z2Y1pP7R53Yst=n+AYp{#_AmTP}}4RfJd>< zPv9@Arp()F5@KS=xTH}*(`1V&G(cPU5j1gi+J!fM(12G!wX2UtJ0fOuYqVW$-q5xM z19~A6Ie-*^$q>sNQtDWT>cA>}1T(GQ0cLbhWN+kH$HA_BU0AN9I@sk>4|E;tpj;!J z-x=+q2&}dlcAX8(--0T~lG=)?eAY-KGg&vbvU595WmElPoH6`#(j~W;FOQzg(qIvrk#@W6`&_SoB zU{at=SHUTPdtE2=nhqoxEp9yKAw_>xDR5-1fgp`yHrFE#uGE_>9Zz!#Y^p=K!JT%ZgXdl0zn1$v7vQ$#N|dO}9u%Zvg2OM>P68Zh7uYuV=~)tB@X>m_FJ zAWB1H{kieX65|mJuAnqv6rW1{JGu#<`X+!cF!flfVCOS^h5T$9@}+d4ma+S0Qx*I& z#9Fa9@6weDGYAHes@6*O{;XZHoqQVAl#|Zw zpWn4Jv2#Z}k&P!#qEDro*`F=du(!nAoMYRSYO0jUm$Kk1M;{lUR;uK)B|8&O=TZ*f zXVtMEA0(MRe*p^RQa0{+(8s%yD?8QIl&oKc*Ky5hi+z}FdRrZdwk;S&vGr;+JQg`a;-SbGi9-=~Ybr1mUZ4K4 z(#&W!y@BGs!hg-0$rrJp&BTjRvu3*2r!^)MRv#O2Frh`@Drtfo=v6e1QeTZ$lc<>x zUBeM!Lfbuf@9N~)X@r}7^^v1Zx36Yd?!N~w$5?NHz~-gSa`eDP>*OEBtD1Fre|3NE zQWFIuFH2 zlMjdFS!Tm9OW{v*{sRI29oCNq_`k4zBEbKYb@>)Ze!3-6JL3v(zVEZ13h)oJzpRVo z8D;*-fIqA7bbwE@|F@VY)nB(C`TS)~i26lXeOTEeL-~UtW zFa372ekQ>Gkn?=@9=sjkf6V^*d+`4AC743w3{n`ESZ6w^pYHkf^Ks^h^Yf6bTqssk zvnZ>MD|3PzyO2s&?fEJsGpT9{lCzZxB%LxT@0pS zMJtrkt2|Rqs+6@UStGiTFWKUc$sw687mGH2-CQR-H$CU1iZ;*V{}pjeK(+JNlyZ*H z1Dm{eU9C}X(YGQ9;cr9;mYw|KvsmAZlKPRehJPUH_Az`CAN=CUxp2K2PxAG*2T`G% z|7-jJ#!}8f{P~;oFYjZqN&h10{U}&`NbY9xe83n`b={iPZ-(nP!xN+W(HaHoH-TI* zCsOb-Z*F<75JxTOJKcmMzvsB$AsU>o1>?(T3v%TCHh%==J0vNBzUR=;Z2oV=+z5%M z`O`ZmIR6FYf;lPjKivQKN%6IyFa0-Dv;P0i{mVY3{%J{q{Xc^o<&<$E)a`k8%mq3W zRpj&N-7Maq$zr2^{Y~OTzJx}?yxg8^C&ybJ;{qAK&@UipHvcfcSpD-SO5%lY);Hyz v;r^fFfp#EAx58jN-8gxxA!@Wce5;l_xL9P~qSHO9S$v$w|Ef5$495Q#f#?G9 literal 0 HcmV?d00001 diff --git a/build/obj/kaleid/libc/itoa.o.3 b/build/obj/kaleid/libc/itoa.o.3 new file mode 100644 index 0000000000000000000000000000000000000000..d93a2bf4ddab88c0b13b5331483e68da5c9cc13b GIT binary patch literal 4528 zcmbVPU2IfU5T3KQKih8EwiK0$#sz;Ugx$8tU$Di}g0u)&Y8wQN`jAwIU=4J^-tz7FiT}#~TzItM?3)*t z#>$J{K>Kq;(7&+v;k|wH6UXKc_FZ_?y05&@K74!Z!VPip#@>&{mrB3yy#+8@emHua zd6(`|-1R=RXUa{Z<;9z1-)cgy#hbgZrUvO5memES@#8a0gEAz-WQ9bN6rpAkhSWD6 zMiFX|NGPmCqnuJ!hfEU+OR%A#F=uDEKUG$O850I`{!WqV>fJFg-aaf-faM129!he_JSl<`1J0(68o zp{bhgWEbNr5S`-1XjjCDu8Vex)y*AGq1Ou#iR?iL*X2ntqPrunM8>*si4~5mH3~7- zB@k;`k6g{$DqgR44|HSm3Gr&TAGoo5tc!?;)_ykJO%W}PV1#|j5GHFyQ)M7Cf>eRo zwkk8tu4+}zo!CsYJSVXFE5qIWNZWpCPC#hwC&O#8*>-GzD(*}G6=X;K6x=q-HA)vS z#p<&aXndzq4_2W=N}Z}gtiDr$rdXY+K;x`detqCL@0iGWE~U#}3o#T9T413Yn+ zjVk+Om2bHw_d7xYjdO(jm7c`KLh&F7LS z$l0lUDQ)#8&7uX6^BgmgqVvx?_nuWuWGQ9J_0ZMVac}!YAg|FQgt30Wm>w|JC#H?o z`}aosMvb<_VdHc-VLUx&oSZXa1EB^?Jw2TwLO5__DmK#JAKRIDInfu37g7Z$ZRH2^ zrkki^9u61TB~}vr;M#7$Xn(a3re`mKD+cF2ASA#a~bH(It8oOww&4Cao0IzrMzOV zQ;eVX1ISkfrJYhTZ$YqbI50A@JJy4Xyvbi-+6w%XiSrX6W;?{Xw&w6<{DBF7h8%FL zw1@mz{~JT_0=l;p#8@}#-k5ad$V-RaD$-C_Sp`sv0rJw(VPt8p!3Z$?E2w79fR-A} z_m8ZA%L}Gv&VcqB%;%}xK$UrVDpv>Af!CCnJ1SlQg|{B<1>SKuJ*-@4y@Of!JZnXq zb#iT^FC2u^hffE-02!YrCmc`sqT;`W65+rrO%5_Ek2va^d|3JiSCw8UZzgPCV8ooy5#ZyfV&U;_kc@00J{EHgCU*VTD zT$yl1!`qcVUj}3b*Yk&fe{fg-tl`YN5WuO2yUPA8fD_LHW&fq&6RMuY08Ts`75*rI z6VD}u^MlUo)}ru6B}q_Ud^<-qoG&=uU(B;X`SmNw__wN#?JMBC=gB{KO7OEqVZn7i zq4;z>rf~8N`a`04uHczTl%DI$ENiZnHxr&U>p>!IdL|^2#UdmmnzoXq%yiD4ad1xR zW-^Jl2U~e3wan9WO*>;PkIv_8i~TVrBvMYHVBtaUr?9fqGpfph5Q#t7Tp*(yZG5(Um^_$@v8CCm59Kk{FLB#pE z@jEb9=Olj4KcG!&CiJ6kz5cIpqpC3KpY|!k-2X6QIwwN#hXVg5BQSJdIu~_}+!xel z{zaSAOgOnh{5AjICG-(lVCeC0<6PbT)z!-J)IZ%9djB3`IwwMKN9E^xiZB|wuY*{< z{C8A-UT4Zrke>fT#E6sYL{$z;9V#g+z5W;L^iOXu9M9`Qb?CW?yMqpY99dN;^+E40dOZE6`m=`+%qmBIzaWeT X_w8Hwe-)K_@nQ8M^EEpvsmK2h3;2DR literal 0 HcmV?d00001 diff --git a/build/obj/kaleid/libc/itoa.o.4 b/build/obj/kaleid/libc/itoa.o.4 new file mode 100644 index 0000000000000000000000000000000000000000..2b06d0b4ea87204b71cc5dbfeb54765fc04a6477 GIT binary patch literal 4520 zcmbVPU2IfU5T3KQKih8EZ7CwPM%Et`685%5{(@~Ot;lWzT522c2h0B4?k?=!C3o*a z;XzH2gkqXtA~8l2h`#uwZ-yrWk`SXYF+3SHk;KH9@L&lKC??jKbIkxjcmh4<@V^N>k{fTLA(II6N#C+@72;z; zTk;^x1d-!tDZ37u?A=P3Fo~E($gzqbdf8dFC$_Nj3UU!g=#xg+69B!KBqAn_I|BP@ z4{ktHHQm83#wQ>;#JX^2$Ow0bJH*Q7_J`5yDF}rI5dtt)gAv{ldM=dc#3fcZw$>;_ zqEjH&^f+=gZ?1an?CS5r=1sA)%L{y_E73{BLu)=5?xKj6MlgaNWdM`4qNy^F8A2-G zY+H?)W>>T-=MHQpJU1(_`U}HdeMlQQH!C2p=Dp!H*lYwFpo%+8pn~kMmx9|yxmxK0 zCRtrqg~oO&b-V`Ao}h8a6Zklcv6`tuldRfRXpGhBw-1wQa+%;t1Wd5{a+T;6u7GnG z;EIcE)Y#eWf7tggXFte^IJ^Pwi2WDYs?qP)d3o8GK)^B=4yn0Ju*wN2-9(*qJkJ!c z5w(D{anfTOwX88I%1{Wa!;uoJL-i|gbdA; zDyf16{>ov`$jFZ9dR*oW-WsdTuu4gBY8=E&yXbCf4xYzvnea!|-2FC^nwA1X@WQ#h z=*L($>fV&NP4KVYFx1th&lw#2dF-}vdM%;B{FkH!uuVzEUswEt8vc#4 zcWe0X${yA5o60_*;a@8I4GnKsdGTnIgX_7Y?1F}mDgUyD?@{y(D3!j|DwXl z^snbvK7aqN{$9hG_l6Ir9)4E#FFu@jxUX9pKCbFn@ZrS6uTuAXIPp}JKR@WaZmkM$ zRFVYs#kX--!}%85sBq?aOxb-J{<*4S%YAU(^TgvnCHUE*F#kHgs`zv~s&Ml4`-53N zS#*;rl&<5+9BYnMNSdxSYT*S`TMm= z&4fPmt=Io0Zd4UU{nI{WnEM|_Oy@)hZYl6jGJHe#9m6>tBln-wX1=OTY9<`MPy9#J z6pmg`R6q6j*Knq8|LSVxcXrzK>Q<-6!zFaC;ppjIkA797X&LlwW|>_O~D6|dLD^)ui5sMPEK zk2?KF(3j(RU8oK{H*tHv_5rwm>Vw{j^mzJC^=A(uIHnx=cNSqZxNpzG->0b5i{}@a KPuWpPJ^nu=e10GR literal 0 HcmV?d00001 From 31918c2e6f056e43f48036fdf59e5e916ecac12a Mon Sep 17 00:00:00 2001 From: Adrien Bourmault Date: Wed, 10 Apr 2019 10:59:13 +0200 Subject: [PATCH 13/13] Makefile Update --- Makefile | 2 ++ build/obj/kaleid/libc/atoi.o.1 | Bin 3776 -> 0 bytes build/obj/kaleid/libc/atoi.o.2 | Bin 3752 -> 0 bytes build/obj/kaleid/libc/atoi.o.3 | Bin 3776 -> 0 bytes build/obj/kaleid/libc/atoi.o.4 | Bin 3800 -> 0 bytes build/obj/kaleid/libc/itoa.o.1 | Bin 5752 -> 0 bytes build/obj/kaleid/libc/itoa.o.2 | Bin 5656 -> 0 bytes build/obj/kaleid/libc/itoa.o.3 | Bin 4528 -> 0 bytes build/obj/kaleid/libc/itoa.o.4 | Bin 4520 -> 0 bytes 9 files changed, 2 insertions(+) delete mode 100644 build/obj/kaleid/libc/atoi.o.1 delete mode 100644 build/obj/kaleid/libc/atoi.o.2 delete mode 100644 build/obj/kaleid/libc/atoi.o.3 delete mode 100644 build/obj/kaleid/libc/atoi.o.4 delete mode 100644 build/obj/kaleid/libc/itoa.o.1 delete mode 100644 build/obj/kaleid/libc/itoa.o.2 delete mode 100644 build/obj/kaleid/libc/itoa.o.3 delete mode 100644 build/obj/kaleid/libc/itoa.o.4 diff --git a/Makefile b/Makefile index 4e9a9fc..68cee40 100644 --- a/Makefile +++ b/Makefile @@ -119,6 +119,7 @@ $(KOBJDIR)/libc/atoi.o: $(KALEIDDIR)/libc/atoi.c $(INCLUDEDIR)/*/*.h | $(KOBJDIR @$(KCC) -D_NEED_ATOU $< -o $@.3 @$(KCC) -D_NEED_ATOUL $< -o $@.4 @$(LD) -r $@.1 $@.2 $@.3 $@.4 -o $@ + @rm -f $@.1 $@.2 $@.3 $@.4 @echo ${CL2}[$@] ${CL}Compiled.${CL3} $(KOBJDIR)/libc/itoa.o: $(KALEIDDIR)/libc/itoa.c $(INCLUDEDIR)/*/*.h | $(KOBJDIR) @@ -128,6 +129,7 @@ $(KOBJDIR)/libc/itoa.o: $(KALEIDDIR)/libc/itoa.c $(INCLUDEDIR)/*/*.h | $(KOBJDIR @$(KCC) -D_NEED_UTOA $< -o $@.3 @$(KCC) -D_NEED_ULTOA $< -o $@.4 @$(LD) -r $@.1 $@.2 $@.3 $@.4 -o $@ + @rm -f $@.1 $@.2 $@.3 $@.4 @echo ${CL2}[$@] ${CL}Compiled.${CL3} $(KOBJDIR)/libc/mem.o: $(KALEIDDIR)/libc/mem.c $(INCLUDEDIR)/*/*.h | $(KOBJDIR) diff --git a/build/obj/kaleid/libc/atoi.o.1 b/build/obj/kaleid/libc/atoi.o.1 deleted file mode 100644 index ae12bfdab70d1e51bd5ea33d4c4c4d61376fe305..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3776 zcmbVOO>7%g5T3W2AE&Mzr)gr9eo*0&Ho50{k$tB`+Fr5q85ktX%#hGk0_DpOx!kzy0gV<)1P??#CSUOP%cn9BKKQRW9mSDJnQDC@?&b(aA7aH-VfRA z0z&9;54ibb*~hXc$8j$i$Au3nb#h!GHnbnp3?J@!9iMz0o5+;a@yR4`dh+BrC0?BP zY-y4rMh3ynBq<#%wgY2X#lE%_X98g7l}ifOH-}NV4=yQiCO%n0I6sQ(qXmr~1Y(6U zP+32pR5YC>4>TH5uqL8x@c`g9eZ}@3djKWJXy)zoaEa;xEHsciK<7iLfAcwfnuCmc ztj>CE-KtmGt!fQgey!cD>q^y&G=LWet#Xadczo_{9hI9@vKGeZn#j0G$s#bXJFQMR zdoZyM!ysIbVST+uVQ}Kvwc_&JT=8i6q4I38)TwoXx^B<6y|AHC^@CEV>!tI7&swLm znZQxR2nr7(6nA|+-_X7eTQyX@u-2U4eB?;!$l+qCQ7k=&K2cnsZ}?rTR@&GIwT@!X zuebaLbp5E+@O8adYkDEH1HV!1L39bCW)Q~Pp)TR6&8hHqY>P9Q?o3CnNfl$GOr~(9 z8FX~T*TH6GH4NU;wK%E-QR!^rOK!%$9(1d14e2H06^ny5z=`GMW5pTV(?iLI;?D2J zACWr$0;tV`n%X&>`50ds;romQz?_RG@`cm+?dOHfhG7Vfp}%gYF_GQAla29VNX7t!FW-$Y&58i*hE~JKRD$0dyO4|}$$ZaVp$%WCBwk5iNL&YLm$*$Bs z$X%n%y-Agh;R9n1gS>pY9!;D|Fa8^P3mi%%ezqb4bIL|kXlbYV=pHu$n(|*hHm-}4c zd{TEW>-SptORV4bKe(JF%9Fl*a*il0z0TLH^{@&>7RWd459R1wC-$nyaYz~76e-kg zuN>>m7|L}o_MlviA}AZQuB+X~dduGk&}L+>S`GC(qP2tCHcv0~{D$5h-ER3>{IMjI zYeA=@af~J;PiMU11plKqr4i!8|f5?uCI^eGhR`)g4E<|~{KzZeYB zy{0;H&ICWmxIJ-SHBomyC`X#;n}KrPZTu08wR2K_seiySS}M$;Z@>P}aR0CHp`!lj zoZ9^_A!g@92re-A8!0KWeQDm<7`ea5bstT|l4$#$>4TBqM;t#(N{a0G*U{Fm|LfeS z#8dw?hwc7j#O$01!S`JMEGa3neFL=htAC3N$vLC?^e<}He-AOrDeFYh&@>;YH>`r9 z3jYwj`^CRci$dC!u-;SRgnxk+lDXZU-{%}}uS?c1j#p9W*T4MfrTeF^0*M#AUv0{L vgX=eWq0|R`6WHk6iSmuiJ%SQBOn3@1YvEz*e2`UYIhB3 z4z%j6Z~=)5At6zzLPDGn5)yv`2qB^V1wA1y91s#04rS);jI(|h1qecwNj1qHO(tu=p`qcnAG7blI@%3?fIpw%-v}gO zZ(c>k zTFk4L)gr(|b_Nf)tU?au$;2M3`ySM^dblu~a|-i?X*DxCbp%Zxf?RGDAvCxToWkkc z)49!A>?GrO?O~-hXBA>24`8g(lRc}m#WO`LtfI~q6UXDl%~=Y(Huw2@kvztR!O12e zGni}~eObj)u3k}ip=;~KCA7?cbVWgC?$h--EMgMxM3*QW17edEpj3V#$sz?Im*Ny` zizrPU0&LA!DO)2xioY2nndi|v7Ox(_LKArgXd;yQw=jXfW@53gYR~m_yHWMpwK}x@ zy4P*!YR!!_fEx$xN}Yx|zIZ`Ll@_I}hcTKaGBzf;1jcn1l*&wDU>$}*xD&(9PMzG~ z+>6_#jisg1smkM(#ZtLb?*t9)t$1$O)TsJFIn<5vLEy92>Fg(P6fuIrV+h4vU#~Q^ zufuj7RX41+R`#D-B9Z&cKt@%Z$j6P+D%_KO7)f- zf*1JBQV*iBk6J+(_d{L6Q_ZPzJNo=gq&vf*sh4CiXB5dKuC{`XuKGIIuWp6Gd%7M+ z)gUVGCAMT{>>EM1=4nV@8DA=j3FkI8PM03Ro-QN}1>7MCse@NQ?N6!s{Al(Qd}f3n z<+J}A3qCdsU2yOGbvuoT>2oa-R#&i35UIVl7UhKmHgVEjT}l*8)Ec`i+ zziQz>u)bm8Ke4`L;kQ_S-NJ9M{*Hx@ab8?hhNRv94_{^b$ikms{E~&U+N)dQ z%S2wc?1wncw~UjT?(;7x`}DN`ZrRK8EpR-^OaD?5%~|+stjlv2d%@Flm45pq54orB z`KHN|%x4-eF-}+-he~v@6T3C!xT6eji4}!!mgVv#?!V=mJs{cIK{{{~g)lYM3*T0UK9TOpl82p)(6xp_PPa7liGo1IS zlrM?4?Yjdovg@+{A}J}d{olf~LG@qfLdBozr#)=fA0uYRLEcq45*(z!o^?uGAK92{*Lpv_@Yz?eG}OJ^i1t{4Hx;bKCzvRqQBX diff --git a/build/obj/kaleid/libc/atoi.o.3 b/build/obj/kaleid/libc/atoi.o.3 deleted file mode 100644 index da6d5714b0e8bda93a1d44e000c7e4fbed5ec0d3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3776 zcmbVO&yN#z6o22DUAE9|x66X=iqVn?NTltq5jYD`AXU<#J6{F$4(J@@bO4LQGeYx&CWx!-nTlo5mF zOuTV97d|5ba!2JzbJQlooH1gqk@vic%o#C=lVdh&j#w+1G)~TdBO{}oAYtDNi)c6c z5q@36&n8I2-oA>8$*1;_fshoWz8k}eH^)f?Y9EP2TSC8y>O~aukxoz~S9P-A)(jdJ z)QbDJS}Ca0YPO)>P_qEV+%`Pm#wH3Vmna;O`!lFXwW~OlcZ)lUlWOZ&>0vZ|0`mDI z2%*74;1&<(pUa<^!n}#Mn(*WaFFDtBX4!sJWURK~tf4PWoaRTe3f+ltYu~HQ% zZBR@zn$FTMJT#I zo%4L%Y1aHsy#bw|;rE)lR`+5J;3Z+F+MpRv&VQieYMW9vq6AG-880a<0^_<*sh6GY z7+6P97_BC-y4oN&IR4s7d1-F0e6adVb+%mTHo9R``}4jRwKS?hSc!DAav=;@>vq>u zIF1=X;c0}DUZCe&I?z$4fvOiZ+Vks&4pa{8FIQUS%IjzoC(Zd*(8Fw%wY5m=IPrpJ zCul)0h&!!7H_MH-7l9uJt#Tithahf;QDQ+!l!QGWdUT$-q#9q#27eRr{;&g>f}mp$ zYVEMAYk>~eYbT@decednS{PT(rA3k1pu}d_tNR+VrNi;1rNiYX@lyAuHww60Qc@RA zfm$!A9phuUFYrer{82tLbMa!abh@~4UijEBbipLs=R z*rL3b4w1+{d#kvT4N07@SU+gtr#Su*3;&7rB@4gB`bi7F%lcauex3C*7Cz2-aZ?$R zI{#taxA0?ZA6xh##xGeos~~+#e3{4}Ec-_|&X0_fn!V>gGWOYNm%hbbp63$Ble{mm zE_npM$#EaE>;;!uBKz#qCvzluISjnZf{m9Mr=GHXK{Y<#O}sjC9CE|kB1PKws)=4t zpxX2j532PzhN?lEy54K8c7nAK&y4KV>yiFYG(T)?u=FA?Xz7jKekagkPcI?WM%e9Y z+@Wa--CkXbysiug*Z-ibjE;0Ca-R}sfdzTK1eg02eFqBk{4(Vs=b~;1|w+j+6}9wjrJk%YT;>$(&Js`WLnHe~cK#lsZu~w1)@kjFnJS;h&-P zF#k`eD5R|^>wk-%@Ne;iWNx=__YM2obxHkVcnyVN{mY+Twtspn5P!jk<)+v-Ie(iA pr9SAL!1kx#)PD95f?1yb?WAN#`WA?Omtp?X{HJ|g44K>h{{sV`F+>0W diff --git a/build/obj/kaleid/libc/atoi.o.4 b/build/obj/kaleid/libc/atoi.o.4 deleted file mode 100644 index 7ae10191e3833f8b832b2929c80ec93e4d9224bf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3800 zcmb_e&2Jl35P#2`4<~jUCn+ITKr&xR3wUiql|mtDlmKZY3IR0-;NY(97u&?%jds_N z=1`*CS}q{90t6CBoGLC{KuG)pa6zaCgv5ov0I33T;ZSDY&N%B=_ktM7o|)g9?;Sty zdoRBHQbJ0>B*lt2))*Dy*Rf-HRg0_QgqRWKTjjscf5&Hcet#UChqRj1VbXlWJj(*` zgiNBAkRzHUMv+-sUc3M-F%&~iRuD;QB#|7}R-|QhMgoV1hFfk(VGh>7ZukhkK8MeU zh~nM44vJ1K?Ta8Xac%OmEEGQ$guakAib&&LyAJAA6nzzfh^{F-LV6g?(sJASQ*Ni_ zMOjMA*JMeEiR6QDKpkdgL7t54q0w)JoRW`aW>QvWJ~Jh!N3-{X>7yc*S^)?QW`&hG zn|dy_IRir_9LgS+a&txkHu4a}8a>^!I+uGs2aVbCTrP54%x%tK;MKX0)^g}EHY}`U z6fyzH#=)0VXyxjWgo19Y<;q~0zIG%Co=)xdU;{4a@T3AR=wD6RcoT< z*4o{=Dps993E_lZ%dX*GhnM$MU^g*k%@4sel3_4W5fIlZNSVk&VCDOsUkOE}QbRYf z@yd37yHD-hA8^F8G!fiIvZFb zcF8gb+&aExVkqJheL5>v?`OzJ#4Q1ria}V(bZibhQ?z8c&xO_{+C#V@^-|&08WGMr zo`vyoz*$C1{$D^GKb&g{4}lo}EmFmO#2J4A69K_}rwP^GPZ;D=5v=3Hr&@~P80%Bg z&lva{6o19QzbAd&z<(iq%fSC4ecQnQAiZkfH%V_9_#D-cS5HM9ClyxCQH6*J9en{Lt)pQ&=Gbu2!yTCx~g^? zm6p5X!I_qwYSmZou-5i!eU^^zxDD0s-EO&x?eW#bu6dn~f-5*mp_-K)-|4{L-Ty&( z2!gZXd2-BE5_q1BoBBK);9J=$8xTKF0pYDe6aL;Y5APY{3xu0D@s{?w`wL^l3EwL) z=705H0$(#G#^?ODacHQb47P*%zeN4-(NbamxTj|SYk-+C0TNdT{1KHHnYLJ`iJ|!h z<$X5hi=t_JX#j?HhvZ*EB}S(ITW~h0|DUN*_Q(G5em46L0W)I)B)+EnyQsv-wDsU@ zP=5Z4-f60c#P5*xZ)iE$O diff --git a/build/obj/kaleid/libc/itoa.o.1 b/build/obj/kaleid/libc/itoa.o.1 deleted file mode 100644 index e00fc7db6c58e84b042ae80ffc8635561256c397..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5752 zcmbtYU2Ggz6~1@wrdfNFT|1^=$3U9*6^9=ggcl zGdrHVz^y#zJKy=c_uMH;_wXBNPq+RO zyZlJI-TsFOkHp^8=z-CL`}U6>6ct!c$Vw5m+O*BWp2uH3Sd(GYG^c^@a&5 zdv_t{TDwiXD&&3a9I>pQXXkE1FADhuwr;bmXYh$*yDfw`1vPiWUsNurTXJ5+*pRnL ztq!L7F2%GEJ>gj}QFom4rTx%_FALc#AB^@zRCF-fD|c+|`2++!AR>{&KnbA;LYqTU zPWQ<^=+dX4!abuxMGr;37@6)nGVssdtoWtTbCqE_=Smqlr@#;+9fHp{%=k63lXzzDX7;Ig9S_j z=uHZooe{O`xt$T8BrL@O!y%$VqA7+pSbNZM%~4A+PX ziCc1EgSF=!#|*=l9BP5#TMm_B_`8mDtU2daWXQfrbUV4`8SZwdIfnZjYL?+~hgx7* za;RBu#@8Hbjv;qIiMn(a{-W#0kXI{3hT%`hONpko!OE*n=q$q<4mHQnZN)4ZHwkyg zXBfIGnrFx>!;PESV6E;{oMFi8lwzLY8hP2VtnsYDk>PLMbPRb%7zBmK)1(&7m?3`S?gN$B<|3IZ1phz>A^V%1tMP7sOu-O^j?X=A)vClrvKdotho^PXfDfg7DqGRZ`Qb`=DJRNCuF}lw z!%Nw^E=0Le%O-Pp2g#WYuqR7)%`Uq#BvU)38j>oTjH{u>Grviw{&3;_^vEIAl{|gq z_k$|;TW>5MEK|8)~SaMPVX~i@CC&8!Q$d46`CR9rl3Z|~t8(AY?Hj2X2jA2?n3ehy`<)WeIQC=QnLB$s?s(ump)wmG(aB=(XkHj9ELQ=Nk3lT0QZU9e}=8P`=h&s_4QyX)!f9c_{u_X!9<+$8x)^pyCHT|SLBlMqJ6IzTn7&3lQ=OLaCNi>s?HY(@GhIS{4s{d2m#LX zW6}@!_{S;#VITiz(vSK0f0BN}$G=JXoR9xF<$uh_|C{uzkI#^Q$;VF-f5FF-D%O1b zE2Mv$B!+wY_H*K~KfEVM@j96Ap}KE*{Ba-uPWn3@9`g)Rk@tN32gLu)!(*OZl>c8I z9`jV_6L81JkA-YPQ5^3t&$Eko6j*YV;&=G?GV!1D@oy79;o-Lshhl+vuKNJ#kNJ4+ z?-O_7bszsrs!_fR?|r`*V+g;47)C9&GV#AS{CwQ9+P+?Yk*uGqHnK|~8>THwj7+_f zO*Zu9hDheKjjTv6)$1Z@)=)wBR5ArBI_34HW^u7>6l&mV;q1~9{93YBspUF6vu4&P z>X^)pu9OX({UNzX=4#cd4!>=-lU`aZnAxgM>-c{K_5*w5?J4FQ#|I4l?%JB$Z`KC^ z;E^0>g5)xN_|l~B0Eu<@UF#?Q)5QCK@%UVkn!sC$H2naaRM+xfaSA{3I<5`-gkv@81k?{+vLGSLkr_cLg~de&59a z4*f1u-S5-)200x5_*wvmetT%5{5ymk4uAX^;DXj4rx%;!asB*F#yos}Rsj2RqWy8I z|6No(!|#j#KP#wyhU#-2tdCpb@Bd}sFelFwpfzrjW64*LRhHiY@1XcaTr3Q%>m3}& z@~2=#Oxx|aE>nEkVQj$jXZl9~g4SOOSU*x6&wUB1jk&K-{g-H>eZb+Z&>xRCPC9CU e-0>AU|9l5$3$L4XyhjDaU!?iJ#*QTY@&5(f1PY1( diff --git a/build/obj/kaleid/libc/itoa.o.2 b/build/obj/kaleid/libc/itoa.o.2 deleted file mode 100644 index a49d01166b6b0e58bc285f433fb6cb7c8fc76271..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5656 zcmbtYU2Ggz6+U-nldQeTt{u0EO_01;h7#zme-g*}kK-iuBn`xFY(-53_Ih``yXpRf z+1=KO5UpZ@*n%lg5KRHuq7Q9ViH9OV`v6o#N>ib#fP{#UP$~pMC=WnWsR2aHId{&P z9gjCJaHE~`o$vhId(XXh<~mOvJ@JsC6i8EW02-RG05{qictpbyxF7BV>+;GetA59- z-@Z^-_*ZK!YrW2nPg%R)iGA^_s97J}IP^LtwbJid^_#cW$GX9)|IWH%eQ@{4;^^tc z4*_fwR^`WZc`txCJ{t6Of|AwB%q zGZQN-D^~sYfBihl#O}et?c0Y3`?v4hHMC=RcxYGuE-2uHLOM}c*K4E3zQ><@*id28 z47FYhV}lkUSAexk4z2Y1pP7R53Yst=n+AYp{#_AmTP}}4RfJd>< zPv9@Arp()F5@KS=xTH}*(`1V&G(cPU5j1gi+J!fM(12G!wX2UtJ0fOuYqVW$-q5xM z19~A6Ie-*^$q>sNQtDWT>cA>}1T(GQ0cLbhWN+kH$HA_BU0AN9I@sk>4|E;tpj;!J z-x=+q2&}dlcAX8(--0T~lG=)?eAY-KGg&vbvU595WmElPoH6`#(j~W;FOQzg(qIvrk#@W6`&_SoB zU{at=SHUTPdtE2=nhqoxEp9yKAw_>xDR5-1fgp`yHrFE#uGE_>9Zz!#Y^p=K!JT%ZgXdl0zn1$v7vQ$#N|dO}9u%Zvg2OM>P68Zh7uYuV=~)tB@X>m_FJ zAWB1H{kieX65|mJuAnqv6rW1{JGu#<`X+!cF!flfVCOS^h5T$9@}+d4ma+S0Qx*I& z#9Fa9@6weDGYAHes@6*O{;XZHoqQVAl#|Zw zpWn4Jv2#Z}k&P!#qEDro*`F=du(!nAoMYRSYO0jUm$Kk1M;{lUR;uK)B|8&O=TZ*f zXVtMEA0(MRe*p^RQa0{+(8s%yD?8QIl&oKc*Ky5hi+z}FdRrZdwk;S&vGr;+JQg`a;-SbGi9-=~Ybr1mUZ4K4 z(#&W!y@BGs!hg-0$rrJp&BTjRvu3*2r!^)MRv#O2Frh`@Drtfo=v6e1QeTZ$lc<>x zUBeM!Lfbuf@9N~)X@r}7^^v1Zx36Yd?!N~w$5?NHz~-gSa`eDP>*OEBtD1Fre|3NE zQWFIuFH2 zlMjdFS!Tm9OW{v*{sRI29oCNq_`k4zBEbKYb@>)Ze!3-6JL3v(zVEZ13h)oJzpRVo z8D;*-fIqA7bbwE@|F@VY)nB(C`TS)~i26lXeOTEeL-~UtW zFa372ekQ>Gkn?=@9=sjkf6V^*d+`4AC743w3{n`ESZ6w^pYHkf^Ks^h^Yf6bTqssk zvnZ>MD|3PzyO2s&?fEJsGpT9{lCzZxB%LxT@0pS zMJtrkt2|Rqs+6@UStGiTFWKUc$sw687mGH2-CQR-H$CU1iZ;*V{}pjeK(+JNlyZ*H z1Dm{eU9C}X(YGQ9;cr9;mYw|KvsmAZlKPRehJPUH_Az`CAN=CUxp2K2PxAG*2T`G% z|7-jJ#!}8f{P~;oFYjZqN&h10{U}&`NbY9xe83n`b={iPZ-(nP!xN+W(HaHoH-TI* zCsOb-Z*F<75JxTOJKcmMzvsB$AsU>o1>?(T3v%TCHh%==J0vNBzUR=;Z2oV=+z5%M z`O`ZmIR6FYf;lPjKivQKN%6IyFa0-Dv;P0i{mVY3{%J{q{Xc^o<&<$E)a`k8%mq3W zRpj&N-7Maq$zr2^{Y~OTzJx}?yxg8^C&ybJ;{qAK&@UipHvcfcSpD-SO5%lY);Hyz v;r^fFfp#EAx58jN-8gxxA!@Wce5;l_xL9P~qSHO9S$v$w|Ef5$495Q#f#?G9 diff --git a/build/obj/kaleid/libc/itoa.o.3 b/build/obj/kaleid/libc/itoa.o.3 deleted file mode 100644 index d93a2bf4ddab88c0b13b5331483e68da5c9cc13b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4528 zcmbVPU2IfU5T3KQKih8EwiK0$#sz;Ugx$8tU$Di}g0u)&Y8wQN`jAwIU=4J^-tz7FiT}#~TzItM?3)*t z#>$J{K>Kq;(7&+v;k|wH6UXKc_FZ_?y05&@K74!Z!VPip#@>&{mrB3yy#+8@emHua zd6(`|-1R=RXUa{Z<;9z1-)cgy#hbgZrUvO5memES@#8a0gEAz-WQ9bN6rpAkhSWD6 zMiFX|NGPmCqnuJ!hfEU+OR%A#F=uDEKUG$O850I`{!WqV>fJFg-aaf-faM129!he_JSl<`1J0(68o zp{bhgWEbNr5S`-1XjjCDu8Vex)y*AGq1Ou#iR?iL*X2ntqPrunM8>*si4~5mH3~7- zB@k;`k6g{$DqgR44|HSm3Gr&TAGoo5tc!?;)_ykJO%W}PV1#|j5GHFyQ)M7Cf>eRo zwkk8tu4+}zo!CsYJSVXFE5qIWNZWpCPC#hwC&O#8*>-GzD(*}G6=X;K6x=q-HA)vS z#p<&aXndzq4_2W=N}Z}gtiDr$rdXY+K;x`detqCL@0iGWE~U#}3o#T9T413Yn+ zjVk+Om2bHw_d7xYjdO(jm7c`KLh&F7LS z$l0lUDQ)#8&7uX6^BgmgqVvx?_nuWuWGQ9J_0ZMVac}!YAg|FQgt30Wm>w|JC#H?o z`}aosMvb<_VdHc-VLUx&oSZXa1EB^?Jw2TwLO5__DmK#JAKRIDInfu37g7Z$ZRH2^ zrkki^9u61TB~}vr;M#7$Xn(a3re`mKD+cF2ASA#a~bH(It8oOww&4Cao0IzrMzOV zQ;eVX1ISkfrJYhTZ$YqbI50A@JJy4Xyvbi-+6w%XiSrX6W;?{Xw&w6<{DBF7h8%FL zw1@mz{~JT_0=l;p#8@}#-k5ad$V-RaD$-C_Sp`sv0rJw(VPt8p!3Z$?E2w79fR-A} z_m8ZA%L}Gv&VcqB%;%}xK$UrVDpv>Af!CCnJ1SlQg|{B<1>SKuJ*-@4y@Of!JZnXq zb#iT^FC2u^hffE-02!YrCmc`sqT;`W65+rrO%5_Ek2va^d|3JiSCw8UZzgPCV8ooy5#ZyfV&U;_kc@00J{EHgCU*VTD zT$yl1!`qcVUj}3b*Yk&fe{fg-tl`YN5WuO2yUPA8fD_LHW&fq&6RMuY08Ts`75*rI z6VD}u^MlUo)}ru6B}q_Ud^<-qoG&=uU(B;X`SmNw__wN#?JMBC=gB{KO7OEqVZn7i zq4;z>rf~8N`a`04uHczTl%DI$ENiZnHxr&U>p>!IdL|^2#UdmmnzoXq%yiD4ad1xR zW-^Jl2U~e3wan9WO*>;PkIv_8i~TVrBvMYHVBtaUr?9fqGpfph5Q#t7Tp*(yZG5(Um^_$@v8CCm59Kk{FLB#pE z@jEb9=Olj4KcG!&CiJ6kz5cIpqpC3KpY|!k-2X6QIwwN#hXVg5BQSJdIu~_}+!xel z{zaSAOgOnh{5AjICG-(lVCeC0<6PbT)z!-J)IZ%9djB3`IwwMKN9E^xiZB|wuY*{< z{C8A-UT4Zrke>fT#E6sYL{$z;9V#g+z5W;L^iOXu9M9`Qb?CW?yMqpY99dN;^+E40dOZE6`m=`+%qmBIzaWeT X_w8Hwe-)K_@nQ8M^EEpvsmK2h3;2DR diff --git a/build/obj/kaleid/libc/itoa.o.4 b/build/obj/kaleid/libc/itoa.o.4 deleted file mode 100644 index 2b06d0b4ea87204b71cc5dbfeb54765fc04a6477..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4520 zcmbVPU2IfU5T3KQKih8EZ7CwPM%Et`685%5{(@~Ot;lWzT522c2h0B4?k?=!C3o*a z;XzH2gkqXtA~8l2h`#uwZ-yrWk`SXYF+3SHk;KH9@L&lKC??jKbIkxjcmh4<@V^N>k{fTLA(II6N#C+@72;z; zTk;^x1d-!tDZ37u?A=P3Fo~E($gzqbdf8dFC$_Nj3UU!g=#xg+69B!KBqAn_I|BP@ z4{ktHHQm83#wQ>;#JX^2$Ow0bJH*Q7_J`5yDF}rI5dtt)gAv{ldM=dc#3fcZw$>;_ zqEjH&^f+=gZ?1an?CS5r=1sA)%L{y_E73{BLu)=5?xKj6MlgaNWdM`4qNy^F8A2-G zY+H?)W>>T-=MHQpJU1(_`U}HdeMlQQH!C2p=Dp!H*lYwFpo%+8pn~kMmx9|yxmxK0 zCRtrqg~oO&b-V`Ao}h8a6Zklcv6`tuldRfRXpGhBw-1wQa+%;t1Wd5{a+T;6u7GnG z;EIcE)Y#eWf7tggXFte^IJ^Pwi2WDYs?qP)d3o8GK)^B=4yn0Ju*wN2-9(*qJkJ!c z5w(D{anfTOwX88I%1{Wa!;uoJL-i|gbdA; zDyf16{>ov`$jFZ9dR*oW-WsdTuu4gBY8=E&yXbCf4xYzvnea!|-2FC^nwA1X@WQ#h z=*L($>fV&NP4KVYFx1th&lw#2dF-}vdM%;B{FkH!uuVzEUswEt8vc#4 zcWe0X${yA5o60_*;a@8I4GnKsdGTnIgX_7Y?1F}mDgUyD?@{y(D3!j|DwXl z^snbvK7aqN{$9hG_l6Ir9)4E#FFu@jxUX9pKCbFn@ZrS6uTuAXIPp}JKR@WaZmkM$ zRFVYs#kX--!}%85sBq?aOxb-J{<*4S%YAU(^TgvnCHUE*F#kHgs`zv~s&Ml4`-53N zS#*;rl&<5+9BYnMNSdxSYT*S`TMm= z&4fPmt=Io0Zd4UU{nI{WnEM|_Oy@)hZYl6jGJHe#9m6>tBln-wX1=OTY9<`MPy9#J z6pmg`R6q6j*Knq8|LSVxcXrzK>Q<-6!zFaC;ppjIkA797X&LlwW|>_O~D6|dLD^)ui5sMPEK zk2?KF(3j(RU8oK{H*tHv_5rwm>Vw{j^mzJC^=A(uIHnx=cNSqZxNpzG->0b5i{}@a KPuWpPJ^nu=e10GR