Add smelt and fix kernel building in new cargo versions

Author: Filip Chovanec

.gitmodules

@@ -5,3 +5,6 @@
 	path = limine
 	url = https://github.com/limine-bootloader/limine
 
+[submodule "smelt3"]
+	path = smelt3
+	url = ssh://git@github.com/GandelXIV/smelt3

.smelt

@@ -0,0 +1,3 @@
+kentry c89a148be40e6752261e3038609a4b68de22fa3bfdaf32f884edffb8480b9bbe+fa5487b09bb3d0b1de6e96c6b636c9622c9ade4a230443da5d2690c1f455e256+f5e6892821ebd0bd7ea85e085a6ba6c185bfb243d1d0fd6b95be4735f5aad562+edaa04d924ab2792662a0ec4b7cd57caa3c06481aa5ab67caecdbbf89f5f24f8+1cb059cb8bc89c622b8fca6dafd2461701e08559078a0e9e0d68d652c1ca7e59+
+x86_kentry c89a148be40e6752261e3038609a4b68de22fa3bfdaf32f884edffb8480b9bbe+3f0d56f12c8bbf8ba5a23519f38d2e717573e3e79950d11ba261ebaa586055fc+f5e6892821ebd0bd7ea85e085a6ba6c185bfb243d1d0fd6b95be4735f5aad562+edaa04d924ab2792662a0ec4b7cd57caa3c06481aa5ab67caecdbbf89f5f24f8+1cb059cb8bc89c622b8fca6dafd2461701e08559078a0e9e0d68d652c1ca7e59+
+x86_kernel_object 647405a3c326bbe16486c24bb77cba69cec657289f54ce1b0994c84c897778bb+3f0d56f12c8bbf8ba5a23519f38d2e717573e3e79950d11ba261ebaa586055fc+4233ed57f76c339796239655aba6d3f95b67c577100f4eb3740d54d5ce0b963a+729cf176b0393dcdf2e6be55fb25711deacca904633eccbec02e8151defd542d+156a35efe01d536744ff02e4126db5759091dbb63567e8ab626ab4d6111f2381+51207ae5571bdb9ef22c501c175103b63721ffbe157210411469abb4785de97d+526f15e81d861b44c370771c3db89a8c81bdf89935b774a43a87752c8d4fd753+fc0275dda4a8cfc561bc7e7444cc60686dee06c38a193c1d771f37365fd0e994+ca27b5c631ab4ffbb61c02ba4c4c0976ff47529aaf8a475b2e06eaefcaa50e1b+1f32083bce6dd70aca9cb487d2c148eb41845dd93252da15b5c7881b8db6cf04+459ce056e584606f00868728460464c3ffbd497dc9bcda21de0e4058497e6d0f+3c4352baa34cebbe478d90b61b714946f1ce3a02742f2fbc46b6251932aa59f1+89909a0e4c358c0112d539a38876d0819cb33111284ab30526927c04cd4d4b50+abdf0b554b5f3dd38df3452310f9f611ac06ea1f3103aa2046863b1b5d6c12ae+bee9392606a786b5be4504604d48d6a766f05a7a945011922073935fa253afa9+bd376fda27719bcc6a164b498ccf0791a0a8a15940cd1337a73b57cd1dd6478d+41428d2fba0bcdc697e3d594eaa80dc3b2a643f55f029d33d57ab5a37193aca7+8ba8b7292d2b5f58e6f77d49b2c4bbb52433b5ac8eb7145c566ab292c7b93a5b+

kernel/Cargo.lock

@@ -18,15 +18,15 @@ path = "src/main.rs"
 
 [target.'cfg(target_arch = "x86_64")'.dependencies]
 x86 = "0.50.0"
-x86_64 = "0.14.10"
+x86_64 = "0.15.2"
 
 [dependencies]
 rlibc = "1.0.0"
 rlibcex = "0.1"
 tinybmp = "0.3.3"
 volatile = "0.4.5"
