Merge branch 'rust-nightly' of https://github.com/Andy-Python-Programmer/aero into rust-nightly

Author: Andy-Python-Programmer

.gitignore

@@ -12,3 +12,9 @@ sysroot
 
 # Bochs specific files:
 bx_enh_dbg.ini
+
+# Objdump files:
+*.dump
+
+# Remove doom port related files:
+base-files/doom1.wad

.vscode/launch.json

@@ -5,7 +5,7 @@
             "type": "cppdbg",
             "request": "launch",
             "name": "Attach Qemu",
-            "program": "${workspaceFolder}/src/target/x86_64-aero_os/debug/aero_kernel",
+            "program": "${workspaceFolder}/src/target/x86_64-aero_os/release/aero_kernel",
             "args": [],
             "cwd": "${workspaceFolder}",
             "externalConsole": false,
@@ -24,7 +24,7 @@
                     "description": "Connect to QEMU remote debugger"
                 },
                 {
-                    "text": "symbol-file ${workspaceFolder}/src/target/x86_64-aero_os/debug/aero_kernel",
+                    "text": "symbol-file ${workspaceFolder}/src/target/x86_64-aero_os/release/aero_kernel",
                     "description": "Get kernel symbols"
                 }
             ],
@@ -38,7 +38,7 @@
                 "platform select remote-gdb-server"
             ],
             "targetCreateCommands": [
-                "target create ${workspaceFolder}/src/target/x86_64-aero_os/debug/aero_kernel"
+                "target create ${workspaceFolder}/src/target/x86_64-aero_os/release/aero_kernel"
             ],
             "processCreateCommands": [
                 "gdb-remote 127.0.0.1:1234" // Connect to the GDB Server
@@ -59,4 +59,4 @@
             ]
         }
     ]
-}
+}

README.md

@@ -20,10 +20,13 @@ No, Aero runs its own kernel that does *not* originate from Linux and does not s
 
 # Screenshots
 <img src="misc/demo.png">
-<p align="center"><i>Aero OS running in Qemu (the background image is by <a href="https://www.youtube.com/watch?v=dQw4w9WgXcQ">Rick Astley</a>)</i></p>
+<p align="center"><i>Aero running TCC in Qemu (the background image is by <a href="https://www.youtube.com/watch?v=dQw4w9WgXcQ">Rick Astley</a>)</i></p>
 
 <img src="misc/qjs-in-aero.png">
-<p align="center">QJS running in Aero</p>
+<p align="center"><i>Aero running Quick JS in Qemu (the background image is by <a href="https://www.youtube.com/watch?v=dQw4w9WgXcQ">Rick Astley</a>)</i></p>
+
+<img src="misc/aero-doom.png">
+<p align="center"><i>Aero running DOOM in Qemu (the background image is by <a href="https://www.youtube.com/watch?v=dQw4w9WgXcQ">Rick Astley</a>)</i></p>
 
 # Features
 - 64-bit higher half kernel

aero.py

@@ -137,6 +137,11 @@ def parse_args():
                         action='store_true',
                         help='build the full userland sysroot. If disabled, then the sysroot will only contain the aero_shell and the init binaries')
 
+    parser.add_argument('--disable-kvm',
+                        default=False,
+                        action='store_true',
+                        help='disable KVM acceleration even if its available')
+
     parser.add_argument('remaining',
                         nargs=argparse.REMAINDER,
                         help='additional arguments to pass as the emulator')
@@ -188,13 +193,13 @@ def extract_artifacts(stdout):
     return result
 
 
-def build_cargo_workspace(cwd, command, args):
-    code, _, _ = run_command(['cargo', command, *args], cwd=cwd)
+def build_cargo_workspace(cwd, command, args, cargo='cargo'):
+    code, _, _ = run_command([cargo, command, *args], cwd=cwd)
 
     if code != 0:
         return None
 
