From: Minep <zelong56@gmail.com>
Date: Tue, 17 Jan 2023 10:30:13 +0000 (+0000)
Subject: Merge branch 'master' into prog-loader
X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/commitdiff_plain/0eabc11fcf240415e39f3873dfce7cd9384b3042?hp=313093773e81eb89ad3c44b048a79bbcd6e94099

Merge branch 'master' into prog-loader
---

diff --git a/README.md b/README.md
index 7740e1b..a9d1b66 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 </p>
 
 <p align="center">
-  <span>简体中文</span> | <a href="docs/README_en.md">English</a>
+  <a href="#lunaixos-project">简体中文</a> | <a href="docs/README_en.md">English</a>
 </p>
 
 # LunaixOS Project
diff --git a/docs/README_en.md b/docs/README_en.md
index 1de21a6..a7dd415 100644
--- a/docs/README_en.md
+++ b/docs/README_en.md
@@ -3,7 +3,7 @@
 </p>
 
 <p align="center">
-  <a href="../README.md"><b>简体中文</b></a> | <span><b>English</b></span>
+  <a href="../README.md"><b>简体中文</b></a> | <a href="#the-lunaixos-project"><b>English</b></a>
 </p>
 
 # The LunaixOS Project
diff --git a/lunaix-os/kernel/process/sched.c b/lunaix-os/kernel/process/sched.c
index ade13b3..edde8bc 100644
--- a/lunaix-os/kernel/process/sched.c
+++ b/lunaix-os/kernel/process/sched.c
@@ -215,7 +215,10 @@ __DEFINE_LXSYSCALL1(unsigned int, sleep, unsigned int, seconds)
 
     struct proc_info* root_proc = sched_ctx._procs[0];
     __current->sleep.wakeup_time = clock_systime() + seconds * 1000;
-    llist_append(&root_proc->sleep.sleepers, &__current->sleep.sleepers);
+
+    if (llist_empty(&__current->sleep.sleepers)) {
+        llist_append(&root_proc->sleep.sleepers, &__current->sleep.sleepers);
+    }
 
     __current->intr_ctx.registers.eax = seconds;
 
