diff --git a/.cargo/config.toml b/.cargo/config.toml new file mode 100644 index 0000000..973fadb --- /dev/null +++ b/.cargo/config.toml @@ -0,0 +1,10 @@ +[build] +target = "x86_64-kernel" +target-dir = "build/target" + +[unstable] +build-std = ["core", "compiler_builtins"] +build-std-features = ["compiler-builtins-mem"] + +[env] +RUST_TARGET_PATH = { value = "kernel", relative = true } diff --git a/.gitignore b/.gitignore index ea8c4bf..7d2b7bf 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,15 @@ -/target +# Build output directories +/build/ +/target/ + +# Generated files +*.o +*.bin +*.iso +*.img +*.elf +*.efi +*.log + +# Rust specific +Cargo.lock diff --git a/Cargo.lock b/Cargo.lock index 0482535..c5c8083 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -9,7 +9,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36" [[package]] -name = "foundryos_kernel" +name = "kernel" version = "0.1.0" dependencies = [ "limine", diff --git a/Cargo.toml b/Cargo.toml index c6aaea1..3141e70 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,3 +8,21 @@ resolver = "2" version = "0.1.0" edition = "2021" +[profile.dev] +opt-level = "z" +debug = true +debug-assertions = true +overflow-checks = true +lto = false +incremental = false +codegen-units = 1 + +[profile.release] +opt-level = "z" +debug = false +debug-assertions = false +overflow-checks = false +lto = true +incremental = false +codegen-units = 1 + diff --git a/config/limine.conf b/config/limine.conf index 4353c88..0988692 100644 --- a/config/limine.conf +++ b/config/limine.conf @@ -1,5 +1,11 @@ +# Timeout in seconds that Limine will use before automatically booting. timeout: 1 +# The entry name that will be displayed in the boot menu. /foundry-os + # We use the Limine boot protocol. protocol: limine - kernel_path: boot()/boot/kernel \ No newline at end of file + + # Path to the kernel to boot. boot():/ represents the partition on which limine.conf is located. + kernel_path: boot():/boot/kernel + diff --git a/customos.json b/customos.json deleted file mode 100644 index 899a943..0000000 --- a/customos.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "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", - "relocation-model": "static", - "code-model": "kernel", - "pre-link-args": { - "ld.lld": [ - "--script=linker/linker.ld", - "-nostdlib", - "--no-dynamic-linker", - "-static", - "--no-pie", - "--gc-sections", - "--build-id=none", - "-z", "max-page-size=0x1000" - ] - } - } - \ No newline at end of file diff --git a/kernel/.cargo/config.toml b/kernel/.cargo/config.toml deleted file mode 100644 index 907d534..0000000 --- a/kernel/.cargo/config.toml +++ /dev/null @@ -1,7 +0,0 @@ -[build] -target = "../customos" -target-dir = "./target" - -[unstable] -build-std = ["core", "compiler_builtins"] -build-std-features = ["compiler-builtins-mem"] \ No newline at end of file diff --git a/kernel/Cargo.toml b/kernel/Cargo.toml index 0fb13a0..2e813c9 100644 --- a/kernel/Cargo.toml +++ b/kernel/Cargo.toml @@ -1,7 +1,14 @@ [package] -name = "foundryos_kernel" +name = "kernel" version = "0.1.0" edition = "2021" [dependencies] limine = "0.3.1" + +[features] +default = [] + +[[bin]] +name = "kernel" +path = "src/main.rs" \ No newline at end of file diff --git a/kernel/build.rs b/kernel/build.rs index 31c5210..4d43936 100644 --- a/kernel/build.rs +++ b/kernel/build.rs @@ -1,7 +1,9 @@ +use std::process::Command; +use std::{env, path::Path}; + fn main() { - let arch = std::env::var("CARGO_CFG_TARGET_ARCH").unwrap(); - // Tell cargo to pass the linker script to the linker.. - println!("cargo:rustc-link-arg=-Tlinker-{arch}.ld"); - // ..and to re-run if it changes. - println!("cargo:rerun-if-changed=linker-{arch}.ld"); -} \ No newline at end of file + // Tell cargo to rerun if these files change + println!("cargo:rerun-if-changed=src"); + println!("cargo:rerun-if-changed=linker.ld"); + println!("cargo:rerun-if-changed=../config/limine.conf"); +} diff --git a/kernel/customos/CACHEDIR.TAG b/kernel/customos/CACHEDIR.TAG deleted file mode 100644 index 20d7c31..0000000 --- a/kernel/customos/CACHEDIR.TAG +++ /dev/null @@ -1,3 +0,0 @@ -Signature: 8a477f597d28d172789f06886806bc55 -# This file is a cache directory tag created by cargo. -# For information about cache directory tags see https://bford.info/cachedir/ diff --git a/kernel/customos/debug/.cargo-lock b/kernel/customos/debug/.cargo-lock deleted file mode 100644 index e69de29..0000000 diff --git a/kernel/customos/debug/.fingerprint/compiler_builtins-7ff902764ead3159/run-build-script-build-script-build b/kernel/customos/debug/.fingerprint/compiler_builtins-7ff902764ead3159/run-build-script-build-script-build deleted file mode 100644 index ff9cac7..0000000 --- a/kernel/customos/debug/.fingerprint/compiler_builtins-7ff902764ead3159/run-build-script-build-script-build +++ /dev/null @@ -1 +0,0 @@ -2c12b06536f46cd1 \ No newline at end of file diff --git a/kernel/customos/debug/.fingerprint/compiler_builtins-7ff902764ead3159/run-build-script-build-script-build.json b/kernel/customos/debug/.fingerprint/compiler_builtins-7ff902764ead3159/run-build-script-build-script-build.json deleted file mode 100644 index fa31cad..0000000 --- a/kernel/customos/debug/.fingerprint/compiler_builtins-7ff902764ead3159/run-build-script-build-script-build.json +++ /dev/null @@ -1 +0,0 @@ -{"rustc":5637828655848808591,"features":"","declared_features":"","target":0,"profile":0,"path":0,"deps":[[16831489395241507197,"build_script_build",false,2449660372133931133]],"local":[{"RerunIfChanged":{"output":"../customos/debug/build/compiler_builtins-7ff902764ead3159/output","paths":["build.rs","configure.rs"]}}],"rustflags":[],"config":0,"compile_kind":0} \ No newline at end of file diff --git a/kernel/customos/debug/.fingerprint/core-0a08e04c20f15c0b/invoked.timestamp b/kernel/customos/debug/.fingerprint/core-0a08e04c20f15c0b/invoked.timestamp deleted file mode 100644 index e00328d..0000000 --- a/kernel/customos/debug/.fingerprint/core-0a08e04c20f15c0b/invoked.timestamp +++ /dev/null @@ -1 +0,0 @@ -This file has an mtime of when this was started. \ No newline at end of file diff --git a/kernel/customos/debug/.fingerprint/core-0a08e04c20f15c0b/output-lib-core b/kernel/customos/debug/.fingerprint/core-0a08e04c20f15c0b/output-lib-core deleted file mode 100644 index baa2024..0000000 --- a/kernel/customos/debug/.fingerprint/core-0a08e04c20f15c0b/output-lib-core +++ /dev/null @@ -1 +0,0 @@ -{"$message_type":"diagnostic","message":"Error loading target specification: Could not find specification for target \"../customos\". Run `rustc --print target-list` for a list of built-in targets","code":null,"level":"error","spans":[],"children":[],"rendered":"\u001b[0m\u001b[1m\u001b[38;5;9merror\u001b[0m\u001b[0m\u001b[1m: Error loading target specification: Could not find specification for target \"../customos\". Run `rustc --print target-list` for a list of built-in targets\u001b[0m\n\n"} diff --git a/kernel/customos/debug/.fingerprint/foundryos_kernel-15da3dc5b1d972d1/run-build-script-build-script-build b/kernel/customos/debug/.fingerprint/foundryos_kernel-15da3dc5b1d972d1/run-build-script-build-script-build deleted file mode 100644 index 3b9522a..0000000 --- a/kernel/customos/debug/.fingerprint/foundryos_kernel-15da3dc5b1d972d1/run-build-script-build-script-build +++ /dev/null @@ -1 +0,0 @@ -85b0379a2e964349 \ No newline at end of file diff --git a/kernel/customos/debug/.fingerprint/foundryos_kernel-15da3dc5b1d972d1/run-build-script-build-script-build.json b/kernel/customos/debug/.fingerprint/foundryos_kernel-15da3dc5b1d972d1/run-build-script-build-script-build.json deleted file mode 100644 index b8a518d..0000000 --- a/kernel/customos/debug/.fingerprint/foundryos_kernel-15da3dc5b1d972d1/run-build-script-build-script-build.json +++ /dev/null @@ -1 +0,0 @@ -{"rustc":5637828655848808591,"features":"","declared_features":"","target":0,"profile":0,"path":0,"deps":[[16831489395241507197,"build_script_build",false,15090704965883138604],[4566724075159146729,"build_script_build",false,12086878114467551400]],"local":[{"RerunIfChanged":{"output":"../customos/debug/build/foundryos_kernel-15da3dc5b1d972d1/output","paths":["linker-x86_64.ld"]}}],"rustflags":[],"config":0,"compile_kind":0} \ No newline at end of file diff --git a/kernel/customos/debug/build/compiler_builtins-7ff902764ead3159/invoked.timestamp b/kernel/customos/debug/build/compiler_builtins-7ff902764ead3159/invoked.timestamp deleted file mode 100644 index e00328d..0000000 --- a/kernel/customos/debug/build/compiler_builtins-7ff902764ead3159/invoked.timestamp +++ /dev/null @@ -1 +0,0 @@ -This file has an mtime of when this was started. \ No newline at end of file diff --git a/kernel/customos/debug/build/compiler_builtins-7ff902764ead3159/output b/kernel/customos/debug/build/compiler_builtins-7ff902764ead3159/output deleted file mode 100644 index 1542e0b..0000000 --- a/kernel/customos/debug/build/compiler_builtins-7ff902764ead3159/output +++ /dev/null @@ -1,151 +0,0 @@ -cargo::rerun-if-changed=build.rs -cargo::rerun-if-changed=configure.rs -cargo::rustc-check-cfg=cfg(__ashldi3, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__ashlsi3, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__ashrdi3, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__ashrsi3, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__bswapsi2, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__bswapdi2, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__bswapti2, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__divdi3, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__divsi3, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__divmoddi4, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__divmodsi4, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__divmodsi4, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__divmodti4, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__lshrdi3, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__lshrsi3, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__moddi3, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__modsi3, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__muldi3, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__udivdi3, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__udivmoddi4, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__udivmodsi4, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__udivsi3, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__umoddi3, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__umodsi3, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_cas1_relax, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_cas1_acq, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_cas1_rel, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_cas1_acq_rel, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_cas2_relax, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_cas2_acq, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_cas2_rel, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_cas2_acq_rel, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_cas4_relax, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_cas4_acq, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_cas4_rel, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_cas4_acq_rel, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_cas8_relax, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_cas8_acq, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_cas8_rel, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_cas8_acq_rel, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_cas16_relax, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_cas16_acq, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_cas16_rel, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_cas16_acq_rel, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldadd1_relax, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldadd1_acq, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldadd1_rel, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldadd1_acq_rel, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldadd2_relax, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldadd2_acq, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldadd2_rel, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldadd2_acq_rel, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldadd4_relax, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldadd4_acq, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldadd4_rel, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldadd4_acq_rel, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldadd8_relax, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldadd8_acq, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldadd8_rel, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldadd8_acq_rel, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldclr1_relax, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldclr1_acq, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldclr1_rel, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldclr1_acq_rel, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldclr2_relax, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldclr2_acq, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldclr2_rel, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldclr2_acq_rel, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldclr4_relax, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldclr4_acq, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldclr4_rel, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldclr4_acq_rel, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldclr8_relax, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldclr8_acq, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldclr8_rel, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldclr8_acq_rel, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldeor1_relax, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldeor1_acq, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldeor1_rel, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldeor1_acq_rel, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldeor2_relax, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldeor2_acq, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldeor2_rel, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldeor2_acq_rel, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldeor4_relax, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldeor4_acq, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldeor4_rel, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldeor4_acq_rel, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldeor8_relax, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldeor8_acq, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldeor8_rel, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldeor8_acq_rel, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldset1_relax, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldset1_acq, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldset1_rel, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldset1_acq_rel, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldset2_relax, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldset2_acq, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldset2_rel, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldset2_acq_rel, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldset4_relax, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldset4_acq, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldset4_rel, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldset4_acq_rel, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldset8_relax, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldset8_acq, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldset8_rel, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_ldset8_acq_rel, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_swp1_relax, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_swp1_acq, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_swp1_rel, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_swp1_acq_rel, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_swp2_relax, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_swp2_acq, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_swp2_rel, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_swp2_acq_rel, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_swp4_relax, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_swp4_acq, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_swp4_rel, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_swp4_acq_rel, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_swp8_relax, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_swp8_acq, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_swp8_rel, values("optimized-c")) -cargo::rustc-check-cfg=cfg(__aarch64_swp8_acq_rel, values("optimized-c")) -cargo::rustc-check-cfg=cfg(target_feature, values("vis3")) -cargo::rustc-check-cfg=cfg(feature, values("checked")) -cargo::rustc-check-cfg=cfg(assert_no_panic) -cargo::rustc-check-cfg=cfg(f16_enabled) -cargo::rustc-check-cfg=cfg(f128_enabled) -cargo::rustc-cfg=f16_enabled -cargo::rustc-cfg=f128_enabled -cargo:rustc-check-cfg=cfg(intrinsics_enabled) -cargo:rustc-check-cfg=cfg(arch_enabled) -cargo:rustc-check-cfg=cfg(optimizations_enabled) -cargo:rustc-check-cfg=cfg(feature, values("unstable-public-internals")) -cargo:rustc-cfg=intrinsics_enabled -cargo:rustc-cfg=arch_enabled -cargo:rustc-check-cfg=cfg(optimizations_enabled) -cargo:rustc-check-cfg=cfg(x86_no_sse) -cargo:rustc-env=CFG_CARGO_FEATURES=["compiler-builtins", "core", "default", "mem", "rustc-dep-of-std"] -cargo:rustc-env=CFG_OPT_LEVEL=0 -cargo:rustc-env=CFG_TARGET_FEATURES=["x87"] -cargo:rustc-cfg=feature="unstable-intrinsics" -cargo:compiler-rt=/home/zxq5/.cargo/bin/registry/src/index.crates.io-1949cf8c6b5b557f/compiler_builtins-0.1.146/compiler-rt -cargo::rustc-check-cfg=cfg(feature, values("mem-unaligned")) -cargo:rustc-cfg=feature="mem-unaligned" -cargo::rustc-check-cfg=cfg(thumb) -cargo::rustc-check-cfg=cfg(thumb_1) -cargo::rustc-check-cfg=cfg(kernel_user_helpers) diff --git a/kernel/customos/debug/build/compiler_builtins-7ff902764ead3159/root-output b/kernel/customos/debug/build/compiler_builtins-7ff902764ead3159/root-output deleted file mode 100644 index eab9c50..0000000 --- a/kernel/customos/debug/build/compiler_builtins-7ff902764ead3159/root-output +++ /dev/null @@ -1 +0,0 @@ -/home/zxq5/Projects/OSDev/FoundryOS/kernel/./target/../customos/debug/build/compiler_builtins-7ff902764ead3159/out \ No newline at end of file diff --git a/kernel/customos/debug/build/compiler_builtins-7ff902764ead3159/stderr b/kernel/customos/debug/build/compiler_builtins-7ff902764ead3159/stderr deleted file mode 100644 index e69de29..0000000 diff --git a/kernel/customos/debug/build/foundryos_kernel-15da3dc5b1d972d1/invoked.timestamp b/kernel/customos/debug/build/foundryos_kernel-15da3dc5b1d972d1/invoked.timestamp deleted file mode 100644 index e00328d..0000000 --- a/kernel/customos/debug/build/foundryos_kernel-15da3dc5b1d972d1/invoked.timestamp +++ /dev/null @@ -1 +0,0 @@ -This file has an mtime of when this was started. \ No newline at end of file diff --git a/kernel/customos/debug/build/foundryos_kernel-15da3dc5b1d972d1/output b/kernel/customos/debug/build/foundryos_kernel-15da3dc5b1d972d1/output deleted file mode 100644 index 8ec9b81..0000000 --- a/kernel/customos/debug/build/foundryos_kernel-15da3dc5b1d972d1/output +++ /dev/null @@ -1,2 +0,0 @@ -cargo:rustc-link-arg=-Tlinker-x86_64.ld -cargo:rerun-if-changed=linker-x86_64.ld diff --git a/kernel/customos/debug/build/foundryos_kernel-15da3dc5b1d972d1/root-output b/kernel/customos/debug/build/foundryos_kernel-15da3dc5b1d972d1/root-output deleted file mode 100644 index 900d69a..0000000 --- a/kernel/customos/debug/build/foundryos_kernel-15da3dc5b1d972d1/root-output +++ /dev/null @@ -1 +0,0 @@ -/home/zxq5/Projects/OSDev/FoundryOS/kernel/./target/../customos/debug/build/foundryos_kernel-15da3dc5b1d972d1/out \ No newline at end of file diff --git a/kernel/customos/debug/build/foundryos_kernel-15da3dc5b1d972d1/stderr b/kernel/customos/debug/build/foundryos_kernel-15da3dc5b1d972d1/stderr deleted file mode 100644 index e69de29..0000000 diff --git a/linker/kernel-linker-x86_64.ld b/kernel/linker.ld similarity index 77% rename from linker/kernel-linker-x86_64.ld rename to kernel/linker.ld index 4522a7e..b327207 100644 --- a/linker/kernel-linker-x86_64.ld +++ b/kernel/linker.ld @@ -9,9 +9,10 @@ ENTRY(kmain) /* process. */ PHDRS { - text PT_LOAD; - rodata PT_LOAD; - data PT_LOAD; + limine_requests PT_LOAD; + text PT_LOAD; + rodata PT_LOAD; + data PT_LOAD; } SECTIONS @@ -22,6 +23,18 @@ SECTIONS /* that is the beginning of the region. */ . = 0xffffffff80000000; + /* Define a section to contain the Limine requests and assign it to its own PHDR */ + + .limine_requests : { + KEEP(*(.limine_requests_start)) + KEEP(*(.limine_requests)) + KEEP(*(.limine_requests_end)) + } :limine_requests + + /* Move to the next memory page for .text */ + + . = ALIGN(CONSTANT(MAXPAGESIZE)); + .text : { *(.text .text.*) } :text @@ -38,12 +51,6 @@ SECTIONS .data : { *(.data .data.*) - - /* Place the sections that contain the Limine requests as part of the .data */ - /* output section. */ - KEEP(*(.requests_start_marker)) - KEEP(*(.requests)) - KEEP(*(.requests_end_marker)) } :data /* NOTE: .bss needs to be the last thing mapped to :data, otherwise lots of */ @@ -60,4 +67,4 @@ SECTIONS *(.eh_frame*) *(.note .note.*) } -} \ No newline at end of file +} diff --git a/kernel/rust-toolchain.toml b/kernel/rust-toolchain.toml deleted file mode 100644 index a062f10..0000000 --- a/kernel/rust-toolchain.toml +++ /dev/null @@ -1,4 +0,0 @@ -[toolchain] -channel = "nightly" -targets = ["rust-src", "llvm-tools-preview", "rustfmt", "clippy"] -components = [] \ No newline at end of file diff --git a/kernel/src/main.rs b/kernel/src/main.rs index f909738..a257fb9 100644 --- a/kernel/src/main.rs +++ b/kernel/src/main.rs @@ -51,6 +51,7 @@ unsafe extern "C" fn kmain() -> ! { #[panic_handler] fn rust_panic(_info: &core::panic::PanicInfo) -> ! { hcf(); + // loop {} } fn hcf() -> ! { diff --git a/kernel/target/.rustc_info.json b/kernel/target/.rustc_info.json deleted file mode 100644 index 38546aa..0000000 --- a/kernel/target/.rustc_info.json +++ /dev/null @@ -1 +0,0 @@ -{"rustc_fingerprint":10191676143533991604,"outputs":{"17747080675513052775":{"success":true,"status":"","code":0,"stdout":"rustc 1.87.0-nightly (827a0d638 2025-02-18)\nbinary: rustc\ncommit-hash: 827a0d638dabc9a22c56f9c37a557568f86ac76c\ncommit-date: 2025-02-18\nhost: x86_64-unknown-linux-gnu\nrelease: 1.87.0-nightly\nLLVM version: 20.1.0\n","stderr":""},"7971740275564407648":{"success":true,"status":"","code":0,"stdout":"___\nlib___.rlib\nlib___.so\nlib___.so\nlib___.a\nlib___.so\n/home/zxq5/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu\noff\npacked\nunpacked\n___\ndebug_assertions\nfmt_debug=\"full\"\noverflow_checks\npanic=\"unwind\"\nproc_macro\nrelocation_model=\"pic\"\ntarget_abi=\"\"\ntarget_arch=\"x86_64\"\ntarget_endian=\"little\"\ntarget_env=\"gnu\"\ntarget_family=\"unix\"\ntarget_feature=\"fxsr\"\ntarget_feature=\"sse\"\ntarget_feature=\"sse2\"\ntarget_feature=\"x87\"\ntarget_has_atomic\ntarget_has_atomic=\"16\"\ntarget_has_atomic=\"32\"\ntarget_has_atomic=\"64\"\ntarget_has_atomic=\"8\"\ntarget_has_atomic=\"ptr\"\ntarget_has_atomic_equal_alignment=\"16\"\ntarget_has_atomic_equal_alignment=\"32\"\ntarget_has_atomic_equal_alignment=\"64\"\ntarget_has_atomic_equal_alignment=\"8\"\ntarget_has_atomic_equal_alignment=\"ptr\"\ntarget_has_atomic_load_store\ntarget_has_atomic_load_store=\"16\"\ntarget_has_atomic_load_store=\"32\"\ntarget_has_atomic_load_store=\"64\"\ntarget_has_atomic_load_store=\"8\"\ntarget_has_atomic_load_store=\"ptr\"\ntarget_os=\"linux\"\ntarget_pointer_width=\"64\"\ntarget_thread_local\ntarget_vendor=\"unknown\"\nub_checks\nunix\n","stderr":""},"16938275954012004043":{"success":true,"status":"","code":0,"stdout":"___\nlib___.rlib\nlib___.a\n/home/zxq5/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu\noff\n___\ndebug_assertions\nfmt_debug=\"full\"\noverflow_checks\npanic=\"abort\"\nproc_macro\nrelocation_model=\"static\"\ntarget_abi=\"\"\ntarget_arch=\"x86_64\"\ntarget_endian=\"little\"\ntarget_env=\"\"\ntarget_feature=\"x87\"\ntarget_has_atomic\ntarget_has_atomic=\"16\"\ntarget_has_atomic=\"32\"\ntarget_has_atomic=\"64\"\ntarget_has_atomic=\"8\"\ntarget_has_atomic=\"ptr\"\ntarget_has_atomic_equal_alignment=\"16\"\ntarget_has_atomic_equal_alignment=\"32\"\ntarget_has_atomic_equal_alignment=\"64\"\ntarget_has_atomic_equal_alignment=\"8\"\ntarget_has_atomic_equal_alignment=\"ptr\"\ntarget_has_atomic_load_store\ntarget_has_atomic_load_store=\"16\"\ntarget_has_atomic_load_store=\"32\"\ntarget_has_atomic_load_store=\"64\"\ntarget_has_atomic_load_store=\"8\"\ntarget_has_atomic_load_store=\"ptr\"\ntarget_os=\"none\"\ntarget_pointer_width=\"64\"\ntarget_vendor=\"unknown\"\nub_checks\n","stderr":"warning: target feature `sse2` must be enabled to ensure that the ABI of the current target can be implemented correctly\n |\n = note: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!\n = note: for more information, see issue #116344 \n\nwarning: dropping unsupported crate type `dylib` for target `../customos`\n\nwarning: dropping unsupported crate type `cdylib` for target `../customos`\n\nwarning: dropping unsupported crate type `proc-macro` for target `../customos`\n\nwarning: 4 warnings emitted\n\n"}},"successes":{}} \ No newline at end of file diff --git a/kernel/target/CACHEDIR.TAG b/kernel/target/CACHEDIR.TAG deleted file mode 100644 index 20d7c31..0000000 --- a/kernel/target/CACHEDIR.TAG +++ /dev/null @@ -1,3 +0,0 @@ -Signature: 8a477f597d28d172789f06886806bc55 -# This file is a cache directory tag created by cargo. -# For information about cache directory tags see https://bford.info/cachedir/ diff --git a/kernel/target/debug/.cargo-lock b/kernel/target/debug/.cargo-lock deleted file mode 100644 index e69de29..0000000 diff --git a/kernel/target/debug/.fingerprint/compiler_builtins-96bb72fd3eed954b/build-script-build-script-build b/kernel/target/debug/.fingerprint/compiler_builtins-96bb72fd3eed954b/build-script-build-script-build deleted file mode 100644 index f17d041..0000000 --- a/kernel/target/debug/.fingerprint/compiler_builtins-96bb72fd3eed954b/build-script-build-script-build +++ /dev/null @@ -1 +0,0 @@ -7de8642d21f1fe21 \ No newline at end of file diff --git a/kernel/target/debug/.fingerprint/compiler_builtins-96bb72fd3eed954b/build-script-build-script-build.json b/kernel/target/debug/.fingerprint/compiler_builtins-96bb72fd3eed954b/build-script-build-script-build.json deleted file mode 100644 index 6a03032..0000000 --- a/kernel/target/debug/.fingerprint/compiler_builtins-96bb72fd3eed954b/build-script-build-script-build.json +++ /dev/null @@ -1 +0,0 @@ -{"rustc":5637828655848808591,"features":"[\"compiler-builtins\", \"core\", \"default\", \"mem\", \"rustc-dep-of-std\"]","declared_features":"[\"c\", \"cc\", \"compiler-builtins\", \"core\", \"default\", \"mangled-names\", \"mem\", \"no-asm\", \"no-f16-f128\", \"public-test-deps\", \"rustc-dep-of-std\"]","target":5408242616063297496,"profile":15657897354478470176,"path":1296201966205883023,"deps":[],"local":[{"CheckDepInfo":{"dep_info":"debug/.fingerprint/compiler_builtins-96bb72fd3eed954b/dep-build-script-build-script-build","checksum":false}}],"rustflags":[],"config":2069994364910194474,"compile_kind":0} \ No newline at end of file diff --git a/kernel/target/debug/.fingerprint/compiler_builtins-96bb72fd3eed954b/dep-build-script-build-script-build b/kernel/target/debug/.fingerprint/compiler_builtins-96bb72fd3eed954b/dep-build-script-build-script-build deleted file mode 100644 index ec3cb8b..0000000 Binary files a/kernel/target/debug/.fingerprint/compiler_builtins-96bb72fd3eed954b/dep-build-script-build-script-build and /dev/null differ diff --git a/kernel/target/debug/.fingerprint/compiler_builtins-96bb72fd3eed954b/invoked.timestamp b/kernel/target/debug/.fingerprint/compiler_builtins-96bb72fd3eed954b/invoked.timestamp deleted file mode 100644 index e00328d..0000000 --- a/kernel/target/debug/.fingerprint/compiler_builtins-96bb72fd3eed954b/invoked.timestamp +++ /dev/null @@ -1 +0,0 @@ -This file has an mtime of when this was started. \ No newline at end of file diff --git a/kernel/target/debug/.fingerprint/foundryos_kernel-4c0b4334571dcf0e/build-script-build-script-build b/kernel/target/debug/.fingerprint/foundryos_kernel-4c0b4334571dcf0e/build-script-build-script-build deleted file mode 100644 index b881860..0000000 --- a/kernel/target/debug/.fingerprint/foundryos_kernel-4c0b4334571dcf0e/build-script-build-script-build +++ /dev/null @@ -1 +0,0 @@ -a81848289b37bda7 \ No newline at end of file diff --git a/kernel/target/debug/.fingerprint/foundryos_kernel-4c0b4334571dcf0e/build-script-build-script-build.json b/kernel/target/debug/.fingerprint/foundryos_kernel-4c0b4334571dcf0e/build-script-build-script-build.json deleted file mode 100644 index 224327a..0000000 --- a/kernel/target/debug/.fingerprint/foundryos_kernel-4c0b4334571dcf0e/build-script-build-script-build.json +++ /dev/null @@ -1 +0,0 @@ -{"rustc":5637828655848808591,"features":"[]","declared_features":"[]","target":5408242616063297496,"profile":8731458305071235362,"path":11588123521703303381,"deps":[],"local":[{"CheckDepInfo":{"dep_info":"debug/.fingerprint/foundryos_kernel-4c0b4334571dcf0e/dep-build-script-build-script-build","checksum":false}}],"rustflags":[],"config":2069994364910194474,"compile_kind":0} \ No newline at end of file diff --git a/kernel/target/debug/.fingerprint/foundryos_kernel-4c0b4334571dcf0e/dep-build-script-build-script-build b/kernel/target/debug/.fingerprint/foundryos_kernel-4c0b4334571dcf0e/dep-build-script-build-script-build deleted file mode 100644 index b7bf9e2..0000000 Binary files a/kernel/target/debug/.fingerprint/foundryos_kernel-4c0b4334571dcf0e/dep-build-script-build-script-build and /dev/null differ diff --git a/kernel/target/debug/.fingerprint/foundryos_kernel-4c0b4334571dcf0e/invoked.timestamp b/kernel/target/debug/.fingerprint/foundryos_kernel-4c0b4334571dcf0e/invoked.timestamp deleted file mode 100644 index e00328d..0000000 --- a/kernel/target/debug/.fingerprint/foundryos_kernel-4c0b4334571dcf0e/invoked.timestamp +++ /dev/null @@ -1 +0,0 @@ -This file has an mtime of when this was started. \ No newline at end of file diff --git a/kernel/target/debug/build/compiler_builtins-96bb72fd3eed954b/build-script-build b/kernel/target/debug/build/compiler_builtins-96bb72fd3eed954b/build-script-build deleted file mode 100755 index 338684c..0000000 Binary files a/kernel/target/debug/build/compiler_builtins-96bb72fd3eed954b/build-script-build and /dev/null differ diff --git a/kernel/target/debug/build/compiler_builtins-96bb72fd3eed954b/build_script_build-96bb72fd3eed954b b/kernel/target/debug/build/compiler_builtins-96bb72fd3eed954b/build_script_build-96bb72fd3eed954b deleted file mode 100755 index 338684c..0000000 Binary files a/kernel/target/debug/build/compiler_builtins-96bb72fd3eed954b/build_script_build-96bb72fd3eed954b and /dev/null differ diff --git a/kernel/target/debug/build/compiler_builtins-96bb72fd3eed954b/build_script_build-96bb72fd3eed954b.d b/kernel/target/debug/build/compiler_builtins-96bb72fd3eed954b/build_script_build-96bb72fd3eed954b.d deleted file mode 100644 index 4f501da..0000000 --- a/kernel/target/debug/build/compiler_builtins-96bb72fd3eed954b/build_script_build-96bb72fd3eed954b.d +++ /dev/null @@ -1,6 +0,0 @@ -/home/zxq5/Projects/OSDev/FoundryOS/kernel/./target/debug/build/compiler_builtins-96bb72fd3eed954b/build_script_build-96bb72fd3eed954b: /home/zxq5/.cargo/bin/registry/src/index.crates.io-1949cf8c6b5b557f/compiler_builtins-0.1.146/build.rs /home/zxq5/.cargo/bin/registry/src/index.crates.io-1949cf8c6b5b557f/compiler_builtins-0.1.146/configure.rs - -/home/zxq5/Projects/OSDev/FoundryOS/kernel/./target/debug/build/compiler_builtins-96bb72fd3eed954b/build_script_build-96bb72fd3eed954b.d: /home/zxq5/.cargo/bin/registry/src/index.crates.io-1949cf8c6b5b557f/compiler_builtins-0.1.146/build.rs /home/zxq5/.cargo/bin/registry/src/index.crates.io-1949cf8c6b5b557f/compiler_builtins-0.1.146/configure.rs - -/home/zxq5/.cargo/bin/registry/src/index.crates.io-1949cf8c6b5b557f/compiler_builtins-0.1.146/build.rs: -/home/zxq5/.cargo/bin/registry/src/index.crates.io-1949cf8c6b5b557f/compiler_builtins-0.1.146/configure.rs: diff --git a/kernel/target/debug/build/foundryos_kernel-4c0b4334571dcf0e/build-script-build b/kernel/target/debug/build/foundryos_kernel-4c0b4334571dcf0e/build-script-build deleted file mode 100755 index 753d9cc..0000000 Binary files a/kernel/target/debug/build/foundryos_kernel-4c0b4334571dcf0e/build-script-build and /dev/null differ diff --git a/kernel/target/debug/build/foundryos_kernel-4c0b4334571dcf0e/build_script_build-4c0b4334571dcf0e b/kernel/target/debug/build/foundryos_kernel-4c0b4334571dcf0e/build_script_build-4c0b4334571dcf0e deleted file mode 100755 index 753d9cc..0000000 Binary files a/kernel/target/debug/build/foundryos_kernel-4c0b4334571dcf0e/build_script_build-4c0b4334571dcf0e and /dev/null differ diff --git a/kernel/target/debug/build/foundryos_kernel-4c0b4334571dcf0e/build_script_build-4c0b4334571dcf0e.d b/kernel/target/debug/build/foundryos_kernel-4c0b4334571dcf0e/build_script_build-4c0b4334571dcf0e.d deleted file mode 100644 index 3837b9b..0000000 --- a/kernel/target/debug/build/foundryos_kernel-4c0b4334571dcf0e/build_script_build-4c0b4334571dcf0e.d +++ /dev/null @@ -1,5 +0,0 @@ -/home/zxq5/Projects/OSDev/FoundryOS/kernel/./target/debug/build/foundryos_kernel-4c0b4334571dcf0e/build_script_build-4c0b4334571dcf0e: kernel/build.rs - -/home/zxq5/Projects/OSDev/FoundryOS/kernel/./target/debug/build/foundryos_kernel-4c0b4334571dcf0e/build_script_build-4c0b4334571dcf0e.d: kernel/build.rs - -kernel/build.rs: diff --git a/kernel/target/debug/incremental/build_script_build-1zltxl9voyqsj/s-h4rtcz7yy3-1t1aos2-d984srxfz1u5ygs8433jsu395/1qy380xhrphq531r5ws88j9wo.o b/kernel/target/debug/incremental/build_script_build-1zltxl9voyqsj/s-h4rtcz7yy3-1t1aos2-d984srxfz1u5ygs8433jsu395/1qy380xhrphq531r5ws88j9wo.o deleted file mode 100644 index 72aeef0..0000000 Binary files a/kernel/target/debug/incremental/build_script_build-1zltxl9voyqsj/s-h4rtcz7yy3-1t1aos2-d984srxfz1u5ygs8433jsu395/1qy380xhrphq531r5ws88j9wo.o and /dev/null differ diff --git a/kernel/target/debug/incremental/build_script_build-1zltxl9voyqsj/s-h4rtcz7yy3-1t1aos2-d984srxfz1u5ygs8433jsu395/2dvdjyy0zhw2hjlkhv96c5cs3.o b/kernel/target/debug/incremental/build_script_build-1zltxl9voyqsj/s-h4rtcz7yy3-1t1aos2-d984srxfz1u5ygs8433jsu395/2dvdjyy0zhw2hjlkhv96c5cs3.o deleted file mode 100644 index 76d92a1..0000000 Binary files a/kernel/target/debug/incremental/build_script_build-1zltxl9voyqsj/s-h4rtcz7yy3-1t1aos2-d984srxfz1u5ygs8433jsu395/2dvdjyy0zhw2hjlkhv96c5cs3.o and /dev/null differ diff --git a/kernel/target/debug/incremental/build_script_build-1zltxl9voyqsj/s-h4rtcz7yy3-1t1aos2-d984srxfz1u5ygs8433jsu395/5nbffzhjn52imlezqdqfdsnvh.o b/kernel/target/debug/incremental/build_script_build-1zltxl9voyqsj/s-h4rtcz7yy3-1t1aos2-d984srxfz1u5ygs8433jsu395/5nbffzhjn52imlezqdqfdsnvh.o deleted file mode 100644 index 56d9327..0000000 Binary files a/kernel/target/debug/incremental/build_script_build-1zltxl9voyqsj/s-h4rtcz7yy3-1t1aos2-d984srxfz1u5ygs8433jsu395/5nbffzhjn52imlezqdqfdsnvh.o and /dev/null differ diff --git a/kernel/target/debug/incremental/build_script_build-1zltxl9voyqsj/s-h4rtcz7yy3-1t1aos2-d984srxfz1u5ygs8433jsu395/5yhu9qbjklje8my5z61n13y6f.o b/kernel/target/debug/incremental/build_script_build-1zltxl9voyqsj/s-h4rtcz7yy3-1t1aos2-d984srxfz1u5ygs8433jsu395/5yhu9qbjklje8my5z61n13y6f.o deleted file mode 100644 index e14a08c..0000000 Binary files a/kernel/target/debug/incremental/build_script_build-1zltxl9voyqsj/s-h4rtcz7yy3-1t1aos2-d984srxfz1u5ygs8433jsu395/5yhu9qbjklje8my5z61n13y6f.o and /dev/null differ diff --git a/kernel/target/debug/incremental/build_script_build-1zltxl9voyqsj/s-h4rtcz7yy3-1t1aos2-d984srxfz1u5ygs8433jsu395/6jeumh47x828zycjlopnhx5tg.o b/kernel/target/debug/incremental/build_script_build-1zltxl9voyqsj/s-h4rtcz7yy3-1t1aos2-d984srxfz1u5ygs8433jsu395/6jeumh47x828zycjlopnhx5tg.o deleted file mode 100644 index 2483e7c..0000000 Binary files a/kernel/target/debug/incremental/build_script_build-1zltxl9voyqsj/s-h4rtcz7yy3-1t1aos2-d984srxfz1u5ygs8433jsu395/6jeumh47x828zycjlopnhx5tg.o and /dev/null differ diff --git a/kernel/target/debug/incremental/build_script_build-1zltxl9voyqsj/s-h4rtcz7yy3-1t1aos2-d984srxfz1u5ygs8433jsu395/6y03beg2v4rzs9y0o534u96vi.o b/kernel/target/debug/incremental/build_script_build-1zltxl9voyqsj/s-h4rtcz7yy3-1t1aos2-d984srxfz1u5ygs8433jsu395/6y03beg2v4rzs9y0o534u96vi.o deleted file mode 100644 index 79b65eb..0000000 Binary files a/kernel/target/debug/incremental/build_script_build-1zltxl9voyqsj/s-h4rtcz7yy3-1t1aos2-d984srxfz1u5ygs8433jsu395/6y03beg2v4rzs9y0o534u96vi.o and /dev/null differ diff --git a/kernel/target/debug/incremental/build_script_build-1zltxl9voyqsj/s-h4rtcz7yy3-1t1aos2-d984srxfz1u5ygs8433jsu395/7bz37n6mgodmczl6cnqb46g2f.o b/kernel/target/debug/incremental/build_script_build-1zltxl9voyqsj/s-h4rtcz7yy3-1t1aos2-d984srxfz1u5ygs8433jsu395/7bz37n6mgodmczl6cnqb46g2f.o deleted file mode 100644 index 176fafd..0000000 Binary files a/kernel/target/debug/incremental/build_script_build-1zltxl9voyqsj/s-h4rtcz7yy3-1t1aos2-d984srxfz1u5ygs8433jsu395/7bz37n6mgodmczl6cnqb46g2f.o and /dev/null differ diff --git a/kernel/target/debug/incremental/build_script_build-1zltxl9voyqsj/s-h4rtcz7yy3-1t1aos2-d984srxfz1u5ygs8433jsu395/87xms47vdx7b3p46e0179cope.o b/kernel/target/debug/incremental/build_script_build-1zltxl9voyqsj/s-h4rtcz7yy3-1t1aos2-d984srxfz1u5ygs8433jsu395/87xms47vdx7b3p46e0179cope.o deleted file mode 100644 index c053c3f..0000000 Binary files a/kernel/target/debug/incremental/build_script_build-1zltxl9voyqsj/s-h4rtcz7yy3-1t1aos2-d984srxfz1u5ygs8433jsu395/87xms47vdx7b3p46e0179cope.o and /dev/null differ diff --git a/kernel/target/debug/incremental/build_script_build-1zltxl9voyqsj/s-h4rtcz7yy3-1t1aos2-d984srxfz1u5ygs8433jsu395/9kcuicz6gf6qfitswpixt0dvp.o b/kernel/target/debug/incremental/build_script_build-1zltxl9voyqsj/s-h4rtcz7yy3-1t1aos2-d984srxfz1u5ygs8433jsu395/9kcuicz6gf6qfitswpixt0dvp.o deleted file mode 100644 index 2c3c34f..0000000 Binary files a/kernel/target/debug/incremental/build_script_build-1zltxl9voyqsj/s-h4rtcz7yy3-1t1aos2-d984srxfz1u5ygs8433jsu395/9kcuicz6gf6qfitswpixt0dvp.o and /dev/null differ diff --git a/kernel/target/debug/incremental/build_script_build-1zltxl9voyqsj/s-h4rtcz7yy3-1t1aos2-d984srxfz1u5ygs8433jsu395/boohl3ax7ln7xjs5krpuucs6e.o b/kernel/target/debug/incremental/build_script_build-1zltxl9voyqsj/s-h4rtcz7yy3-1t1aos2-d984srxfz1u5ygs8433jsu395/boohl3ax7ln7xjs5krpuucs6e.o deleted file mode 100644 index fd202d7..0000000 Binary files a/kernel/target/debug/incremental/build_script_build-1zltxl9voyqsj/s-h4rtcz7yy3-1t1aos2-d984srxfz1u5ygs8433jsu395/boohl3ax7ln7xjs5krpuucs6e.o and /dev/null differ diff --git a/kernel/target/debug/incremental/build_script_build-1zltxl9voyqsj/s-h4rtcz7yy3-1t1aos2-d984srxfz1u5ygs8433jsu395/c68ehm6pci3f08lf0r8jkksvm.o b/kernel/target/debug/incremental/build_script_build-1zltxl9voyqsj/s-h4rtcz7yy3-1t1aos2-d984srxfz1u5ygs8433jsu395/c68ehm6pci3f08lf0r8jkksvm.o deleted file mode 100644 index 3f487b4..0000000 Binary files a/kernel/target/debug/incremental/build_script_build-1zltxl9voyqsj/s-h4rtcz7yy3-1t1aos2-d984srxfz1u5ygs8433jsu395/c68ehm6pci3f08lf0r8jkksvm.o and /dev/null differ diff --git a/kernel/target/debug/incremental/build_script_build-1zltxl9voyqsj/s-h4rtcz7yy3-1t1aos2-d984srxfz1u5ygs8433jsu395/dep-graph.bin b/kernel/target/debug/incremental/build_script_build-1zltxl9voyqsj/s-h4rtcz7yy3-1t1aos2-d984srxfz1u5ygs8433jsu395/dep-graph.bin deleted file mode 100644 index cea0254..0000000 Binary files a/kernel/target/debug/incremental/build_script_build-1zltxl9voyqsj/s-h4rtcz7yy3-1t1aos2-d984srxfz1u5ygs8433jsu395/dep-graph.bin and /dev/null differ diff --git a/kernel/target/debug/incremental/build_script_build-1zltxl9voyqsj/s-h4rtcz7yy3-1t1aos2-d984srxfz1u5ygs8433jsu395/dibtigrdmxtev00agj7kvhw0j.o b/kernel/target/debug/incremental/build_script_build-1zltxl9voyqsj/s-h4rtcz7yy3-1t1aos2-d984srxfz1u5ygs8433jsu395/dibtigrdmxtev00agj7kvhw0j.o deleted file mode 100644 index e280901..0000000 Binary files a/kernel/target/debug/incremental/build_script_build-1zltxl9voyqsj/s-h4rtcz7yy3-1t1aos2-d984srxfz1u5ygs8433jsu395/dibtigrdmxtev00agj7kvhw0j.o and /dev/null differ diff --git a/kernel/target/debug/incremental/build_script_build-1zltxl9voyqsj/s-h4rtcz7yy3-1t1aos2-d984srxfz1u5ygs8433jsu395/dwaqkzp5lpo1p4d3ecd5i8yp8.o b/kernel/target/debug/incremental/build_script_build-1zltxl9voyqsj/s-h4rtcz7yy3-1t1aos2-d984srxfz1u5ygs8433jsu395/dwaqkzp5lpo1p4d3ecd5i8yp8.o deleted file mode 100644 index 3972030..0000000 Binary files a/kernel/target/debug/incremental/build_script_build-1zltxl9voyqsj/s-h4rtcz7yy3-1t1aos2-d984srxfz1u5ygs8433jsu395/dwaqkzp5lpo1p4d3ecd5i8yp8.o and /dev/null differ diff --git a/kernel/target/debug/incremental/build_script_build-1zltxl9voyqsj/s-h4rtcz7yy3-1t1aos2-d984srxfz1u5ygs8433jsu395/eu7i4mu7pdvabcdskpzpsxfk5.o b/kernel/target/debug/incremental/build_script_build-1zltxl9voyqsj/s-h4rtcz7yy3-1t1aos2-d984srxfz1u5ygs8433jsu395/eu7i4mu7pdvabcdskpzpsxfk5.o deleted file mode 100644 index eef8087..0000000 Binary files a/kernel/target/debug/incremental/build_script_build-1zltxl9voyqsj/s-h4rtcz7yy3-1t1aos2-d984srxfz1u5ygs8433jsu395/eu7i4mu7pdvabcdskpzpsxfk5.o and /dev/null differ diff --git a/kernel/target/debug/incremental/build_script_build-1zltxl9voyqsj/s-h4rtcz7yy3-1t1aos2-d984srxfz1u5ygs8433jsu395/query-cache.bin b/kernel/target/debug/incremental/build_script_build-1zltxl9voyqsj/s-h4rtcz7yy3-1t1aos2-d984srxfz1u5ygs8433jsu395/query-cache.bin deleted file mode 100644 index 58796d6..0000000 Binary files a/kernel/target/debug/incremental/build_script_build-1zltxl9voyqsj/s-h4rtcz7yy3-1t1aos2-d984srxfz1u5ygs8433jsu395/query-cache.bin and /dev/null differ diff --git a/kernel/target/debug/incremental/build_script_build-1zltxl9voyqsj/s-h4rtcz7yy3-1t1aos2-d984srxfz1u5ygs8433jsu395/work-products.bin b/kernel/target/debug/incremental/build_script_build-1zltxl9voyqsj/s-h4rtcz7yy3-1t1aos2-d984srxfz1u5ygs8433jsu395/work-products.bin deleted file mode 100644 index 9363c4d..0000000 Binary files a/kernel/target/debug/incremental/build_script_build-1zltxl9voyqsj/s-h4rtcz7yy3-1t1aos2-d984srxfz1u5ygs8433jsu395/work-products.bin and /dev/null differ diff --git a/kernel/target/debug/incremental/build_script_build-1zltxl9voyqsj/s-h4rtcz7yy3-1t1aos2.lock b/kernel/target/debug/incremental/build_script_build-1zltxl9voyqsj/s-h4rtcz7yy3-1t1aos2.lock deleted file mode 100644 index e69de29..0000000 diff --git a/kernel/x86_64-kernel.json b/kernel/x86_64-kernel.json new file mode 100644 index 0000000..8f7231a --- /dev/null +++ b/kernel/x86_64-kernel.json @@ -0,0 +1,30 @@ +{ + "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", + "rustc-abi": "x86-softfloat", + "relocation-model": "static", + "code-model": "kernel", + "pre-link-args": { + "ld.lld": [ + "--script=kernel/linker.ld", + "-nostdlib", + "--no-dynamic-linker", + "-static", + "--no-pie", + "--gc-sections", + "--build-id=none", + "-z", "max-page-size=0x1000" + ] + } +} diff --git a/rust-toolchain.toml b/rust-toolchain.toml new file mode 100644 index 0000000..6484771 --- /dev/null +++ b/rust-toolchain.toml @@ -0,0 +1,4 @@ +[toolchain] +channel = "nightly" +components = ["rust-src", "llvm-tools-preview", "rustfmt", "clippy"] +targets = ["x86_64-unknown-none"]