-    _, stdout, _ = run_command(['cargo', command, *args, '--message-format=json'],
+    _, stdout, _ = run_command([cargo, command, *args, '--message-format=json'],
                                stdout=subprocess.PIPE,
                                stderr=subprocess.DEVNULL,
                                cwd=cwd)
@@ -274,10 +279,13 @@ def build_userland(args):
     if args.check:
         command = 'check'
 
+    cargo = '../sysroot/tools/host-cargo/bin/cargo'
+    cmd_args += ['--target', 'x86_64-unknown-aero-system']
+
     if args.test:
-        return build_cargo_workspace('userland', 'build', ['--package', 'utest', *cmd_args])
+        return build_cargo_workspace('userland', 'build', ['--package', 'utest', *cmd_args], cargo)
     else:
-        return build_cargo_workspace('userland', command, cmd_args)
+        return build_cargo_workspace('userland', command, cmd_args, cargo)
 
     # TODO: Userland check
     # elif args.check:
@@ -401,6 +409,16 @@ def cp(src, dest):
         limine_install = 'limine-install-win32.exe'
     elif platform.system() == 'Linux':
         limine_install = 'limine-install-linux-x86_64'
+    elif platform.system() == 'Darwin':
+        limine_install = 'limine-install'
+        # Limine doesn't provide pre-built binaries, so we have to build from source
+        code, _, limine_build_stderr = run_command(['make', '-C', limine_path],
+                                                   stdout=subprocess.PIPE,
+                                                   stderr=subprocess.PIPE)
+        if code != 0:
+            print('Failed to build `limine-install`')
+            print(limine_build_stderr.decode('utf8'))
+            exit(1)
 
     limine_install = os.path.join(limine_path, limine_install)
 
@@ -418,8 +436,9 @@ def cp(src, dest):
 
 
 def run_in_emulator(args, iso_path):
+    is_kvm_available = is_kvm_supported()
+
     qemu_args = ['-cdrom', iso_path,
-                 '-cpu', 'qemu64,+la57' if args.la57 else 'qemu64',
                  '-M', 'q35',
                  '-m', '5G',
                  '-smp', '1',
@@ -436,9 +455,99 @@ def run_in_emulator(args, iso_path):
     if cmdline:
         qemu_args += cmdline
 
+    if is_kvm_available and not args.disable_kvm:
+        print("Running with KVM acceleration enabled")
+
+        if platform.system() == 'Darwin':
+            qemu_args += ['-accel', 'hvf']
+        else:
+            qemu_args += ['-enable-kvm']
+        qemu_args += ['-cpu', 'host,+la57' if args.la57 else 'host']
+    else:
+        qemu_args += ["-cpu", "qemu64,+la57" if args.la57 else "qemu64"]
+
     run_command(['qemu-system-x86_64', *qemu_args])
 
 
+def get_sysctl(name: str) -> str:
+    """
+    Shell out to sysctl(1)
+
+    Returns the value as a string.
+    Non-leaf nodes will return the value for each sub-node separated by newline characters.
+    """
+    status, stdout, stderr = run_command(["sysctl", "-n", name],
+                                         stdout=subprocess.PIPE,
+                                         stderr=subprocess.PIPE)
+    if status != 0:
+        print("`sysctl` failed: ", end="")
+        print(stderr.decode())
+    
+    return stdout.strip().decode()
+
+
+def is_kvm_supported() -> bool:
+    """
+    Returns True if KVM is supported on this machine
+    """
+
+    platform = sys.platform
+
+    if platform == "darwin":
+        # Check for VMX support
+        cpu_features = get_sysctl("machdep.cpu.features")
+        vmx_support  = "VMX" in cpu_features.split(' ')
+
+        # Check for HVF support
+        hv_support = get_sysctl("kern.hv_support") == "1"
+        
+        return hv_support and vmx_support
+
+    if platform == "linux":
+        kvm_path = "/dev/kvm"
+
+        # Check if the `/dev/kvm` device exists.
+        if not os.path.exists(kvm_path):
+            return False
+
+        # Read out the cpuinfo from `/proc/cpuinfo`
+        fd = open("/proc/cpuinfo")
+        cpuinfo = fd.read()
+
+        # Parse the cpuinfo
+        cpuinfo_array = cpuinfo.split("\n\n")
+        processors_info = []
+
+        for cpu in cpuinfo_array:
+            ret = {}
+            for line in cpu.split("\n"):
+                try:
+                    name, value = line.split(":")
+
+                    name = name.strip()
+                    value = value.strip()
+
+                    ret[name] = value
+                except ValueError:
+                    pass
+
+            processors_info.append(ret)
+
+        for processor in processors_info:
+            if processor["processor"] == "0":
+                # KVM acceleration can be used
+                if "vmx" in processor["flags"]:
+                    return True
+                # KVM acceleration cannot be used
+                else:
+                    return False
+
+        fd.close()
+
+    # KVM is not avaliable on Windows
+    return False
+
+
 def main():
     args = parse_args()
 

base-files/.bashrc

@@ -0,0 +1,8 @@
+PS1='\[\033[01;32m\]root@\h\[\033[00m\]:\[\033[01;36m\]\w\[\033[00m\]\$ '
+
+HISTCONTROL=ignoredups
+HISTSIZE=-1
+HISTFILESIZE=-1
+
+alias ls="ls --color=auto"
+alias clear='printf "\e[2J\e[H"'

bootstrap.yml

@@ -45,9 +45,9 @@ sources:
 
   - name: mlibc
     subdir: 'bundled'
-    url: 'https://github.com/managarm/mlibc/archive/afd11daf4565943f8265b2c1ed2a9116e7a4ba4f.tar.gz'
+    url: 'https://github.com/managarm/mlibc/archive/a569f1edddad6017177118713b3d42858305a4d0.tar.gz'
     format: 'tar.gz'
-    extract_path: 'mlibc-afd11daf4565943f8265b2c1ed2a9116e7a4ba4f'
+    extract_path: 'mlibc-a569f1edddad6017177118713b3d42858305a4d0'
     patch-path-strip: 1
     version: '12.rolling'
 
@@ -186,8 +186,8 @@ tools:
     source:
       subdir: 'bundled'
       git: 'https://github.com/rust-lang/cargo.git'
-      tag: '0.53.0'
-      version: '0.53.0'
+      branch: 'master'
+      commit: '25fcb135d02ea897ce894b67ae021f48107d522b'
     tools_required:
       - tool: host-rust
         recursive: true
@@ -545,11 +545,12 @@ packages:
 
   - name: bash
     source:
+      git: 'https://git.savannah.gnu.org/git/bash.git'
+      # Checkout bash 5.1
+      branch: 'master'
+      commit: '9439ce094c9aa7557a9d53ac7b412a23aa66e36b'
+      version: '5.1.16'
       subdir: 'bundled'
-      url: 'https://ftp.gnu.org/gnu/bash/bash-5.1.tar.gz'
-      format: 'tar.gz'
-      extract_path: 'bash-5.1'
-      patch-path-strip: 3
     tools_required:
       - host-gcc
       - host-autoconf-v2.69
@@ -563,11 +564,12 @@ packages:
         - '--prefix=/usr'
         - '--without-bash-malloc'
         - '--disable-nls'
+        - 'CFLAGS=-g -O0'
         environ:
           ac_cv_func_wcswidth: 'no'
     build:
       - args: ['make', '-j@PARALLELISM@']
-      - args: ['make', 'DESTDIR=@THIS_COLLECT_DIR@', 'install-strip']
+      - args: ['make', 'DESTDIR=@THIS_COLLECT_DIR@', 'install']
 
   - name: tcc
     source:
@@ -645,6 +647,21 @@ packages:
   #       environ:
   #         DESTDIR: '@THIS_COLLECT_DIR@'
 
+  - name: doomgeneric
+    source:
+      subdir: 'bundled'
+      git: 'https://github.com/ozkl/doomgeneric.git'
+      branch: 'master'
+      commit: '2d9b24f07c78c36becf41d89db30fa99863463e5'
+    tools_required:
+      - host-gcc
+    pkgs_required:
+      - mlibc
+    build:
+      - args: ['make', '-C', '@THIS_SOURCE_DIR@/doomgeneric', '-f', 'Makefile.aero', '-j@PARALLELISM@']
+      - args: ['mkdir', '-p', '@THIS_COLLECT_DIR@/usr/bin']
+      - args: ['cp', '@THIS_SOURCE_DIR@/doomgeneric/doomgeneric', '@THIS_COLLECT_DIR@/usr/bin/doomgeneric']
+
   - name: lua
     source:
       subdir: bundled