diff --git a/Makefile b/Makefile index 30d36b1..fedb4af 100644 --- a/Makefile +++ b/Makefile @@ -3,11 +3,11 @@ ARCH?=x86_64 ROOT=$(PWD) export RUST_TARGET_PATH=$(ROOT)/targets -#TODO: Use libssp -export CFLAGS=-nostartfiles -nostdlib -nodefaultlibs \ +export CFLAGS=-static -nostartfiles -nostdlib -nodefaultlibs \ -undef -imacros $(ROOT)/libc-artifacts/define.h \ -isystem $(ROOT)/libc-artifacts/usr/include \ -L $(ROOT)/libc-artifacts/usr/lib \ + $(ROOT)/libc-artifacts/usr/lib/crt0.o -lm -lc -lgcc \ -fno-stack-protector -U_FORTIFY_SOURCE # Kernel variables @@ -23,10 +23,10 @@ KCARGOFLAGS=--target $(KTARGET) --release -- -C soft-float export TARGET=$(ARCH)-unknown-redox BUILD=build/userspace RUSTC=./rustc.sh -RUSTCFLAGS=--target $(TARGET).json -C opt-level=2 -C debuginfo=0 +RUSTCFLAGS=--target $(TARGET) -C opt-level=2 -C debuginfo=0 RUSTDOC=./rustdoc.sh CARGO=RUSTC="$(RUSTC)" RUSTDOC="$(RUSTDOC)" cargo -CARGOFLAGS=--target $(TARGET).json --release -- +CARGOFLAGS=--target $(TARGET) --release -- # Default targets .PHONY: all live iso clean doc ref test update pull qemu bochs drivers schemes binutils coreutils extrautils netutils userutils wireshark FORCE @@ -40,8 +40,8 @@ iso: build/livedisk.iso FORCE: clean: - cargo clean cargo clean --manifest-path rust/src/libstd/Cargo.toml + cargo clean --manifest-path kernel/Cargo.toml cargo clean --manifest-path drivers/ahcid/Cargo.toml cargo clean --manifest-path drivers/e1000d/Cargo.toml cargo clean --manifest-path drivers/ps2d/Cargo.toml @@ -82,7 +82,7 @@ doc: \ #FORCE to let cargo decide if docs need updating doc-kernel: $(KBUILD)/libkernel.a FORCE - $(KCARGO) doc --target $(KTARGET).json + $(KCARGO) doc --target $(KTARGET).json --manifest-path kernel/Cargo.toml doc-std: $(BUILD)/libstd.rlib FORCE $(CARGO) doc --target $(TARGET).json --manifest-path rust/src/libstd/Cargo.toml @@ -96,8 +96,8 @@ ref: FORCE cargo run --manifest-path crates/docgen/Cargo.toml -- programs/netutils/src/ filesystem/ref/ test: - cargo test cargo test --manifest-path rust/src/libstd/Cargo.toml + cargo test --manifest-path kernel/Cargo.toml cargo test --manifest-path drivers/ahcid/Cargo.toml cargo test --manifest-path drivers/e1000d/Cargo.toml cargo test --manifest-path drivers/ps2d/Cargo.toml @@ -129,8 +129,8 @@ test: cargo test --manifest-path schemes/udpd/Cargo.toml update: - cargo update - cargo update --manifest-path rust/src/libstd/Cargo.toml + #cargo update --manifest-path rust/src/libstd/Cargo.toml + cargo update --manifest-path kernel/Cargo.toml cargo update --manifest-path drivers/ahcid/Cargo.toml cargo update --manifest-path drivers/e1000d/Cargo.toml cargo update --manifest-path drivers/ps2d/Cargo.toml @@ -350,17 +350,17 @@ $(KBUILD)/libstd_unicode.rlib: rust/src/libstd_unicode/lib.rs $(KBUILD)/libcore. $(KBUILD)/libcollections.rlib: rust/src/libcollections/lib.rs $(KBUILD)/libcore.rlib $(KBUILD)/liballoc.rlib $(KBUILD)/libstd_unicode.rlib $(KRUSTC) $(KRUSTCFLAGS) -o $@ $< -$(KBUILD)/libkernel.a: kernel/** $(KBUILD)/libcore.rlib $(KBUILD)/liballoc.rlib $(KBUILD)/libcollections.rlib $(BUILD)/initfs.rs - $(KCARGO) rustc $(KCARGOFLAGS) -C lto -o $@ +$(KBUILD)/libkernel.a: kernel/Cargo.toml kernel/arch/** kernel/src/** $(KBUILD)/libcore.rlib $(KBUILD)/liballoc.rlib $(KBUILD)/libcollections.rlib $(BUILD)/initfs.rs + $(KCARGO) rustc --manifest-path $< --lib $(KCARGOFLAGS) -C lto --emit obj=$@ -$(KBUILD)/libkernel_live.a: kernel/** $(KBUILD)/libcore.rlib $(KBUILD)/liballoc.rlib $(KBUILD)/libcollections.rlib $(BUILD)/initfs.rs build/filesystem.bin - $(KCARGO) rustc --lib $(KCARGOFLAGS) --cfg 'feature="live"' -C lto --emit obj=$@ +$(KBUILD)/libkernel_live.a: kernel/Cargo.toml kernel/arch/** kernel/src/** $(KBUILD)/libcore.rlib $(KBUILD)/liballoc.rlib $(KBUILD)/libcollections.rlib $(BUILD)/initfs.rs build/filesystem.bin + $(KCARGO) rustc --manifest-path $< --lib $(KCARGOFLAGS) --cfg 'feature="live"' -C lto --emit obj=$@ $(KBUILD)/kernel: $(KBUILD)/libkernel.a - $(LD) $(LDFLAGS) -z max-page-size=0x1000 -T arch/$(ARCH)/src/linker.ld -o $@ $< + $(LD) $(LDFLAGS) -z max-page-size=0x1000 -T kernel/arch/$(ARCH)/src/linker.ld -o $@ $< $(KBUILD)/kernel_live: $(KBUILD)/libkernel_live.a - $(LD) $(LDFLAGS) -z max-page-size=0x1000 -T arch/$(ARCH)/src/linker.ld -o $@ $< + $(LD) $(LDFLAGS) -z max-page-size=0x1000 -T kernel/arch/$(ARCH)/src/linker.ld -o $@ $< # Userspace recipes $(BUILD)/libstd.rlib: rust/src/libstd/Cargo.toml rust/src/libstd/** diff --git a/arm-unknown-redox.json b/arm-unknown-redox.json deleted file mode 100644 index 6089ab1..0000000 --- a/arm-unknown-redox.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "llvm-target": "arm-unknown-redox", - "target-endian": "little", - "target-pointer-width": "32", - "data-layout": "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", - "arch": "arm", - "os": "redox", - "env": "", - "vendor": "unknown", - "target-family": "redox", - "pre-link-args": ["-nostdlib", "-static"], - "features": "+soft-float", - "dynamic-linking": false, - "executables": true, - "relocation-model": "static", - "code-model": "default", - "disable-redzone": true, - "eliminate-frame-pointer": false, - "exe-suffix": "", - "has-rpath": false, - "no-compiler-rt": true, - "no-default-libraries": true, - "position-independent-executables": false, - "has-elf-tls": true, - "panic-strategy": "abort" -} diff --git a/Cargo.toml b/kernel/Cargo.toml similarity index 90% rename from Cargo.toml rename to kernel/Cargo.toml index 5c3c138..8fd747e 100644 --- a/Cargo.toml +++ b/kernel/Cargo.toml @@ -4,13 +4,13 @@ version = "0.1.0" [lib] name = "kernel" -path = "kernel/lib.rs" +path = "src/lib.rs" crate-type = ["staticlib"] [dependencies] bitflags = "*" spin = "*" -redox_syscall = { path = "syscall/" } +redox_syscall = { path = "../syscall/" } [dependencies.goblin] git = "https://github.com/m4b/goblin.git" diff --git a/arch/arm/Cargo.toml b/kernel/arch/arm/Cargo.toml similarity index 55% rename from arch/arm/Cargo.toml rename to kernel/arch/arm/Cargo.toml index deadc75..d477d18 100644 --- a/arch/arm/Cargo.toml +++ b/kernel/arch/arm/Cargo.toml @@ -4,5 +4,5 @@ version = "0.1.0" [dependencies] bitflags = "*" -hole_list_allocator = { path = "../../crates/hole_list_allocator"} +hole_list_allocator = { path = "../../../crates/hole_list_allocator"} spin = "*" diff --git a/arch/arm/src/context.rs b/kernel/arch/arm/src/context.rs similarity index 100% rename from arch/arm/src/context.rs rename to kernel/arch/arm/src/context.rs diff --git a/arch/arm/src/externs.rs b/kernel/arch/arm/src/externs.rs similarity index 100% rename from arch/arm/src/externs.rs rename to kernel/arch/arm/src/externs.rs diff --git a/arch/arm/src/interrupt.rs b/kernel/arch/arm/src/interrupt.rs similarity index 100% rename from arch/arm/src/interrupt.rs rename to kernel/arch/arm/src/interrupt.rs diff --git a/arch/arm/src/lib.rs b/kernel/arch/arm/src/lib.rs similarity index 100% rename from arch/arm/src/lib.rs rename to kernel/arch/arm/src/lib.rs diff --git a/arch/arm/src/linker.ld b/kernel/arch/arm/src/linker.ld similarity index 100% rename from arch/arm/src/linker.ld rename to kernel/arch/arm/src/linker.ld diff --git a/arch/arm/src/panic.rs b/kernel/arch/arm/src/panic.rs similarity index 100% rename from arch/arm/src/panic.rs rename to kernel/arch/arm/src/panic.rs diff --git a/arch/arm/src/start.rs b/kernel/arch/arm/src/start.rs similarity index 100% rename from arch/arm/src/start.rs rename to kernel/arch/arm/src/start.rs diff --git a/arch/test/Cargo.toml b/kernel/arch/test/Cargo.toml similarity index 100% rename from arch/test/Cargo.toml rename to kernel/arch/test/Cargo.toml diff --git a/arch/test/src/interrupt.rs b/kernel/arch/test/src/interrupt.rs similarity index 100% rename from arch/test/src/interrupt.rs rename to kernel/arch/test/src/interrupt.rs diff --git a/arch/test/src/lib.rs b/kernel/arch/test/src/lib.rs similarity index 100% rename from arch/test/src/lib.rs rename to kernel/arch/test/src/lib.rs diff --git a/arch/test/src/main.rs b/kernel/arch/test/src/main.rs similarity index 100% rename from arch/test/src/main.rs rename to kernel/arch/test/src/main.rs diff --git a/arch/test/src/time.rs b/kernel/arch/test/src/time.rs similarity index 100% rename from arch/test/src/time.rs rename to kernel/arch/test/src/time.rs diff --git a/arch/x86_64/Cargo.toml b/kernel/arch/x86_64/Cargo.toml similarity index 57% rename from arch/x86_64/Cargo.toml rename to kernel/arch/x86_64/Cargo.toml index 695a907..a255e4d 100644 --- a/arch/x86_64/Cargo.toml +++ b/kernel/arch/x86_64/Cargo.toml @@ -4,11 +4,11 @@ version = "0.1.0" [dependencies] bitflags = "*" -hole_list_allocator = { path = "../../crates/hole_list_allocator/" } -io = { path = "../../crates/io/" } +hole_list_allocator = { path = "../../../crates/hole_list_allocator/" } +io = { path = "../../../crates/io/" } raw-cpuid = { git = "https://github.com/gz/rust-cpuid" } spin = "*" -redox_syscall = { path = "../../syscall/" } +redox_syscall = { path = "../../../syscall/" } [dependencies.x86] version = "0.7" diff --git a/arch/x86_64/src/acpi/dmar/drhd.rs b/kernel/arch/x86_64/src/acpi/dmar/drhd.rs similarity index 100% rename from arch/x86_64/src/acpi/dmar/drhd.rs rename to kernel/arch/x86_64/src/acpi/dmar/drhd.rs diff --git a/arch/x86_64/src/acpi/dmar/mod.rs b/kernel/arch/x86_64/src/acpi/dmar/mod.rs similarity index 100% rename from arch/x86_64/src/acpi/dmar/mod.rs rename to kernel/arch/x86_64/src/acpi/dmar/mod.rs diff --git a/arch/x86_64/src/acpi/fadt.rs b/kernel/arch/x86_64/src/acpi/fadt.rs similarity index 100% rename from arch/x86_64/src/acpi/fadt.rs rename to kernel/arch/x86_64/src/acpi/fadt.rs diff --git a/arch/x86_64/src/acpi/madt.rs b/kernel/arch/x86_64/src/acpi/madt.rs similarity index 100% rename from arch/x86_64/src/acpi/madt.rs rename to kernel/arch/x86_64/src/acpi/madt.rs diff --git a/arch/x86_64/src/acpi/mod.rs b/kernel/arch/x86_64/src/acpi/mod.rs similarity index 100% rename from arch/x86_64/src/acpi/mod.rs rename to kernel/arch/x86_64/src/acpi/mod.rs diff --git a/arch/x86_64/src/acpi/rsdt.rs b/kernel/arch/x86_64/src/acpi/rsdt.rs similarity index 100% rename from arch/x86_64/src/acpi/rsdt.rs rename to kernel/arch/x86_64/src/acpi/rsdt.rs diff --git a/arch/x86_64/src/acpi/sdt.rs b/kernel/arch/x86_64/src/acpi/sdt.rs similarity index 100% rename from arch/x86_64/src/acpi/sdt.rs rename to kernel/arch/x86_64/src/acpi/sdt.rs diff --git a/arch/x86_64/src/acpi/xsdt.rs b/kernel/arch/x86_64/src/acpi/xsdt.rs similarity index 100% rename from arch/x86_64/src/acpi/xsdt.rs rename to kernel/arch/x86_64/src/acpi/xsdt.rs diff --git a/arch/x86_64/src/console.rs b/kernel/arch/x86_64/src/console.rs similarity index 100% rename from arch/x86_64/src/console.rs rename to kernel/arch/x86_64/src/console.rs diff --git a/arch/x86_64/src/context.rs b/kernel/arch/x86_64/src/context.rs similarity index 100% rename from arch/x86_64/src/context.rs rename to kernel/arch/x86_64/src/context.rs diff --git a/arch/x86_64/src/device/cpu.rs b/kernel/arch/x86_64/src/device/cpu.rs similarity index 100% rename from arch/x86_64/src/device/cpu.rs rename to kernel/arch/x86_64/src/device/cpu.rs diff --git a/arch/x86_64/src/device/local_apic.rs b/kernel/arch/x86_64/src/device/local_apic.rs similarity index 100% rename from arch/x86_64/src/device/local_apic.rs rename to kernel/arch/x86_64/src/device/local_apic.rs diff --git a/arch/x86_64/src/device/mod.rs b/kernel/arch/x86_64/src/device/mod.rs similarity index 100% rename from arch/x86_64/src/device/mod.rs rename to kernel/arch/x86_64/src/device/mod.rs diff --git a/arch/x86_64/src/device/rtc.rs b/kernel/arch/x86_64/src/device/rtc.rs similarity index 100% rename from arch/x86_64/src/device/rtc.rs rename to kernel/arch/x86_64/src/device/rtc.rs diff --git a/arch/x86_64/src/device/serial.rs b/kernel/arch/x86_64/src/device/serial.rs similarity index 100% rename from arch/x86_64/src/device/serial.rs rename to kernel/arch/x86_64/src/device/serial.rs diff --git a/arch/x86_64/src/externs.rs b/kernel/arch/x86_64/src/externs.rs similarity index 100% rename from arch/x86_64/src/externs.rs rename to kernel/arch/x86_64/src/externs.rs diff --git a/arch/x86_64/src/gdt.rs b/kernel/arch/x86_64/src/gdt.rs similarity index 100% rename from arch/x86_64/src/gdt.rs rename to kernel/arch/x86_64/src/gdt.rs diff --git a/arch/x86_64/src/idt.rs b/kernel/arch/x86_64/src/idt.rs similarity index 100% rename from arch/x86_64/src/idt.rs rename to kernel/arch/x86_64/src/idt.rs diff --git a/arch/x86_64/src/interrupt/exception.rs b/kernel/arch/x86_64/src/interrupt/exception.rs similarity index 100% rename from arch/x86_64/src/interrupt/exception.rs rename to kernel/arch/x86_64/src/interrupt/exception.rs diff --git a/arch/x86_64/src/interrupt/ipi.rs b/kernel/arch/x86_64/src/interrupt/ipi.rs similarity index 100% rename from arch/x86_64/src/interrupt/ipi.rs rename to kernel/arch/x86_64/src/interrupt/ipi.rs diff --git a/arch/x86_64/src/interrupt/irq.rs b/kernel/arch/x86_64/src/interrupt/irq.rs similarity index 100% rename from arch/x86_64/src/interrupt/irq.rs rename to kernel/arch/x86_64/src/interrupt/irq.rs diff --git a/arch/x86_64/src/interrupt/mod.rs b/kernel/arch/x86_64/src/interrupt/mod.rs similarity index 100% rename from arch/x86_64/src/interrupt/mod.rs rename to kernel/arch/x86_64/src/interrupt/mod.rs diff --git a/arch/x86_64/src/interrupt/syscall.rs b/kernel/arch/x86_64/src/interrupt/syscall.rs similarity index 100% rename from arch/x86_64/src/interrupt/syscall.rs rename to kernel/arch/x86_64/src/interrupt/syscall.rs diff --git a/arch/x86_64/src/lib.rs b/kernel/arch/x86_64/src/lib.rs similarity index 100% rename from arch/x86_64/src/lib.rs rename to kernel/arch/x86_64/src/lib.rs diff --git a/arch/x86_64/src/linker.ld b/kernel/arch/x86_64/src/linker.ld similarity index 100% rename from arch/x86_64/src/linker.ld rename to kernel/arch/x86_64/src/linker.ld diff --git a/arch/x86_64/src/memory/area_frame_allocator.rs b/kernel/arch/x86_64/src/memory/area_frame_allocator.rs similarity index 100% rename from arch/x86_64/src/memory/area_frame_allocator.rs rename to kernel/arch/x86_64/src/memory/area_frame_allocator.rs diff --git a/arch/x86_64/src/memory/mod.rs b/kernel/arch/x86_64/src/memory/mod.rs similarity index 100% rename from arch/x86_64/src/memory/mod.rs rename to kernel/arch/x86_64/src/memory/mod.rs diff --git a/arch/x86_64/src/paging/entry.rs b/kernel/arch/x86_64/src/paging/entry.rs similarity index 100% rename from arch/x86_64/src/paging/entry.rs rename to kernel/arch/x86_64/src/paging/entry.rs diff --git a/arch/x86_64/src/paging/mapper.rs b/kernel/arch/x86_64/src/paging/mapper.rs similarity index 100% rename from arch/x86_64/src/paging/mapper.rs rename to kernel/arch/x86_64/src/paging/mapper.rs diff --git a/arch/x86_64/src/paging/mod.rs b/kernel/arch/x86_64/src/paging/mod.rs similarity index 100% rename from arch/x86_64/src/paging/mod.rs rename to kernel/arch/x86_64/src/paging/mod.rs diff --git a/arch/x86_64/src/paging/table.rs b/kernel/arch/x86_64/src/paging/table.rs similarity index 100% rename from arch/x86_64/src/paging/table.rs rename to kernel/arch/x86_64/src/paging/table.rs diff --git a/arch/x86_64/src/paging/temporary_page.rs b/kernel/arch/x86_64/src/paging/temporary_page.rs similarity index 100% rename from arch/x86_64/src/paging/temporary_page.rs rename to kernel/arch/x86_64/src/paging/temporary_page.rs diff --git a/arch/x86_64/src/panic.rs b/kernel/arch/x86_64/src/panic.rs similarity index 100% rename from arch/x86_64/src/panic.rs rename to kernel/arch/x86_64/src/panic.rs diff --git a/arch/x86_64/src/start.rs b/kernel/arch/x86_64/src/start.rs similarity index 100% rename from arch/x86_64/src/start.rs rename to kernel/arch/x86_64/src/start.rs diff --git a/arch/x86_64/src/stop.rs b/kernel/arch/x86_64/src/stop.rs similarity index 100% rename from arch/x86_64/src/stop.rs rename to kernel/arch/x86_64/src/stop.rs diff --git a/arch/x86_64/src/time.rs b/kernel/arch/x86_64/src/time.rs similarity index 100% rename from arch/x86_64/src/time.rs rename to kernel/arch/x86_64/src/time.rs diff --git a/kernel/common/int_like.rs b/kernel/src/common/int_like.rs similarity index 100% rename from kernel/common/int_like.rs rename to kernel/src/common/int_like.rs diff --git a/kernel/common/mod.rs b/kernel/src/common/mod.rs similarity index 100% rename from kernel/common/mod.rs rename to kernel/src/common/mod.rs diff --git a/kernel/context/context.rs b/kernel/src/context/context.rs similarity index 100% rename from kernel/context/context.rs rename to kernel/src/context/context.rs diff --git a/kernel/context/event.rs b/kernel/src/context/event.rs similarity index 100% rename from kernel/context/event.rs rename to kernel/src/context/event.rs diff --git a/kernel/context/file.rs b/kernel/src/context/file.rs similarity index 100% rename from kernel/context/file.rs rename to kernel/src/context/file.rs diff --git a/kernel/context/list.rs b/kernel/src/context/list.rs similarity index 100% rename from kernel/context/list.rs rename to kernel/src/context/list.rs diff --git a/kernel/context/memory.rs b/kernel/src/context/memory.rs similarity index 100% rename from kernel/context/memory.rs rename to kernel/src/context/memory.rs diff --git a/kernel/context/mod.rs b/kernel/src/context/mod.rs similarity index 100% rename from kernel/context/mod.rs rename to kernel/src/context/mod.rs diff --git a/kernel/context/switch.rs b/kernel/src/context/switch.rs similarity index 100% rename from kernel/context/switch.rs rename to kernel/src/context/switch.rs diff --git a/kernel/elf.rs b/kernel/src/elf.rs similarity index 100% rename from kernel/elf.rs rename to kernel/src/elf.rs diff --git a/kernel/lib.rs b/kernel/src/lib.rs similarity index 100% rename from kernel/lib.rs rename to kernel/src/lib.rs diff --git a/kernel/scheme/debug.rs b/kernel/src/scheme/debug.rs similarity index 100% rename from kernel/scheme/debug.rs rename to kernel/src/scheme/debug.rs diff --git a/kernel/scheme/env.rs b/kernel/src/scheme/env.rs similarity index 100% rename from kernel/scheme/env.rs rename to kernel/src/scheme/env.rs diff --git a/kernel/scheme/event.rs b/kernel/src/scheme/event.rs similarity index 100% rename from kernel/scheme/event.rs rename to kernel/src/scheme/event.rs diff --git a/kernel/scheme/initfs.rs b/kernel/src/scheme/initfs.rs similarity index 99% rename from kernel/scheme/initfs.rs rename to kernel/src/scheme/initfs.rs index 6355928..0bd3790 100644 --- a/kernel/scheme/initfs.rs +++ b/kernel/src/scheme/initfs.rs @@ -15,7 +15,7 @@ mod gen { } #[cfg(not(test))] -#[path="../../build/userspace/initfs.rs"] +#[path="../../../build/userspace/initfs.rs"] mod gen; struct Handle { diff --git a/kernel/scheme/irq.rs b/kernel/src/scheme/irq.rs similarity index 100% rename from kernel/scheme/irq.rs rename to kernel/src/scheme/irq.rs diff --git a/kernel/scheme/live.rs b/kernel/src/scheme/live.rs similarity index 98% rename from kernel/scheme/live.rs rename to kernel/src/scheme/live.rs index e9ac3b8..c3f77ff 100644 --- a/kernel/scheme/live.rs +++ b/kernel/src/scheme/live.rs @@ -11,7 +11,7 @@ use syscall::error::*; use syscall::flag::{MODE_FILE, SEEK_SET, SEEK_CUR, SEEK_END}; use syscall::scheme::Scheme; -static FILESYSTEM: &'static [u8] = include_bytes!("../../build/filesystem.bin"); +static FILESYSTEM: &'static [u8] = include_bytes!("../../../build/filesystem.bin"); struct Handle { path: &'static [u8], diff --git a/kernel/scheme/memory.rs b/kernel/src/scheme/memory.rs similarity index 100% rename from kernel/scheme/memory.rs rename to kernel/src/scheme/memory.rs diff --git a/kernel/scheme/mod.rs b/kernel/src/scheme/mod.rs similarity index 100% rename from kernel/scheme/mod.rs rename to kernel/src/scheme/mod.rs diff --git a/kernel/scheme/null.rs b/kernel/src/scheme/null.rs similarity index 100% rename from kernel/scheme/null.rs rename to kernel/src/scheme/null.rs diff --git a/kernel/scheme/pipe.rs b/kernel/src/scheme/pipe.rs similarity index 100% rename from kernel/scheme/pipe.rs rename to kernel/src/scheme/pipe.rs diff --git a/kernel/scheme/root.rs b/kernel/src/scheme/root.rs similarity index 100% rename from kernel/scheme/root.rs rename to kernel/src/scheme/root.rs diff --git a/kernel/scheme/sys/context.rs b/kernel/src/scheme/sys/context.rs similarity index 100% rename from kernel/scheme/sys/context.rs rename to kernel/src/scheme/sys/context.rs diff --git a/kernel/scheme/sys/cpu.rs b/kernel/src/scheme/sys/cpu.rs similarity index 100% rename from kernel/scheme/sys/cpu.rs rename to kernel/src/scheme/sys/cpu.rs diff --git a/kernel/scheme/sys/exe.rs b/kernel/src/scheme/sys/exe.rs similarity index 100% rename from kernel/scheme/sys/exe.rs rename to kernel/src/scheme/sys/exe.rs diff --git a/kernel/scheme/sys/mod.rs b/kernel/src/scheme/sys/mod.rs similarity index 100% rename from kernel/scheme/sys/mod.rs rename to kernel/src/scheme/sys/mod.rs diff --git a/kernel/scheme/sys/scheme.rs b/kernel/src/scheme/sys/scheme.rs similarity index 100% rename from kernel/scheme/sys/scheme.rs rename to kernel/src/scheme/sys/scheme.rs diff --git a/kernel/scheme/user.rs b/kernel/src/scheme/user.rs similarity index 100% rename from kernel/scheme/user.rs rename to kernel/src/scheme/user.rs diff --git a/kernel/scheme/zero.rs b/kernel/src/scheme/zero.rs similarity index 100% rename from kernel/scheme/zero.rs rename to kernel/src/scheme/zero.rs diff --git a/kernel/sync/mod.rs b/kernel/src/sync/mod.rs similarity index 100% rename from kernel/sync/mod.rs rename to kernel/src/sync/mod.rs diff --git a/kernel/sync/wait_condition.rs b/kernel/src/sync/wait_condition.rs similarity index 100% rename from kernel/sync/wait_condition.rs rename to kernel/src/sync/wait_condition.rs diff --git a/kernel/sync/wait_map.rs b/kernel/src/sync/wait_map.rs similarity index 100% rename from kernel/sync/wait_map.rs rename to kernel/src/sync/wait_map.rs diff --git a/kernel/sync/wait_queue.rs b/kernel/src/sync/wait_queue.rs similarity index 100% rename from kernel/sync/wait_queue.rs rename to kernel/src/sync/wait_queue.rs diff --git a/kernel/syscall/driver.rs b/kernel/src/syscall/driver.rs similarity index 100% rename from kernel/syscall/driver.rs rename to kernel/src/syscall/driver.rs diff --git a/kernel/syscall/fs.rs b/kernel/src/syscall/fs.rs similarity index 100% rename from kernel/syscall/fs.rs rename to kernel/src/syscall/fs.rs diff --git a/kernel/syscall/futex.rs b/kernel/src/syscall/futex.rs similarity index 100% rename from kernel/syscall/futex.rs rename to kernel/src/syscall/futex.rs diff --git a/kernel/syscall/mod.rs b/kernel/src/syscall/mod.rs similarity index 100% rename from kernel/syscall/mod.rs rename to kernel/src/syscall/mod.rs diff --git a/kernel/syscall/privilege.rs b/kernel/src/syscall/privilege.rs similarity index 100% rename from kernel/syscall/privilege.rs rename to kernel/src/syscall/privilege.rs diff --git a/kernel/syscall/process.rs b/kernel/src/syscall/process.rs similarity index 100% rename from kernel/syscall/process.rs rename to kernel/src/syscall/process.rs diff --git a/kernel/syscall/time.rs b/kernel/src/syscall/time.rs similarity index 100% rename from kernel/syscall/time.rs rename to kernel/src/syscall/time.rs diff --git a/kernel/syscall/validate.rs b/kernel/src/syscall/validate.rs similarity index 100% rename from kernel/syscall/validate.rs rename to kernel/src/syscall/validate.rs diff --git a/kernel/tests/mod.rs b/kernel/src/tests/mod.rs similarity index 100% rename from kernel/tests/mod.rs rename to kernel/src/tests/mod.rs diff --git a/rust b/rust index 57950fa..c6858a1 160000 --- a/rust +++ b/rust @@ -1 +1 @@ -Subproject commit 57950faeb68754451f94062c11e3fcf830392025 +Subproject commit c6858a1429895f27b4daafde9295deb494e2e29c diff --git a/x86_64-unknown-redox.json b/x86_64-unknown-redox.json deleted file mode 100644 index d9df631..0000000 --- a/x86_64-unknown-redox.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "llvm-target": "x86_64-unknown-redox", - "target-endian": "little", - "target-pointer-width": "64", - "data-layout": "e-m:e-i64:64-f80:128-n8:16:32:64-S128", - "arch": "x86_64", - "os": "redox", - "env": "", - "vendor": "unknown", - "target-family": "redox", - "pre-link-args": ["-m64", "-Wl,--as-needed", "-Wl,-z,noexecstack", "-nostartfiles", "-nostdlib", "-static"], - "late-link-args": ["libc-artifacts/usr/lib/crt0.o", "libc-artifacts/usr/lib/libm.a", "libc-artifacts/usr/lib/libc.a", "libc-artifacts/usr/lib/libgcc.a"], - "features": "", - "dynamic-linking": false, - "executables": true, - "relocation-model": "static", - "code-model": "default", - "disable-redzone": true, - "eliminate-frame-pointer": false, - "exe-suffix": "", - "has-rpath": false, - "no-compiler-rt": true, - "no-default-libraries": true, - "position-independent-executables": false, - "lib-allocation-crate": "alloc_system", - "exe-allocation-crate": "alloc_system", - "has-elf-tls": true, - "panic-strategy": "abort" -}