-spin = "0.9.3"
-lazy_static = { version = "1.4.0",  features = ["spin_no_std"] }
+spin = "0.9.8"
+lazy_static = { version = "1.4.0", features = ["spin_no_std"] }
 arrayvec = { version = "0.7.2", default-features = false }
 tinyvec = "1.6.0"
 
@@ -35,4 +35,3 @@ const-bitfield = "0.2.2"
 # None of the limine libs below work
 #limine = "0.1.8"
 #limine-protocol = "0.4.0"
-

kernel/Cargo.toml

@@ -89,14 +89,14 @@ impl SegmentDescriptor {
 
     // addr: u20
     const fn set_whole_limit(&mut self, addr: u32) {
-        self.set_limit0(bin_extract(addr, 15, 0) as u16);
-        self.set_limit1(bin_extract(addr, 19, 16) as u8);
+        self.set_limit0(bin_extract(addr as u64, 15, 0) as u16);
+        self.set_limit1(bin_extract(addr as u64, 19, 16) as u8);
     }
 
     const fn set_whole_base(&mut self, addr: u32) {
-        self.set_base0(bin_extract(addr, 15, 0) as u16);
-        self.set_base1(bin_extract(addr, 23, 16) as u8);
-        self.set_base2(bin_extract(addr, 31, 24) as u8);
+        self.set_base0(bin_extract(addr as u64, 15, 0) as u16);
+        self.set_base1(bin_extract(addr as u64, 23, 16) as u8);
+        self.set_base2(bin_extract(addr as u64, 31, 24) as u8);
     }
 
     // base constructor for kernel descriptors

kernel/src/arch/amd64/gdt.rs

@@ -11,7 +11,6 @@
 #![crate_type = "staticlib"]
 #![feature(layout_for_ptr)]
 // required by tools.rs
-#![feature(const_convert)]
 #![feature(const_trait_impl)]
 #![feature(const_mut_refs)]
 // required by panic handler
@@ -40,16 +39,12 @@ fn kpanic(info: &core::panic::PanicInfo<'_>) -> ! {
         None => log!("Payload: unknown\n"),
     }
     // message
-    match info.message() {
-        Some(msg) => log!("Message: {:?}\n", msg),
-        None => log!("Message: unknown\n"),
-    }
+    log!("{:?}", info.message());
     // location
     match info.location() {
         Some(loc) => log!("Location: {}\n", loc),
         None => log!("Location: unknown"),
     }
-
     loop {}
 }
 

kernel/src/main.rs

