Merge branch 'master' into stage8

Author: stlankes

.github/workflows/build.yml

@@ -20,29 +20,9 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest,macos-latest,windows-latest]
-        rust: [nightly]
-        include:
-          - os: macOS-latest
-            rust: 'nightly'
-            components: 'rustfmt, clippy, rust-src'
-            targets: 'x86_64-apple-darwin'
-          - os: windows-latest
-            rust: 'nightly'
-            components: 'rustfmt, clippy, rust-src'
-            targets: 'x86_64-pc-windows-msvc'
-          - os: ubuntu-latest
-            rust: 'nightly'
-            components: 'rustfmt, clippy, rust-src'
-            targets: 'x86_64-unknown-linux-musl'
-
 
     steps:
-    - uses: hecrj/[email protected]
-      with: 
-         rust-version: ${{ matrix.rust }}
-         components: ${{ matrix.components || '' }}
-         targets: ${{ matrix.targets || '' }}
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
       with:
          submodules: true
     - name: Check Cargo availability

.github/workflows/format.yml

@@ -18,29 +18,9 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        rust: [nightly]
-        include:
-          - os: macOS-latest
-            rust: 'nightly'
-            components: 'rustfmt, clippy'
-            targets: 'x86_64-apple-darwin'
-          - os: windows-latest
-            rust: 'nightly'
-            components: 'rustfmt, clippy'
-            targets: 'x86_64-pc-windows-msvc'
-          - os: ubuntu-latest
-            rust: 'nightly'
-            components: 'rustfmt, clippy'
-            targets: 'x86_64-unknown-linux-musl'
-
 
     steps:
-    - uses: hecrj/[email protected]
-      with: 
-         rust-version: ${{ matrix.rust }}
-         components: ${{ matrix.components || '' }}
-         targets: ${{ matrix.targets || '' }}
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
       with:
          submodules: true
     - name: Check Cargo availability

.gitlab-ci.yml

@@ -0,0 +1,54 @@
+stages:
+- prepare
+- build
+- test
+
+variables:
+  DOCKER_FILE: Dockerfile
+  DOCKER_TAG: latest
+  DOCKER_IMAGE: ${CI_REGISTRY_IMAGE}
+  GIT_SUBMODULE_STRATEGY: normal
+  FF_GITLAB_REGISTRY_HELPER_IMAGE: 1
+
+.prepare:docker: &prepare_docker
+  stage: prepare
+  image:
+    name: quay.io/buildah/stable
+  variables:
+    _BUILDAH_STARTED_IN_USERNS: ""
+    BUILDAH_ISOLATION: chroot
+    BUILDAH_LAYERS: "true"
+  before_script:
+  - buildah version
+  - buildah login --username "${CI_REGISTRY_USER}" --password "${CI_REGISTRY_PASSWORD}" "${CI_REGISTRY}"
+  script:
+  - buildah bud -f ${DOCKER_FILE} -t ${DOCKER_IMAGE}:${DOCKER_TAG} .
+  - buildah push ${DOCKER_IMAGE}:${DOCKER_TAG} docker://${DOCKER_IMAGE}:${DOCKER_TAG}
+  after_script:
+  - buildah logout "${CI_REGISTRY}"
+  tags:
+  - builder
+
+prepare:docker:
+  <<: *prepare_docker
+
+build:kernel:
+  stage: build
+  image: ${CI_REGISTRY_IMAGE}
+  script:
+    - cargo build -Z build-std=core,alloc --no-default-features --target x86_64-eduos.json
+  artifacts:
+    paths:
+      - target/x86_64-eduos/debug/eduos-rs
+
+test:kernel:
+   stage: test
+   dependencies:
+     - build:kernel
+   image: ${CI_REGISTRY_IMAGE}
+   script:
+     - lscpu
+     - kvm-ok
+     - RUST_LOG=debug ehyve -f ./demo/hello target/x86_64-eduos/debug/eduos-rs
+   tags:
+     - privileged

.travis.yml

@@ -1,19 +1,20 @@
-# Download base image ubuntu 18.04
-FROM ubuntu:18.04
+FROM ubuntu:latest
 
 ENV DEBIAN_FRONTEND=noninteractive
 
