Daniel Samson
8754d4e46a
The source layout now mirrors the runtime filesystem hierarchy
(docs/danos-file-system-hierarchy-FSH.md): what lives under system/ in the
source is what a running danos represents under /system. Each service and
driver is a sub-project directory that is its own Zig module — cross-project
references go by module name, never by a path into another project's files.
Moves (all git mv, history preserved):
- src/ -> system/ (danos internals; the self-representation)
root.zig -> danos.zig (the kernel<->user contract module)
kernel/arch/ -> kernel/architecture/ (arch -> architecture)
device/ -> devices/ (what /system/devices reflects)
boot/ -> /boot (the loaders, top level)
- sbin/ -> split by role:
init, vfs -> system/services/<name>/<name>.zig
hpetd, busd -> system/drivers/<name>/<name>.zig
vfs-test -> system/services/vfs/vfs-test.zig (inside the vfs project)
- lib/ -> library/runtime/ (room for other libraries beside runtime)
The VFS wire protocol becomes its own module, system/services/vfs/protocol.zig
("vfs-protocol"): the vfs sub-project exposes its interface, and the runtime's
file layer imports it by name. First instance of the "protocol module" pattern
(docs/driver-model.md); usb/block will expose theirs the same way.
Also: fix a naming-standard violation in the protocol — Op -> Operation (and
req -> request, _pad -> _padding). Docs updated: /system/services added to the
FHS doc, a repository-layout section added to the docs index, and stale source
paths swept across comments and docs.
Runtime boot paths are unchanged (the bootloader still loads /sbin/init);
aligning the runtime filesystem to the FHS is a separate follow-up. Suite 35/35
plus host tests green.
69 lines
1.6 KiB
Zig
69 lines
1.6 KiB
Zig
//! x86 port I/O and model-specific registers — the low-level primitives the
|
|
//! serial port and the APIC talk to hardware through.
|
|
|
|
pub fn outb(port: u16, value: u8) void {
|
|
asm volatile ("outb %[value], %[port]"
|
|
:
|
|
: [value] "{al}" (value),
|
|
[port] "{dx}" (port),
|
|
);
|
|
}
|
|
|
|
pub fn inb(port: u16) u8 {
|
|
return asm volatile ("inb %[port], %[value]"
|
|
: [value] "={al}" (-> u8),
|
|
: [port] "{dx}" (port),
|
|
);
|
|
}
|
|
|
|
pub fn outw(port: u16, value: u16) void {
|
|
asm volatile ("outw %[value], %[port]"
|
|
:
|
|
: [value] "{ax}" (value),
|
|
[port] "{dx}" (port),
|
|
);
|
|
}
|
|
|
|
pub fn inw(port: u16) u16 {
|
|
return asm volatile ("inw %[port], %[value]"
|
|
: [value] "={ax}" (-> u16),
|
|
: [port] "{dx}" (port),
|
|
);
|
|
}
|
|
|
|
pub fn outl(port: u16, value: u32) void {
|
|
asm volatile ("outl %[value], %[port]"
|
|
:
|
|
: [value] "{eax}" (value),
|
|
[port] "{dx}" (port),
|
|
);
|
|
}
|
|
|
|
pub fn inl(port: u16) u32 {
|
|
return asm volatile ("inl %[port], %[value]"
|
|
: [value] "={eax}" (-> u32),
|
|
: [port] "{dx}" (port),
|
|
);
|
|
}
|
|
|
|
/// Read a model-specific register (returns edx:eax combined).
|
|
pub fn rdmsr(msr: u32) u64 {
|
|
var low: u32 = undefined;
|
|
var high: u32 = undefined;
|
|
asm volatile ("rdmsr"
|
|
: [low] "={eax}" (low),
|
|
[high] "={edx}" (high),
|
|
: [msr] "{ecx}" (msr),
|
|
);
|
|
return (@as(u64, high) << 32) | low;
|
|
}
|
|
|
|
pub fn wrmsr(msr: u32, value: u64) void {
|
|
asm volatile ("wrmsr"
|
|
:
|
|
: [msr] "{ecx}" (msr),
|
|
[low] "{eax}" (@as(u32, @truncate(value))),
|
|
[high] "{edx}" (@as(u32, @truncate(value >> 32))),
|
|
);
|
|
}
|