pzittlau/flicker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wip

Browse Source
This commit is contained in:
Pascal Zittlau
2026-02-23 09:42:24 +01:00
parent d25cf59380
commit d9ecdb689d
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main.zig
View File

@@ -221,6 +221,8 @@ fn loadStaticElf(ehdr: elf.Header, file_reader: *std.fs.File.Reader) !usize {
.{ phdr_idx, start, start + size, phdr.p_vaddr, base_for_dyn }, .{ phdr_idx, start, start + size, phdr.p_vaddr, base_for_dyn },
); );
const ptr: []align(page_size) u8 = @as([*]align(page_size) u8, @ptrFromInt(start))[0..size]; const ptr: []align(page_size) u8 = @as([*]align(page_size) u8, @ptrFromInt(start))[0..size];
// TODO: we should likely just use mmap instead because then not touched memory isn't loaded
// unnecessarily
try file_reader.seekTo(phdr.p_offset); try file_reader.seekTo(phdr.p_offset);
if (try file_reader.read(ptr[offset..][0..phdr.p_filesz]) != phdr.p_filesz) if (try file_reader.read(ptr[offset..][0..phdr.p_filesz]) != phdr.p_filesz)
return UnfinishedReadError.UnfinishedRead; return UnfinishedReadError.UnfinishedRead;
@@ -254,6 +256,7 @@ fn patchLoadedElf(base: usize) !void {
const vaddr = if (ehdr.e_type == elf.ET.DYN) base + phdr.p_vaddr else phdr.p_vaddr; const vaddr = if (ehdr.e_type == elf.ET.DYN) base + phdr.p_vaddr else phdr.p_vaddr;
const memsz = phdr.p_memsz; const memsz = phdr.p_memsz;
// TODO: does this really need to be aligned
const page_start = mem.alignBackward(usize, vaddr, page_size); const page_start = mem.alignBackward(usize, vaddr, page_size);
const page_end = mem.alignForward(usize, vaddr + memsz, page_size); const page_end = mem.alignForward(usize, vaddr + memsz, page_size);
const size = page_end - page_start; const size = page_end - page_start;

2
src/syscalls.zig
View File

@@ -40,7 +40,7 @@ pub const SavedContext = extern struct {
export fn syscall_handler(ctx: *SavedContext) callconv(.c) void { export fn syscall_handler(ctx: *SavedContext) callconv(.c) void {
// TODO: Handle signals (masking) to prevent re-entrancy issues if we touch global state. // TODO: Handle signals (masking) to prevent re-entrancy issues if we touch global state.
const sys: linux.SYS = @enumFromInt(ctx.rax); const sys: linux.syscalls.X64 = @enumFromInt(ctx.rax);
switch (sys) { switch (sys) {
.readlink => { .readlink => {