Daniel Samson
60f32ee9ff
The one giant `runtime` module (with a `system.zig` that was itself a dumping ground of unrelated syscalls) is split into directly-importable, flat concern modules under library/kernel/: system-call ipc memory process thread time logging file-system service start (+ the device/service clients: device, device-manager, block, display, input) system.zig is dissolved — its functions moved to their concern home (mmap -> memory, spawn/kill/exit -> process, sleep/clock -> time, write/klog -> logging, fs* -> file-system). `memory` merges heap+dma+shared-memory behind one flat API (memory.allocator/dmaAlloc/sharedCreate/mmap), keeping heap's state and malloc export single. The memory<->thread dependency cycle (heap needs Thread.Mutex, thread needs mmap) is broken by having thread allocate its own stack via the raw mmap syscall, so the module graph is a DAG. This is the atomic step: all 42 internal cross-imports flip from relative to module imports at once. `runtime.zig` and `system.zig` become thin re-export SHIMS so the ~38 consumers keep compiling on `runtime.*` untouched; they migrate to direct imports in C2, after which the shims are deleted (C5). zig build + zig build test green; 14 QEMU cases pass (smoke, process, process-kill, thread-spawn/join, logger, vfs, fat-mount, display-native, usb-storage, virtio-gpu, device-manager, input, power-button).
49 lines
2.1 KiB
Zig
49 lines
2.1 KiB
Zig
//! library/kernel/memory — the process's memory interface: the heap allocator, DMA-capable
|
|
//! buffers, shared-memory regions, and the raw `mmap` grant they all sit on. One flat module
|
|
//! (formerly runtime.heap / runtime.dma / runtime.shared_memory, plus the `mmap` wrappers that
|
|
//! lived in the system.zig dumping ground). Its private files are heap.zig, dma.zig, and
|
|
//! shared-memory.zig — imported only here, so the heap's state and C symbols exist once.
|
|
|
|
const abi = @import("abi");
|
|
const sc = @import("system-call");
|
|
const heap = @import("heap.zig");
|
|
const dma = @import("dma.zig");
|
|
const shared = @import("shared-memory.zig");
|
|
|
|
// --- the heap: a std.mem.Allocator over a first-fit free list (C malloc/free are also
|
|
// exported from heap.zig, compiled once here) ---
|
|
pub const allocator = heap.allocator;
|
|
|
|
// --- the raw grant every allocation sits on ---
|
|
pub const PROT_READ: usize = abi.prot_read;
|
|
pub const PROT_WRITE: usize = abi.prot_write;
|
|
pub const PROT_EXEC: usize = abi.prot_exec;
|
|
|
|
/// Grant `len` bytes (rounded up to whole pages) of fresh, zeroed, writable memory and
|
|
/// return the base virtual address. On failure returns a value in the top page (`mmapFailed`).
|
|
pub fn mmap(len: usize, prot: usize) usize {
|
|
return sc.systemCall2(.mmap, len, prot);
|
|
}
|
|
/// Release a range previously handed out by `mmap`.
|
|
pub fn munmap(base: usize, len: usize) usize {
|
|
return sc.systemCall2(.munmap, base, len);
|
|
}
|
|
/// Whether an `mmap` return value is an error (a wrapped -errno lands in the top page).
|
|
pub inline fn mmapFailed(ret: usize) bool {
|
|
return ret > ~@as(usize, 0) - 4095;
|
|
}
|
|
|
|
// --- DMA-capable buffers: physically contiguous, pinned, uncacheable, physical address known ---
|
|
pub const DmaRegion = dma.Region;
|
|
pub const dma_coherent = dma.coherent;
|
|
pub const dma_write_combining = dma.write_combining;
|
|
pub const dma_below_4g = dma.below_4g;
|
|
pub const dmaAlloc = dma.alloc;
|
|
pub const dmaFree = dma.free;
|
|
|
|
// --- shared-memory regions: a capability handed to another process over an ipc_call send_cap ---
|
|
pub const SharedRegion = shared.Region;
|
|
pub const sharedCreate = shared.create;
|
|
pub const sharedMap = shared.map;
|
|
pub const sharedPhysical = shared.physical;
|