-# Update Software repository
-RUN apt-get -qq update
-
-# Install required packets from ubuntu repository
-RUN apt-get install -y apt-transport-https curl wget vim nano git binutils autoconf automake make cmake qemu-kvm qemu-system-x86 nasm gcc g++ build-essential libtool bsdmainutils lld-8
+RUN apt-get update && \
+    apt-get -y install cpu-checker util-linux apt-transport-https curl wget binutils build-essential gcc libtool bsdmainutils pkg-config libssl-dev git qemu-kvm qemu-system-x86 nasm seabios qemu-utils fdisk grub-pc grub-pc-bin grub-imageboot grub-legacy-ec2 multiboot kpartx gzip && \
+    apt-get clean
 
 # Install Rust toolchain
-RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain nightly
+RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain nightly --profile minimal
 RUN /root/.cargo/bin/rustup component add rust-src
 RUN /root/.cargo/bin/rustup component add llvm-tools-preview
 RUN /root/.cargo/bin/cargo install --git https://github.com/RWTH-OS/ehyve.git
 
 ENV PATH="/root/.cargo/bin:/root/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-unknown-linux-gnu/bin/:${PATH}"
 ENV EDITOR=vim
+
+# Switch back to dialog for any ad-hoc use of apt-get
+ENV DEBIAN_FRONTEND=dialog
+

Cargo.lock

@@ -1,6 +1,3 @@
-[![Build Status](https://travis-ci.com/RWTH-OS/eduOS-rs.svg?branch=master)](https://travis-ci.com/RWTH-OS/eduOS-rs)
-![Actions Status](https://github.com/RWTH-OS/eduOS-rs/workflows/Build/badge.svg)
-
 # eduOS-rs - A teaching operating system written in Rust
 
 ## Introduction

Dockerfile

@@ -1,5 +1,5 @@
 [toolchain]
-channel = "nightly-2021-02-11"
+channel = "nightly-2021-10-20"
 components = [
     "clippy",
     "rustfmt",

README.md

@@ -15,10 +15,6 @@ pub use self::x86_64::kernel::{
 #[cfg(target_arch = "x86_64")]
 pub use self::x86_64::load_application;
 
-// Export our platform-specific modules.
-#[cfg(target_arch = "x86_64")]
-pub use self::x86_64::kernel::switch::switch;
-
 // Export our platform-specific modules.
 #[cfg(target_arch = "x86_64")]
 pub use self::x86_64::mm;
@@ -32,3 +28,13 @@ pub use self::x86_64::mm::paging::{
 // Implementations for x86_64.
 #[cfg(target_arch = "x86_64")]
 pub mod x86_64;
+
+extern "C" {
+	pub fn __switch(old_stack: *mut usize, new_stack: usize);
+}
+
+pub fn switch(old_stack: *mut usize, new_stack: usize) {
+	unsafe {
+		__switch(old_stack, new_stack);
+	}
+}

rust-toolchain.toml

@@ -24,19 +24,19 @@ const KERNEL_CODE_SELECTOR: SegmentSelector = SegmentSelector::new(1, Ring::Ring
 
 /// Enable Interrupts
 pub fn irq_enable() {
-	unsafe { llvm_asm!("sti" ::: "memory" : "volatile") };
+	unsafe { asm!("sti", options(nomem, nostack)) };
 }
 
 /// Disable Interrupts
 pub fn irq_disable() {
-	unsafe { llvm_asm!("cli" ::: "memory" : "volatile") };
+	unsafe { asm!("cli", options(nomem, nostack)) };
 }
 
 /// Determines, if the interrupt flags (IF) is set
 pub fn is_irq_enabled() -> bool {
 	let rflags: u64;
 
-	unsafe { llvm_asm!("pushf; pop $0": "=r"(rflags) :: "memory" : "volatile") };
+	unsafe { asm!("pushf; pop {}", lateout(reg) rflags, options(nomem, nostack, preserves_flags)) };
 	if (rflags & (1u64 << 9)) != 0 {
 		return true;
 	}