From 17bfb0ef0a48330b1d54e61fe3c30d83528d2d90 Mon Sep 17 00:00:00 2001
From: dzwdz
Date: Wed, 25 Jan 2023 20:16:22 +0100
Subject: style: typedef structs, shorter namespaces
I've wanted to do this for a while, and since I've just had a relatively
large refactor commit (pcpy), this is as good of a time as any.
Typedefing structs was mostly inspired by Plan 9's coding style. It makes
some lines of code much shorter at basically no expense.
Everything related to userland kept old-style struct definitions, so as not
to force that style onto other people.
I also considered changing SCREAMING_ENUM_FIELDS to NicerLookingCamelcase,
but I didn't, just in case that'd be confusing.
---
src/user/bootstrap/entry.S | 4 ++--
src/user/bootstrap/main.c | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
(limited to 'src/user/bootstrap')
diff --git a/src/user/bootstrap/entry.S b/src/user/bootstrap/entry.S
index ecd60dd..04b4238 100644
--- a/src/user/bootstrap/entry.S
+++ b/src/user/bootstrap/entry.S
@@ -9,14 +9,14 @@
.global _start
.type _start, @function
_start:
- mov $_SYSCALL_MEMFLAG, %rdi
+ mov $_SYS_MEMFLAG, %rdi
mov $(STACK_TOP & ~0xFFF - (STACK_PAGES - 1) * 0x1000), %rsi
mov $(STACK_PAGES * 0x1000), %rdx
mov $MEMFLAG_PRESENT, %r10
syscall
mov $(STACK_TOP & ~0xF), %rsp
- mov $_SYSCALL_MEMFLAG, %rdi
+ mov $_SYS_MEMFLAG, %rdi
mov $_bss_start, %rsi
mov $_bss_end, %rdx
sub $_bss_start, %rdx
diff --git a/src/user/bootstrap/main.c b/src/user/bootstrap/main.c
index 577f1d8..f2938b9 100644
--- a/src/user/bootstrap/main.c
+++ b/src/user/bootstrap/main.c
@@ -14,7 +14,7 @@ extern char _initrd;
__attribute__((section(".text")))
_Noreturn void main(void) {
- _syscall_memflag(_libc_psdata, 1, MEMFLAG_PRESENT);
+ _sys_memflag(_libc_psdata, 1, MEMFLAG_PRESENT);
setprogname("bootstrap");
setproctitle(NULL);
@@ -25,7 +25,7 @@ _Noreturn void main(void) {
fs_whitelist(l);
}
- _syscall_mount(HANDLE_PROCFS, "/proc/", strlen("/proc/"));
+ _sys_mount(HANDLE_PROCFS, "/proc/", strlen("/proc/"));
MOUNT_AT("/") { fs_dir_inject("/proc/"); }
MOUNT_AT("/init/") { tar_driver(&_initrd); }
@@ -40,5 +40,5 @@ _Noreturn void main(void) {
} else {
_klogf("couldn't find init.elf");
}
- _syscall_exit(1);
+ _sys_exit(1);
}
--
cgit v1.2.3