diff --git a/slides/c0-workspace/all-build.sh b/slides/c0-workspace/all-build.sh
new file mode 100755
index 0000000..30c0e3e
--- /dev/null
+++ b/slides/c0-workspace/all-build.sh
@@ -0,0 +1,292 @@
+#! /bin/bash
+
+# shell folder is the floder of all-build.sh, i.e. shell-folder equals <path-to-lunaix-os>/slides/c0-workspace
+shell_folder=$(cd "$(dirname "$0")" || exit; pwd)
+
+# global variables
+export PREFIX="$HOME/cross-compiler"            # this prefix keeps the same with gcc-build and bochs-build
+# export PREFIX="$shell_folder"/../../tools     # this prefix points to <paht-to-lunaix-os>/tools, e.g., ~/projects/lunaix-os/tools
+export TARGET=i686-elf
+export PATH="$PREFIX/bin:$PATH"
+export BXSHARE="$PREFIX/share/bochs"
+
+# compile flags
+export CC=gcc
+export CXX="g++"
+export CFLAGS="-Wall -O2 -fomit-frame-pointer -pipe"
+export CXXFLAGS="$CFLAGS"
+
+
+# Configure Options
+# modify them if you need more/less options. Don't forget <white-space> before ending \
+
+# bochs configure options
+read -r -d '' bochs_no_gdb_configure <<- EOM
+--enable-x86-64 \
+--enable-debugger \
+--enable-debugger-gui \
+--enable-x86-debugger \
+--enable-iodebug \
+--with-x --with-x11
+EOM
+
+# qemu configure options
+read -r -d '' qemu_configure <<- EOM
+EOM
+
+# gcc configrue options
+read -r -d '' gcc_configure <<- EOM
+--disable-nls \
+--enable-language=c,c++ \
+--without-headers 
+EOM
+
+# binutils configure options
+read -r -d '' binutils_configure <<- EOM
+--with-sysroot \
+--disable-nls \
+--disable-werror 
+EOM
+
+
+
+# terminal colors
+purple='\e[35m'
+green='\e[32m'
+red='\e[31m'
+return='\e[0m'
+
+function red(){
+    echo -e "$red$1$return"
+}
+
+function green(){
+    echo -e "$green$1$return"
+}
+
+function purple () {
+    echo -e "$purple$1$return"
+}
+
+
+
+if [[ $1 = '-h' ]] || [[ $1 = '--help' ]]; then
+    echo "Init tools for downloading, compiling, and installing corss-compile and debug tool-chain for Lunxia-OS"
+    echo 'Options:'
+    echo '    -h, --help                Show this help message'
+    echo '    -d, --download            Download toolchain'
+    echo '    -c, --compile             Compile toolchain, without qemu'
+    echo '    -fc, --fully-compile      Compile toolchain, with qemu'
+fi
+
+if [[ $1 = "-d" ]] || [[ $1 = "--download" ]] || [[ ! -d "$shell_folder"/tools ]]; then
+    if [[ ! -d "$shell_folder"/tools/src ]]; then
+        read -p 'tools/src not exists, create? <y/n>: ' download
+        if [[ $download = "y" ]]; then
+            mkdir -p "$shell_folder"/tools/src
+        fi
+    fi
+    if [[ $1 = "-d" ]] || [[ $1 = "--download" ]]; then
+        echo 'Downloading debug tools...'
+        purple "=> bochs-2.7"
+        if  [ -f "$shell_folder"/tools/src/bochs-2.7.tar.gz ]; then
+            green 'bochs already exists, nothing changed, run `rm -rf tools/src/bochs-2.7.tar.gz` to force re-download'
+        else
+            if wget -t 5 -T 5 -c --quiet --show-progress -O "$shell_folder"/tools/src/bochs-2.7.tar.gz  https://sourceforge.net/projects/bochs/files/bochs/2.7/bochs-2.7.tar.gz ; then
+                green "bochs download success"
+            else
+                red 'bochs download fail, removing temp files... exiting...'
+                rm -f "$shell_folder"/tools/src/bochs-2.7.tar.gz
+                exit 255
+            fi
+        fi
+        purple "=> qemu-7.2.0"
+        if  wget -T 5 -c --quiet --show-progress -P "$shell_folder"/tools/src https://download.qemu.org/qemu-7.2.0-rc4.tar.xz; then
+            green "qemu download success"
+        else
+            red 'qemu download fail, exiting... Re-run `bash init.sh -d` to continue qemu download'
+            exit 255
+        fi
+        echo 'Downloading cross-compiler...'
+        purple "=> gcc-10.4"
+        if  wget -T 5 -c --quiet --show-progress -P "$shell_folder"/tools/src https://ftp.gnu.org/gnu/gcc/gcc-10.4.0/gcc-10.4.0.tar.gz; then
+            green "gcc download success"
+        else
+            red 'gcc download fail, exiting... Re-run `bash init.sh -d` to continue gcc download'
+            exit 255
+        fi
+        purple "=> binutils-2.38"
+        if  wget -c -T 5 --quiet --show-progress -P "$shell_folder"/tools/src https://ftp.gnu.org/gnu/binutils/binutils-2.38.tar.gz;then
+            green "binutils download success"
+        else
+            red 'binutils downlaod fail, exiting... Re-run `bash init.sh -d` to continue binutils download'
+            exit 255
+        fi
+    fi
+fi
+
+if [[ $1 = "-c" ]] || [[ $1 = "--compile" ]] || [[ $1 = "-fc" ]] || [[ $1 = '--fully-compile' ]]; then
+    log="$shell_folder"/tools/log
+    mkdir -p "$log"
+
+    # print info
+    echo -e "Target platform $green$TARGET${return}"
+    echo -e "Cross-compile tools will be installed: ${green}$PREFIX$return"
+    echo -e "Compile logs will be written to: ${green}$log$return"
+    echo -e "Modify first few lines of init.sh to change compile options"
+    if [[ $1 = '-fc' ]]; then
+        echo -e "Please make sure at least ${green}18GB free space$return left, since ${green}qemu$return may take ${green}10GB$return and ${green}gcc$return will take another ${green}4.5GB$return"
+        echo -e "Compile may take ${green}20 minutes${return}, start in 3 seconds..."
+    else
+        echo -e "Please make sure at least ${green}6GB free space$return left, since ${green}gcc$return will take ${green}4.5GB$return"
+        echo -e "Compile may take ${green}5 minutes${return}, start in 3 seconds..."
+    fi
+    sleep 3s
+
+    # basics
+    purple "=> Installing basic utils:"
+    if ! (sudo apt update && sudo apt install -y build-essential bison flex libgmp3-dev libmpc-dev libmpfr-dev libsdl1.2-dev texinfo | tee "$log"/basic-utils.log); then
+        red "install basic utils failed, exiting"
+        exit 255
+    fi
+
+    # bochs
+    purple "=> Compile bochs-2.7:"
+    cd "$shell_folder"/tools/src || (red "cd to tools/src fail, nothong changed, exiting..."; exit 255)
+    green "Compile options: $bochs_no_gdb_configure"
+    echo "Extracting..."
+    sleep 3s
+    if ! (tar xzf "$shell_folder"/tools/src/bochs-2.7.tar.gz); then
+        red "extract bochs-2.7.tar.gz fail, exiting"
+        exit 255
+    fi
+    if ! (mkdir -p build-bochs); then
+        red "creating build-bochs fail, exiting..."
+        exit 255
+    fi
+    # bochs-2.7 no-gdb
+    cd "$shell_folder"/tools/src/build-bochs || (red 'cd to build-bochs fail' ;exit)
+    if ! (../bochs-2.7/configure --prefix="$PREFIX" $bochs_no_gdb_configure 2>&1 | tee "$log"/bochs-debugger-configure.log); then
+        red 'bochs-2.7 no-gdb configure fail, exiting...'
+        exit 255
+    fi
+    if ! (make -j "$(nproc)" 2>&1 | tee "$log"/bochs-debugger-make.log); then
+        red "bochs-2.7 no-gdb make fail, exiting..."
+        exit 255
+    fi
+    cp bochs bochsdbg
+    if ! (make install -j "$(nproc)" 2>&1 | tee "$log"/bochs-debugger-make-install.log); then
+        red "bochs-2.7 no-gdb make install fail, exiting..."
+        exit 255
+    fi
+    green "bochs, bochs-gdb, bochsdbg and bximage successfully compiled and installed. PS: ignore bochsdbg not found, it doesn't matter"
+
+    # qemu
+    if [[ $1 = "-fc" ]] || [[ $1 = "--fully-compile" ]]; then
+        purple "=> Compile qemu-7.2.0"
+        cd "$shell_folder"/tools/src || (red "cd to tools/src fail, nothong changed, exiting..." && exit 255)
+        green "Compile options: $qemu_configure"
+        echo "Extracting..."
+        sleep 2s
+        if ! (tar xJf "$shell_folder"/tools/src/qemu-7.2.0-rc4.tar.xz); then
+            red "extract qemu-7.2.0 fail, exiting"
+            exit 255
+        fi
+        if ! (mkdir -p build-qemu); then
+            red "creating build-qemu fail, exiting..."
+            exit 255
+        fi
+        cd "$shell_folder"/tools/src/build-qemu || (red 'cd to build-qemu fail' ;exit)
+        if ! (../qemu-7.2.0-rc4/configure --prefix="$PREFIX" $qemu_configure 2>&1 | tee "$log"/qemu-configure.log); then
+            red "qemu-7.2.0 configure fail, exiting..."
+            exit 255
+        fi
+        if ! (make -j "$(nproc)" 2>&1 | tee "$log"/qemu-make.log); then
+            red "qemu-7.2.0 make fail, exiting..."
+            exit 255
+        fi
+        if ! (make install -j "$(nproc)" 2>&1 | tee "$log"/qemu-make-install.log); then
+            red "qemu-7.2.0 make install fail, exiting..."
+            exit 255
+        fi
+        green "qemu successfully compiled and installed"
+    fi
+
+    # binutils
+    purple "=> Compile binutils-2.38"
+    cd "$shell_folder"/tools/src || (red "cd to tools/src fail, nothong changed, exiting..." && exit 255)
+    green "Compile options: $binutils_configure"
+    echo "Extracting..."
+    sleep 3s
+    if ! (tar xzf "$shell_folder"/tools/src/binutils-2.38.tar.gz); then
+        red "extract binutils-2.38 fail, exiting"
+        exit 255
+    fi
+    if ! (mkdir -p build-binutils); then
+        red "creating build-binutils fail, exiting..."
+        exit 255
+    fi
+    cd "$shell_folder"/tools/src/build-binutils || (red 'cd to build-binutils fail' ;exit)
+    if ! (../binutils-2.38/configure --target=$TARGET --prefix="$PREFIX" $binutils_configure 2>&1 | tee "$log"/binutil-configure.log); then
+        red "binutils-2.38 configure fail, exiting..."
+        exit 255
+    fi
+    if ! (make -j "$(nproc)" 2>&1 | tee "$log"/binutil-make.log); then
+        red "binutils-2.38 make fail, exiting..."
+        exit 255
+    fi
+    if ! (make install -j "$(nproc)" 2>&1 | tee "$log"/binutil-make-install.log); then
+        red "binutils-2.38 make install fail, exiting..."
+        exit 255
+    fi
+    green "binutils successfully compiled and installed"
+
+    # gcc
+    purple "=> Compile gcc"
+    cd "$shell_folder"/tools/src || (echo "cd to tools fail, nothong changed, exiting..." && exit)
+    echo "Searching $TARGET-as..."
+    which -- $TARGET-as || (red "$TARGET-as is not in the PATH, aborting..."; exit)
+    green "Compile options: $binutils_configure"
+    echo "Extracting..."
+    sleep 3s
+    if ! (tar xzf "$shell_folder"/tools/src/gcc-10.4.0.tar.gz); then
+        red "extract gcc-10.4.0.tar.gz fail, exiting..."
+        exit 255
+    fi
+    if ! (mkdir -p build-gcc); then
+        red "creating build-gcc fail, exiting..."
+        exit 255
+    fi
+    cd "$shell_folder"/tools/src/build-gcc || (red 'cd to build-gcc fail' ;exit)
+    if ! (../gcc-10.4.0/configure --target=$TARGET --prefix="$PREFIX" $gcc_configure 2>&1 | tee "$log"/gcc-configure.log); then
+        red "gcc-10.4.0 configure fail, exiting..."
+        exit 255
+    fi
+    if ! (make -j "$(nproc)" all-gcc 2>&1 | tee "$log"/gcc-make-all-gcc.log); then
+        red "gcc-10.4.0 all-gcc make fail, exiting..."
+        exit 255
+    fi
+    if ! (make -j "$(nproc)" all-target-libgcc 2>&1 | tee "$log"/gcc-make-all-target-libgcc.log); then
+        red "gcc-10.4.0 all-target-libgcc make fail, exiting..."
+        exit 255
+    fi
+    if ! (make install-gcc 2>&1 | tee "$log"/gcc-make-install-gcc.log); then
+        red "gcc-10.4.0 all-gcc make install fail, exiting..."
+        exit 255
+    fi 
+    if ! (make install-target-libgcc 2>&1 | tee "$log"/gcc-make-install-target-libgcc.log); then
+        red "gcc-10.4.0 all-target-libgcc make install fail, exiting..."
+        exit 255
+    fi
+    green "gcc successfully compiled and installed"
+
+    cd "$shell_folder" || exit;
+    if [[ $1 = "-fc" ]] || [[ $1 = '--fully-compile' ]]; then
+        purple "You can run bochs, bochs-gdb, qemu, $TARGET-gcc, $TARGET-ld, $TARGET-as now"
+    else
+        purple "You can run bochs, bochs-gdb, $TARGET-gcc, $TARGET-ld, $TARGET-as now"
+    fi
+
+    green "Run \`source all-build.sh\` first or manually add tools/bin into your PATH"
+fi
+