@@ -71,7 +71,7 @@ macro_rules! bitfield {
     // bitrange, only setter
     ($name:ident, $typ:ty, $h:literal, $l:literal) => {
         const fn $name(&mut self, payload: $typ) {
-            *self = Self(bin_insert(self.0, payload, $h, $l));
+            *self = Self(bin_insert(self.0, payload as u64, $h, $l));
         }
     };
 
@@ -89,7 +89,7 @@ macro_rules! bitfield {
     // single-bit, only setter
     ($name:ident, $typ:ty, $b:literal) => {
         const fn $name(&mut self, payload: $typ) {
-            *self = Self(bin_insert(self.0, payload, $b, $b));
+            *self = Self(bin_insert(self.0, payload as u64, $b, $b));
         }
     };
 
@@ -112,14 +112,11 @@ macro_rules! bitfield {
 /// assert_eq!(bin_extract(0b11110011, 4, 1), 0b1001)
 /// ```
 
-pub const fn bin_extract<T: Into<u64>>(target: T, higher: usize, lower: usize) -> u64
-where
-    u64: ~const From<T>,
-{
+pub const fn bin_extract(target: u64, higher: usize, lower: usize) -> u64 {
     // (x >> lower) -> cuts out the stuff we dont care about to the right
     // ( (1 << (higher + 1 - lower)) - 1) -> creates a binary number full of ones with length (higher+1-lower), that then get used as a mask
     // for bitwise and ('&') to remove all the stuff we dont care about to the left
-    (target.into() >> lower) & ((1 << (higher + 1 - lower)) - 1)
+    (target >> lower) & ((1 << (higher + 1 - lower)) - 1)
 }
 
 /// inserts a binary sequence into another one
@@ -129,18 +126,9 @@ where
 /// assert_eq!(bin_insert(0b0000000000000000, 0b00001111, 6, 3), 0b0000000000111100)
 /// assert_eq!(bin_insert(0b1110001010001100, 0b101, 16, 14), 0b1010001010001100)
 /// ```
-pub const fn bin_insert<T: Into<u64>, U: Into<u64>>(
-    target: T,
-    payload: U,
-    higher: usize,
-    lower: usize,
-) -> u64
-where
-    u64: ~const From<U>,
-    u64: ~const From<T>,
-{
+pub const fn bin_insert(target: u64, payload: u64, higher: usize, lower: usize) -> u64 {
     // this mask enables all bits that have to be with a BitOr
-    let enable = (payload.into() << lower) as u64;
+    let enable = (payload << lower) as u64;
     // this mask disables all bits that must not be with a BitAnd
     // same as the enable mask, but full of ones on the left & the right to preserve the rest of
     // the data, except for our payload that can have some zeroes for disabling
@@ -152,5 +140,5 @@ where
             u64::MAX << higher + 1
         });
     // apply the masks
-    ((target.into() | enable) & disable).into()
+    (target | enable) & disable
 }

kernel/src/tools.rs

@@ -1,15 +1,15 @@
 {
-    "llvm-target": "x86_64-unknown-none",
-    "data-layout": "e-m:e-i64:64-f80:128-n8:16:32:64-S128",
-    "arch": "x86_64",
-    "target-endian": "little",
-    "target-pointer-width": "64",
-    "target-c-int-width": "32",
-    "os": "none",
-    "executables": true,
-    "linker-flavor": "ld.lld",
-    "linker": "rust-lld",
-    "panic-strategy": "abort",
-    "disable-redzone": true,
-    "features": "-mmx,-sse,+soft-float"
+  "llvm-target": "x86_64-unknown-none",
+  "data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128",
+  "arch": "x86_64",
+  "target-endian": "little",
+  "target-pointer-width": "64",
+  "target-c-int-width": "32",
+  "os": "none",
+  "executables": true,
+  "linker-flavor": "ld.lld",
+  "linker": "rust-lld",
+  "panic-strategy": "abort",
+  "disable-redzone": true,
+  "features": "-mmx,-sse,+soft-float"
 }

kernel/triple/x86_64.json

@@ -0,0 +1,32 @@
+#!/usr/bin/python3
+import sys
+sys.path.insert(1, 'smelt3/')
+import smelt3
+from smelt3 import task, use, File, file_tree, shell, create_setting, sett
+
+create_setting("KERNEL_BUILD_RELEASE", False)
+
+@task("kentry")
+def x86_kentry():
+    out = "build/kentry.x86_64.o"
+    use(file_tree("kernel/kentry/x86_64/"))
+
+    shell("mkdir -p build/")
+    shell(f"nasm -f elf64 kernel/kentry/x86_64/kentry.asm -o {out}")
+    return File(out)
+
+@task("kernel_object")
+def x86_kernel_object():
+    use(File("kernel/Cargo.lock"))
+    use(File("kernel/Cargo.toml"))
+    use(File("kernel/link/x86_64.ld"))
+    use(File("kernel/.cargo/config.toml"))
+    use(File("kernel/triple/x86_64.json"))
+    use(file_tree("kernel/src/"))
+    KERNEL_BUILD_RELEASE = sett("KERNEL_BUILD_RELEASE")
+
+    shell(f"cd kernel/ && cargo build --target triple/x86_64.json --lib {"--release" if KERNEL_BUILD_RELEASE else ""}")
+
+    return File(f"kernel/target/{"release" if KERNEL_BUILD_RELEASE else "debug"}/release/libkernel.a")
+
+smelt3.cli()