Working on a port to x86_64, switching from GRUB to Limine

Author: maxdev1

.gitignore

@@ -39,6 +39,12 @@ documentation/out/*
 target/iso/boot/kernel
 target/iso/boot/loader
 target/iso/boot/ramdisk
+target/iso/boot/limine/limine-*.sys
+target/iso/boot/limine/limine-*.bin
+target/limine-*/*
+target/limine-*.tar.gz
+
+node_modules
 
 sysroot/system/include
 sysroot/system/lib/*

applications/gsh/src/gosh.cpp

@@ -28,6 +28,8 @@
 #include <string.h>
 #include <string>
 
+#include <ghost/tasks/types.h>
+
 char* cwdbuf = 0;
 
 std::vector<std::string> gshAutocomplete(std::string toComplete)
@@ -306,6 +308,12 @@ bool gshHandleBuiltin(program_call_t* call)
 		return true;
 	}
 
+	if(call->program == "bg")
+	{
+		g_spawn(call->arguments.at(0).c_str(), "", "", G_SECURITY_LEVEL_APPLICATION);
+		return true;
+	}
+
 	if(call->program == "clear" || call->program == "cls")
 	{
 		g_terminal::clear();

build.sh

@@ -25,6 +25,9 @@ APPS_ALL=0
 
 EVERYTHING=1
 
+# Targets
+requireTool mtools
+
 # Define some helpers
 pushd() {
 	command pushd "$@" >/dev/null
@@ -85,7 +88,27 @@ backspace_len() {
 	printf "%0.s\b" $(seq 1 $@)
 }
 
-# Targets
+# Build limine if required
+verify_limine() {
+  pushd target
+	print_name "bootloader-limine"
+	printf "\n"
+
+  # TODO: Maybe move this all to toolchain setup
+  if [ ! -d "limine-$LIMINE_VERSION" ]; then
+    curl "$LIMINE_SOURCE" -k -o "limine-$LIMINE_VERSION.tar.gz"
+    tar -xf "limine-$LIMINE_VERSION.tar.gz"
+    pushd "limine-$LIMINE_VERSION"
+    ./configure --enable-bios-cd --enable-uefi-cd
+    make
+    popd
+  fi
+
+  cp "limine-$LIMINE_VERSION/limine.h" "$SYSROOT/system/include/limine.h"
+
+  popd
+}
+
 build_ports() {
 	pushd patches/ports
 
@@ -281,6 +304,9 @@ if [ ! -f "$SYSROOT/system/lib/libgcc_s.so.1" ]; then
   FIRST_RUN=1
 fi
 
+# Always check limine
+verify_limine
+
 # Parse arguments
 NEXT_ARGS_APPS=0
 for var in "$@"; do

docker-build-toolchain-image.sh

@@ -8,12 +8,12 @@ echo "Building toolchain within Docker container..."
 docker run --name ghost-toolchain-setup -v "$(pwd):/ghost/source" ubuntu:latest /ghost/source/docker-prepare.sh >>ghost-build.log 2>&1
 
 echo "Committing image..."
-docker commit --change='WORKDIR /ghost/source' --change='CMD ["/bin/bash"]' ghost-toolchain-setup ghost-toolchain
+docker commit --change='WORKDIR /ghost/source' --change='CMD ["/bin/bash"]' ghost-toolchain-setup ghost-toolchain-64
 
 echo "Removing temporary container..."
 docker rm ghost-toolchain-setup
 
 echo "Starting toolchain container now!"
 echo "To build the operating system, run within container:   ./build.sh"
-echo "After exiting, you can join it again with:             docker exec -it ghost-toolchain bash"
-docker run -it --name ghost-toolchain -v "$(pwd):/ghost/source" ghost-toolchain
+echo "After exiting, you can join it again with:             docker exec -it ghost-toolchain-64 bash"
+docker run -it --name ghost-toolchain-64 -v "$(pwd):/ghost/source" ghost-toolchain-64

docker-prepare.sh

@@ -17,6 +17,7 @@ apt-get install -y \
     autoconf2.69 pkg-config xorriso grub-pc-bin \
     make texinfo flex bison gcc g++ nasm \
     asciidoc asciidoctor \
+    mtools \
     patch curl
 
 # Clean up

ghost.sh

@@ -145,13 +145,16 @@ popd () {
 
 
 # Global variables
-with TARGET				"i686-ghost"
+with TARGET				"x86_64-ghost"
 with CROSS_CC			$TARGET"-gcc"
 with CROSS_CXX		$TARGET"-g++"
 with CROSS_LD			$TARGET"-ld"
 with CROSS_GAS		$TARGET"-as"
 with CROSS_AR			$TARGET"-ar"
 
+# Limine
+with LIMINE_VERSION "9.2.0"
+with LIMINE_SOURCE "https://ghostkernel.org/repository/limine/limine-$LIMINE_VERSION.tar.gz"
 
 # Target architecture
 __TARGET_ARCH_PART=${TARGET%-*}

kernel/build.sh

@@ -15,30 +15,26 @@ with TARGET "all"
 INC=inc
 BIN=bin
 SRC=src
-SRC_LOADER=$SRC/loader
 SRC_KERNEL=$SRC/kernel
 SRC_SHARED=$SRC/shared
 
 #
 # Compiler flags
 #
 LDFLAGS="-nostdlib -nostartfiles"
-CFLAGS="-std=c++11 -D_GHOST_KERNEL_=1 -Wall -Wno-unused-but-set-variable -ffreestanding -fno-exceptions -fno-rtti"
+CFLAGS="-mcmodel=large -std=c++11 -D_GHOST_KERNEL_=1 -Wall -Wno-unused-but-set-variable -ffreestanding -fno-exceptions -fno-rtti"
 
 #
 # Object output folders
 #
 OBJ_SHARED=$BIN/obj-shared
-OBJ_LOADER=$BIN/obj-loader
 OBJ_KERNEL=$BIN/obj-kernel
 
 
 #
 # Generated artifacts & linker scripts
 #
-ARTIFACT_LOADER=loader
 ARTIFACT_KERNEL=kernel
-LINKSCRIPT_LOADER=extra/link-loader.ld
 LINKSCRIPT_KERNEL=extra/link-kernel.ld
 
 
@@ -59,11 +55,9 @@ target_headline $TARGET
 target_clean() {
 
 	headline "cleaning"
-	remove $ARTIFACT_LOADER
 	remove $ARTIFACT_KERNEL
 	cleanDirectory $BIN
 	cleanDirectory $OBJ_SHARED
-	cleanDirectory $OBJ_LOADER
 	cleanDirectory $OBJ_KERNEL
 	changes --clear
 }
@@ -122,7 +116,7 @@ target_compile() {
 		if ( [ $headers_have_changed -eq 1 ] || [ $changed -eq 1 ] ); then
 			out=`sourceToObject $file`
 			list $out
-			$NASM -f elf -s $file -o "$objdir/$out"
+			$NASM -f elf64 -s $file -o "$objdir/$out"
 			failOnError
 			changes -s $file
 		fi
@@ -138,7 +132,8 @@ target_link() {
 	script=$2
 	objects=$3
 	headline "linking $artifact"
-	
+
+	echo $CROSS_LD $LD_FLAGS -o $artifact -T $script $objects
 	$CROSS_LD $LD_FLAGS -o $artifact -T $script $objects
 	failOnError
 }
@@ -149,9 +144,7 @@ target_link() {
 target_all() {
 	target_compile_ap_startup
 	target_compile $SRC_SHARED $OBJ_SHARED "-I$INC -I$SRC"
-	target_compile $SRC_LOADER $OBJ_LOADER "-I$INC -I$SRC"
 	target_compile $SRC_KERNEL $OBJ_KERNEL "-I$INC -I$SRC"
-	target_link $ARTIFACT_LOADER $LINKSCRIPT_LOADER "$OBJ_LOADER/* $OBJ_SHARED/*"
 	target_link $ARTIFACT_KERNEL $LINKSCRIPT_KERNEL "$OBJ_KERNEL/* $OBJ_SHARED/*"
 }
 

kernel/extra/link-kernel.ld

@@ -1,47 +1,50 @@
-ENTRY (kernelMain)
+OUTPUT_FORMAT(elf64-x86-64)
+
+ENTRY(kernelMain)
+
+PHDRS
+{
+    limine_requests PT_LOAD;
+    text PT_LOAD;
+    rodata PT_LOAD;
+    data PT_LOAD;
+}
 
 SECTIONS
 {
-	/* Start at this address*/
-	. = 0xC0000000;
-	
-	/* Text section */
-	textSectionStart = .;
-	.text BLOCK(4K) : ALIGN(4K)
-	{
-		*(.text)
-	}
-	textSectionEnd = .;
-	
-	/* Read-only section */
-	rodataSectionStart = .;
-	.rodata BLOCK(4K) : ALIGN(4K)
-	{
-        startConstructors = .;
-        *(SORT(.ctors*))
-        endConstructors = .;
-        
-		*(.rodata)
-	}
-	rodataSectionEnd = .;
-	
-	/* Data section */
-	dataSectionStart = .;
-	.data BLOCK(4K) : ALIGN(4K)
-	{
-		*(.data)
-	}
-	dataSectionEnd = .;
-	
-	/* BSS section */
-	bssSectionStart = .;
-	.bss BLOCK(4K) : ALIGN(4K)
-	{
-		*(COMMON)
-		*(.bss)
-	}
-	bssSectionEnd = .;
-	   
-	/* Align the end of the kernel to 0x1000 */
-	endKernel = ALIGN(4K);
+    . = 0xffffffff80000000;
+
+    .limine_requests : {
+        KEEP(*(.limine_requests_start))
+        KEEP(*(.limine_requests))
+        KEEP(*(.limine_requests_end))
+    } :limine_requests
+
+    . = ALIGN(CONSTANT(MAXPAGESIZE));
+
+    .text : {
+        *(.text .text.*)
+    } :text
+
+    . = ALIGN(CONSTANT(MAXPAGESIZE));
+
+    .rodata : {
+        *(.rodata .rodata.*)
+    } :rodata
+
+    . = ALIGN(CONSTANT(MAXPAGESIZE));
+
+    .data : {
+        *(.data .data.*)
+    } :data
+
+    .bss : {
+        *(.bss .bss.*)
+        *(COMMON)
+    } :data
+
+    /DISCARD/ : {
+        *(.eh_frame*)
+        *(.note .note.*)
+    }
 }

kernel/extra/link-loader.ld

@@ -32,8 +32,8 @@
 #endif
 
 // pretty boot
-#define G_PRETTY_BOOT true
-#define G_VIDEO_LOG_BOOT false
+#define G_PRETTY_BOOT false
+#define G_VIDEO_LOG_BOOT true
 
 // logging settings
 #define G_LOG_LEVEL G_LOG_LEVEL_INFO