From 79ac2b651fd6b2a84a3767777c01062d02b730b7 Mon Sep 17 00:00:00 2001 From: Michael Mikonos <127171689+mknos@users.noreply.github.com> Date: Thu, 3 Aug 2023 14:35:17 +0800 Subject: [PATCH 01/14] Str2I64() octal prefix 0o * Comment at top of function hints that 0o18 is treated as an octal number but it is not * Adding the appropriate switch-case makes it work by adjusting radix * Update comment: this function is more like strtol() because it returns a signed result * This function doesn't behave like strtol() because "0" prefix can't be used for octal, e.g. "0777" (maybe it could be supported in future) --- src/Kernel/StrScan.ZC | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Kernel/StrScan.ZC b/src/Kernel/StrScan.ZC index d785e5a2..b008ec4b 100755 --- a/src/Kernel/StrScan.ZC +++ b/src/Kernel/StrScan.ZC @@ -1,5 +1,5 @@ I64 Str2I64(U8 *st, I64 radix=10, U8 **_end_ptr=NULL) -{//String to I64. Similar to strtoul(). +{//String to I64. Similar to strtol(). //Allows radix change with "0x20" "0b1010" "0d123" "0o18". //Be careful of Str2I64("0b101", 16)-->0xB101. Bool neg = FALSE; @@ -32,6 +32,7 @@ I64 Str2I64(U8 *st, I64 radix=10, U8 **_end_ptr=NULL) switch (ch) { case 'B': radix = 2; st++; break; + case 'O': radix = 8; st++; break; case 'D': radix = 10; st++; break; case 'X': radix = 16; st++; break; } @@ -86,13 +87,13 @@ to avoid this. } if (!StrNCompare(src - 1, "inf", 3)) { - d=ì; + d=ì; src += 3; goto a2f_end; } - if (*src == 'ì') + if (*src == 'ì') { - d = ì; + d = ì; src++; goto a2f_end; } From 0d82978c55ca4494ecb7b6fafe61818061f38865 Mon Sep 17 00:00:00 2001 From: Michael Mikonos Date: Mon, 7 Aug 2023 08:52:53 +0800 Subject: [PATCH 02/14] undo unintended file conversion --- src/Kernel/StrScan.ZC | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Kernel/StrScan.ZC b/src/Kernel/StrScan.ZC index b008ec4b..5dd2a2df 100755 --- a/src/Kernel/StrScan.ZC +++ b/src/Kernel/StrScan.ZC @@ -87,13 +87,13 @@ to avoid this. } if (!StrNCompare(src - 1, "inf", 3)) { - d=ì; + d=ì; src += 3; goto a2f_end; } - if (*src == 'ì') + if (*src == 'ì') { - d = ì; + d = ì; src++; goto a2f_end; } From ed0afb2bb5b253de2af70223d6771b3b11201b64 Mon Sep 17 00:00:00 2001 From: Michael Mikonos Date: Mon, 21 Aug 2023 21:26:08 +0800 Subject: [PATCH 03/14] * By default, print_all_length is 64 and i counts from 0 to 63, covering all bits of flags * Bt(&flags,64) probably doesn't make sense, so it might be safer to set a maximum cap value * I have not tested this --- src/Kernel/StrB.ZC | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Kernel/StrB.ZC b/src/Kernel/StrB.ZC index 89bb0cfb..631c96b4 100755 --- a/src/Kernel/StrB.ZC +++ b/src/Kernel/StrB.ZC @@ -212,7 +212,7 @@ U8 *FlagsStrPrint(U8 *dst, U8 *list, I64 flags, Bool print_all=FALSE, I64 print_ I64 i = 0; *dst = 0; - if (!print_all_length) + if (!print_all_length || print_all_length > 64) print_all_length = 64; while (i < print_all_length) { From c69e0c82464a3d7a3aa46dc8553d4030cbafe66f Mon Sep 17 00:00:00 2001 From: y4my4my4m <8145020+y4my4my4m@users.noreply.github.com> Date: Thu, 24 Aug 2023 22:22:21 +0900 Subject: [PATCH 04/14] ignore hidden files/folders --- .gitignore | 1 + build/sync.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 127eb5d8..c70a27dc 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ *.o *.d /zealbooter/limine.h +*. \ No newline at end of file diff --git a/build/sync.sh b/build/sync.sh index 54227f8c..6a4d7321 100755 --- a/build/sync.sh +++ b/build/sync.sh @@ -95,7 +95,7 @@ else vm) mount_vdisk echo "Copying src to vdisk..." - sudo cp -r ../src/* $TMPMOUNT + sudo rsync -av --exclude='.*' ../src/ $TMPMOUNT/ umount_vdisk echo "Finished." ;; From 88a138498330d391e655eee52f90a296483b2503 Mon Sep 17 00:00:00 2001 From: y4my4my4m <8145020+y4my4my4m@users.noreply.github.com> Date: Thu, 24 Aug 2023 22:26:08 +0900 Subject: [PATCH 05/14] fix --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index c70a27dc..a0b43089 100644 --- a/.gitignore +++ b/.gitignore @@ -16,4 +16,4 @@ *.o *.d /zealbooter/limine.h -*. \ No newline at end of file +src/.* \ No newline at end of file From c5fcbe24cf73766e540a6d5f9694913ec29ab57f Mon Sep 17 00:00:00 2001 From: y4my4my4m <8145020+y4my4my4m@users.noreply.github.com> Date: Fri, 25 Aug 2023 16:17:27 +0900 Subject: [PATCH 06/14] use find and cp instead --- build/sync.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/sync.sh b/build/sync.sh index 6a4d7321..f7d828f5 100755 --- a/build/sync.sh +++ b/build/sync.sh @@ -95,7 +95,8 @@ else vm) mount_vdisk echo "Copying src to vdisk..." - sudo rsync -av --exclude='.*' ../src/ $TMPMOUNT/ + cd ../src/ + sudo find . \( ! -path './.*' -and ! -name '.*' \) -and ! -path '*/.*/*' -type f -exec cp --parents {} $TMPMOUNT/ \; umount_vdisk echo "Finished." ;; From 8b1d036e820e79666407e24f84099a67eb72f5df Mon Sep 17 00:00:00 2001 From: y4my4my4m <8145020+y4my4my4m@users.noreply.github.com> Date: Mon, 28 Aug 2023 14:11:23 +0900 Subject: [PATCH 07/14] added --ignore-dots argument --- build/sync.sh | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/build/sync.sh b/build/sync.sh index f7d828f5..d4f39c9e 100755 --- a/build/sync.sh +++ b/build/sync.sh @@ -94,9 +94,17 @@ else ;; vm) mount_vdisk - echo "Copying src to vdisk..." - cd ../src/ - sudo find . \( ! -path './.*' -and ! -name '.*' \) -and ! -path '*/.*/*' -type f -exec cp --parents {} $TMPMOUNT/ \; + case $2 in + --ignore-dots | --dots) + echo "Copying src to vdisk ignoring dotfiles and dotfolders..." + cd ../src/ + sudo find . \( ! -path './.*' -and ! -name '.*' \) -and ! -path '*/.*/*' -type f -exec cp --parents {} $TMPMOUNT/ \; + ;; + *) + echo "Copying entire src to vdisk..." + sudo cp -r ../src/* $TMPMOUNT + ;; + esac umount_vdisk echo "Finished." ;; From 136df9cbc22621c0eaebd0f3f8d457ab7b81d6a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=83=81=E3=83=A3=E3=83=BC=E3=83=AB=E3=82=BA?= <8145020+y4my4my4m@users.noreply.github.com> Date: Mon, 28 Aug 2023 14:11:59 +0900 Subject: [PATCH 08/14] Update .gitignore --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index a0b43089..127eb5d8 100644 --- a/.gitignore +++ b/.gitignore @@ -16,4 +16,3 @@ *.o *.d /zealbooter/limine.h -src/.* \ No newline at end of file From 0c17393a4c293608385343b2729d633bf499edfd Mon Sep 17 00:00:00 2001 From: mintsuki Date: Fri, 1 Sep 2023 15:00:14 -0500 Subject: [PATCH 09/14] zealbooter: Drop -mabi=sysv cc argument for clang 16 --- zealbooter/GNUmakefile | 1 - 1 file changed, 1 deletion(-) diff --git a/zealbooter/GNUmakefile b/zealbooter/GNUmakefile index 54eca6ed..6752229c 100644 --- a/zealbooter/GNUmakefile +++ b/zealbooter/GNUmakefile @@ -54,7 +54,6 @@ override CFLAGS += \ -fno-PIC \ -m64 \ -march=x86-64 \ - -mabi=sysv \ -mno-80387 \ -mno-mmx \ -mno-sse \ From 4f0cdcd55188f287022377af716880cb7dbd209a Mon Sep 17 00:00:00 2001 From: mintsuki Date: Sun, 3 Sep 2023 18:53:54 -0500 Subject: [PATCH 10/14] zealbooter: Have kernel makefile targets depend on GNUmakefile and linker.ld appropriately --- zealbooter/GNUmakefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/zealbooter/GNUmakefile b/zealbooter/GNUmakefile index 6752229c..2c784260 100644 --- a/zealbooter/GNUmakefile +++ b/zealbooter/GNUmakefile @@ -15,8 +15,8 @@ define DEFAULT_VAR = endif endef -# It is highly recommended to use a custom built cross toolchain to build a kernel. -# We are only using "cc" as a placeholder here. It may work by using +# It is suggested to use a custom built cross toolchain to build a kernel. +# We are using the standard "cc" here, it may work by using # the host system's toolchain, but this is not guaranteed. override DEFAULT_CC := cc $(eval $(call DEFAULT_VAR,CC,$(DEFAULT_CC))) @@ -103,22 +103,22 @@ limine.h: curl -Lo $@ https://github.com/limine-bootloader/limine/raw/trunk/limine.h || cp ../build/limine/limine.h limine.h || echo "ERROR" # Link rules for the final kernel executable. -$(KERNEL): $(OBJ) +$(KERNEL): GNUmakefile linker.ld $(OBJ) $(LD) $(OBJ) $(LDFLAGS) -o $@ # Include header dependencies. -include $(HEADER_DEPS) # Compilation rules for *.c files. -%.c.o: %.c limine.h +%.c.o: %.c GNUmakefile limine.h $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ # Compilation rules for *.S files. -%.S.o: %.S limine.h +%.S.o: %.S GNUmakefile limine.h $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ # Compilation rules for *.asm (nasm) files. -%.asm.o: %.asm +%.asm.o: %.asm GNUmakefile nasm $(NASMFLAGS) $< -o $@ # Remove object files and the final executable. From cca870c0596a7bec26365ae4a7f348db48b8f8a6 Mon Sep 17 00:00:00 2001 From: mintsuki Date: Thu, 28 Sep 2023 02:31:52 -0500 Subject: [PATCH 11/14] zealbooter: Backport build system improvements from limine-barebones --- .gitignore | 4 ++- build/build-iso.sh | 2 +- zealbooter/GNUmakefile | 38 ++++++++++++++------------ zealbooter/{ => src}/lib.c | 0 zealbooter/{ => src}/lib.h | 0 zealbooter/{ => src}/lib/memcmp.c | 0 zealbooter/{ => src}/lib/memcmp.h | 0 zealbooter/{ => src}/lib/memcpy.c | 0 zealbooter/{ => src}/lib/memcpy.h | 0 zealbooter/{ => src}/lib/memmove.c | 0 zealbooter/{ => src}/lib/memmove.h | 0 zealbooter/{ => src}/lib/memset.c | 0 zealbooter/{ => src}/lib/memset.h | 0 zealbooter/{ => src}/lib/print.c | 0 zealbooter/{ => src}/lib/print.h | 0 zealbooter/{ => src}/lib/stb_sprintf.h | 0 zealbooter/{ => src}/lib/strcmp.c | 0 zealbooter/{ => src}/lib/strcmp.h | 0 zealbooter/{ => src}/lib/strcpy.c | 0 zealbooter/{ => src}/lib/strcpy.h | 0 zealbooter/{ => src}/lib/strlen.c | 0 zealbooter/{ => src}/lib/strlen.h | 0 zealbooter/{ => src}/lib/strncmp.c | 0 zealbooter/{ => src}/lib/strncmp.h | 0 zealbooter/{ => src}/lib/strncpy.c | 0 zealbooter/{ => src}/lib/strncpy.h | 0 zealbooter/{ => src}/trampoline.S | 0 zealbooter/{ => src}/zealbooter.c | 0 28 files changed, 25 insertions(+), 19 deletions(-) rename zealbooter/{ => src}/lib.c (100%) rename zealbooter/{ => src}/lib.h (100%) rename zealbooter/{ => src}/lib/memcmp.c (100%) rename zealbooter/{ => src}/lib/memcmp.h (100%) rename zealbooter/{ => src}/lib/memcpy.c (100%) rename zealbooter/{ => src}/lib/memcpy.h (100%) rename zealbooter/{ => src}/lib/memmove.c (100%) rename zealbooter/{ => src}/lib/memmove.h (100%) rename zealbooter/{ => src}/lib/memset.c (100%) rename zealbooter/{ => src}/lib/memset.h (100%) rename zealbooter/{ => src}/lib/print.c (100%) rename zealbooter/{ => src}/lib/print.h (100%) rename zealbooter/{ => src}/lib/stb_sprintf.h (100%) rename zealbooter/{ => src}/lib/strcmp.c (100%) rename zealbooter/{ => src}/lib/strcmp.h (100%) rename zealbooter/{ => src}/lib/strcpy.c (100%) rename zealbooter/{ => src}/lib/strcpy.h (100%) rename zealbooter/{ => src}/lib/strlen.c (100%) rename zealbooter/{ => src}/lib/strlen.h (100%) rename zealbooter/{ => src}/lib/strncmp.c (100%) rename zealbooter/{ => src}/lib/strncmp.h (100%) rename zealbooter/{ => src}/lib/strncpy.c (100%) rename zealbooter/{ => src}/lib/strncpy.h (100%) rename zealbooter/{ => src}/trampoline.S (100%) rename zealbooter/{ => src}/zealbooter.c (100%) diff --git a/.gitignore b/.gitignore index 127eb5d8..b44a7db6 100644 --- a/.gitignore +++ b/.gitignore @@ -15,4 +15,6 @@ *.hdd *.o *.d -/zealbooter/limine.h +/zealbooter/src/limine.h +/zealbooter/bin +/zealbooter/obj diff --git a/build/build-iso.sh b/build/build-iso.sh index 2c62dc60..2868c9db 100755 --- a/build/build-iso.sh +++ b/build/build-iso.sh @@ -105,7 +105,7 @@ sudo cp limine/BOOTX64.EFI $TMPISODIR/EFI/BOOT/BOOTX64.EFI sudo cp limine/limine-uefi-cd.bin $TMPISODIR/Boot/Limine-UEFI-CD.BIN sudo cp limine/limine-bios-cd.bin $TMPISODIR/Boot/Limine-BIOS-CD.BIN sudo cp limine/limine-bios.sys $TMPISODIR/Boot/Limine-BIOS.SYS -sudo cp ../zealbooter/zealbooter.elf $TMPISODIR/Boot/ZealBooter.ELF +sudo cp ../zealbooter/bin/kernel $TMPISODIR/Boot/ZealBooter.ELF sudo cp ../zealbooter/Limine.CFG $TMPISODIR/Boot/Limine.CFG echo "Copying DVDKernel.ZXE over ISO Boot/Kernel.ZXE ..." sudo mv $TMPMOUNT/Tmp/DVDKernel.ZXE $TMPISODIR/Boot/Kernel.ZXE diff --git a/zealbooter/GNUmakefile b/zealbooter/GNUmakefile index 2c784260..33ca7959 100644 --- a/zealbooter/GNUmakefile +++ b/zealbooter/GNUmakefile @@ -3,7 +3,7 @@ override MAKEFLAGS += -rR # This is the name that our final kernel executable will have. # Change as needed. -override KERNEL := zealbooter.elf +override KERNEL := kernel # Convenience macro to reliably declare user overridable variables. define DEFAULT_VAR = @@ -63,8 +63,8 @@ override CFLAGS += \ # Internal C preprocessor flags that should not be changed by the user. override CPPFLAGS := \ - -I. \ - -I./lib \ + -I src \ + -I src/lib \ $(CPPFLAGS) \ -MMD \ -MP @@ -89,43 +89,47 @@ override NASMFLAGS += \ # Use "find" to glob all *.c, *.S, and *.asm files in the tree and obtain the # object and header dependency file names. -override CFILES := $(shell find -L . -type f -name '*.c') -override ASFILES := $(shell find -L . -type f -name '*.S') -override NASMFILES := $(shell find -L . -type f -name '*.asm') -override OBJ := $(CFILES:.c=.c.o) $(ASFILES:.S=.S.o) $(NASMFILES:.asm=.asm.o) -override HEADER_DEPS := $(CFILES:.c=.c.d) $(ASFILES:.S=.S.d) +override CFILES := $(shell cd src && find -L . -type f -name '*.c') +override ASFILES := $(shell cd src && find -L . -type f -name '*.S') +override NASMFILES := $(shell cd src && find -L . -type f -name '*.asm') +override OBJ := $(addprefix obj/,$(CFILES:.c=.c.o) $(ASFILES:.S=.S.o) $(NASMFILES:.asm=.asm.o)) +override HEADER_DEPS := $(addprefix obj/,$(CFILES:.c=.c.d) $(ASFILES:.S=.S.d)) # Default target. .PHONY: all -all: $(KERNEL) +all: bin/$(KERNEL) -limine.h: - curl -Lo $@ https://github.com/limine-bootloader/limine/raw/trunk/limine.h || cp ../build/limine/limine.h limine.h || echo "ERROR" +src/limine.h: + curl -Lo $@ https://github.com/limine-bootloader/limine/raw/trunk/limine.h || cp ../build/limine/limine.h src/limine.h || echo "ERROR" # Link rules for the final kernel executable. -$(KERNEL): GNUmakefile linker.ld $(OBJ) +bin/$(KERNEL): GNUmakefile linker.ld $(OBJ) + mkdir -p "$$(dirname $@)" $(LD) $(OBJ) $(LDFLAGS) -o $@ # Include header dependencies. -include $(HEADER_DEPS) # Compilation rules for *.c files. -%.c.o: %.c GNUmakefile limine.h +obj/%.c.o: src/%.c GNUmakefile src/limine.h + mkdir -p "$$(dirname $@)" $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ # Compilation rules for *.S files. -%.S.o: %.S GNUmakefile limine.h +obj/%.S.o: src/%.S GNUmakefile src/limine.h + mkdir -p "$$(dirname $@)" $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ # Compilation rules for *.asm (nasm) files. -%.asm.o: %.asm GNUmakefile +obj/%.asm.o: src/%.asm GNUmakefile + mkdir -p "$$(dirname $@)" nasm $(NASMFLAGS) $< -o $@ # Remove object files and the final executable. .PHONY: clean clean: - rm -rf $(KERNEL) $(OBJ) $(HEADER_DEPS) + rm -rf bin obj .PHONY: distclean distclean: clean - rm -f limine.h + rm -f src/limine.h diff --git a/zealbooter/lib.c b/zealbooter/src/lib.c similarity index 100% rename from zealbooter/lib.c rename to zealbooter/src/lib.c diff --git a/zealbooter/lib.h b/zealbooter/src/lib.h similarity index 100% rename from zealbooter/lib.h rename to zealbooter/src/lib.h diff --git a/zealbooter/lib/memcmp.c b/zealbooter/src/lib/memcmp.c similarity index 100% rename from zealbooter/lib/memcmp.c rename to zealbooter/src/lib/memcmp.c diff --git a/zealbooter/lib/memcmp.h b/zealbooter/src/lib/memcmp.h similarity index 100% rename from zealbooter/lib/memcmp.h rename to zealbooter/src/lib/memcmp.h diff --git a/zealbooter/lib/memcpy.c b/zealbooter/src/lib/memcpy.c similarity index 100% rename from zealbooter/lib/memcpy.c rename to zealbooter/src/lib/memcpy.c diff --git a/zealbooter/lib/memcpy.h b/zealbooter/src/lib/memcpy.h similarity index 100% rename from zealbooter/lib/memcpy.h rename to zealbooter/src/lib/memcpy.h diff --git a/zealbooter/lib/memmove.c b/zealbooter/src/lib/memmove.c similarity index 100% rename from zealbooter/lib/memmove.c rename to zealbooter/src/lib/memmove.c diff --git a/zealbooter/lib/memmove.h b/zealbooter/src/lib/memmove.h similarity index 100% rename from zealbooter/lib/memmove.h rename to zealbooter/src/lib/memmove.h diff --git a/zealbooter/lib/memset.c b/zealbooter/src/lib/memset.c similarity index 100% rename from zealbooter/lib/memset.c rename to zealbooter/src/lib/memset.c diff --git a/zealbooter/lib/memset.h b/zealbooter/src/lib/memset.h similarity index 100% rename from zealbooter/lib/memset.h rename to zealbooter/src/lib/memset.h diff --git a/zealbooter/lib/print.c b/zealbooter/src/lib/print.c similarity index 100% rename from zealbooter/lib/print.c rename to zealbooter/src/lib/print.c diff --git a/zealbooter/lib/print.h b/zealbooter/src/lib/print.h similarity index 100% rename from zealbooter/lib/print.h rename to zealbooter/src/lib/print.h diff --git a/zealbooter/lib/stb_sprintf.h b/zealbooter/src/lib/stb_sprintf.h similarity index 100% rename from zealbooter/lib/stb_sprintf.h rename to zealbooter/src/lib/stb_sprintf.h diff --git a/zealbooter/lib/strcmp.c b/zealbooter/src/lib/strcmp.c similarity index 100% rename from zealbooter/lib/strcmp.c rename to zealbooter/src/lib/strcmp.c diff --git a/zealbooter/lib/strcmp.h b/zealbooter/src/lib/strcmp.h similarity index 100% rename from zealbooter/lib/strcmp.h rename to zealbooter/src/lib/strcmp.h diff --git a/zealbooter/lib/strcpy.c b/zealbooter/src/lib/strcpy.c similarity index 100% rename from zealbooter/lib/strcpy.c rename to zealbooter/src/lib/strcpy.c diff --git a/zealbooter/lib/strcpy.h b/zealbooter/src/lib/strcpy.h similarity index 100% rename from zealbooter/lib/strcpy.h rename to zealbooter/src/lib/strcpy.h diff --git a/zealbooter/lib/strlen.c b/zealbooter/src/lib/strlen.c similarity index 100% rename from zealbooter/lib/strlen.c rename to zealbooter/src/lib/strlen.c diff --git a/zealbooter/lib/strlen.h b/zealbooter/src/lib/strlen.h similarity index 100% rename from zealbooter/lib/strlen.h rename to zealbooter/src/lib/strlen.h diff --git a/zealbooter/lib/strncmp.c b/zealbooter/src/lib/strncmp.c similarity index 100% rename from zealbooter/lib/strncmp.c rename to zealbooter/src/lib/strncmp.c diff --git a/zealbooter/lib/strncmp.h b/zealbooter/src/lib/strncmp.h similarity index 100% rename from zealbooter/lib/strncmp.h rename to zealbooter/src/lib/strncmp.h diff --git a/zealbooter/lib/strncpy.c b/zealbooter/src/lib/strncpy.c similarity index 100% rename from zealbooter/lib/strncpy.c rename to zealbooter/src/lib/strncpy.c diff --git a/zealbooter/lib/strncpy.h b/zealbooter/src/lib/strncpy.h similarity index 100% rename from zealbooter/lib/strncpy.h rename to zealbooter/src/lib/strncpy.h diff --git a/zealbooter/trampoline.S b/zealbooter/src/trampoline.S similarity index 100% rename from zealbooter/trampoline.S rename to zealbooter/src/trampoline.S diff --git a/zealbooter/zealbooter.c b/zealbooter/src/zealbooter.c similarity index 100% rename from zealbooter/zealbooter.c rename to zealbooter/src/zealbooter.c From 26e0304999a750f127f949f217827bd38f1809f3 Mon Sep 17 00:00:00 2001 From: Sharoy Veduchi <61427449+doodayev@users.noreply.github.com> Date: Mon, 2 Oct 2023 21:49:24 -0700 Subject: [PATCH 12/14] Remove "MagicISO" trademark. Maybe in the past the word "MagicISO" was used for something but I don't see it here. Therefore I suggest removing it. --- src/Doc/GuideLines.DD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Doc/GuideLines.DD b/src/Doc/GuideLines.DD index 1aafbff1..b0ae90c4 100755 --- a/src/Doc/GuideLines.DD +++ b/src/Doc/GuideLines.DD @@ -130,4 +130,4 @@ $FG$ * RAX holds function return values, of course. $FG,8$ -* "MagicISO" is a trademark owned by MagicISO Corp. + From 577d8979c37c16774b2aaf9ce0b1ee1666f9ae6b Mon Sep 17 00:00:00 2001 From: Arsenic Blood <127725014+GutPuncher@users.noreply.github.com> Date: Tue, 3 Oct 2023 02:29:16 -0400 Subject: [PATCH 13/14] Update GuideLines.DD --- src/Doc/GuideLines.DD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Doc/GuideLines.DD b/src/Doc/GuideLines.DD index b0ae90c4..e73e8843 100755 --- a/src/Doc/GuideLines.DD +++ b/src/Doc/GuideLines.DD @@ -129,5 +129,5 @@ $FG$ * No args are passed in registers. * RAX holds function return values, of course. -$FG,8$ + From e35fe7962ccc367379fb31e76c20c0838eb1548c Mon Sep 17 00:00:00 2001 From: Arsenic Blood <127725014+GutPuncher@users.noreply.github.com> Date: Wed, 4 Oct 2023 01:23:43 -0400 Subject: [PATCH 14/14] Update sync.sh --- build/sync.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build/sync.sh b/build/sync.sh index d4f39c9e..152cb605 100755 --- a/build/sync.sh +++ b/build/sync.sh @@ -44,11 +44,11 @@ DOCS_DIR= TMPMOUNT=/tmp/zealtmp print_usage() { - echo "Usage: $0 [ repo | vm ]" - echo - echo " repo - overwrites src/ with virtual disk contents." - echo " vm - overwrites virtual disk with src/ contents." - echo + echo "Usage: $0 ( repo | vm ) [OPTION]" + echo " repo Overwrites src/ with virtual disk contents." + echo " vm Overwrites virtual disk with src/ contents." + echo "Options:" + echo " --ignore-dots Ignore dotfiles/dotfolders during synchronize." } mount_vdisk() {