From 6f5065da917a911c5e810a058d16d147c31d5fbe Mon Sep 17 00:00:00 2001 From: Kimplul Date: Mon, 21 Nov 2022 14:13:28 +0200 Subject: fix formatting --- common/uapi/cap.c | 6 +- common/uapi/dispatch.c | 10 +-- common/uapi/ipc.c | 5 +- common/uapi/mem.c | 9 ++- include/apos/uapi.h | 165 +++++++++++++++++++++++++++---------------------- 5 files changed, 108 insertions(+), 87 deletions(-) diff --git a/common/uapi/cap.c b/common/uapi/cap.c index 9433b2d..b094c43 100644 --- a/common/uapi/cap.c +++ b/common/uapi/cap.c @@ -34,7 +34,8 @@ static capflags_t *__get_tcb_caps(id_t tid, size_t off) * @param caps Mask of capabilities to set. * @return \ref OK on success, \ref ERR_INVAL on invalid input. */ -SYSCALL_DEFINE3(set_cap)(struct tcb *t, sys_arg_t tid, sys_arg_t off, sys_arg_t caps) +SYSCALL_DEFINE3(set_cap)(struct tcb *t, sys_arg_t tid, sys_arg_t off, + sys_arg_t caps) { if (!is_set(t->caps, CAP_CAPS)) return SYS_RET1(ERR_PERM); @@ -74,7 +75,8 @@ SYSCALL_DEFINE2(get_cap)(struct tcb *t, sys_arg_t tid, sys_arg_t off) * @return ERR_LERM if invalid permissions, ERR_INVAL if \p tid doesn't exist, * otherwise OK. */ -SYSCALL_DEFINE3(clear_cap)(struct tcb *t, sys_arg_t tid, sys_arg_t off, sys_arg_t caps) +SYSCALL_DEFINE3(clear_cap)(struct tcb *t, sys_arg_t tid, sys_arg_t off, + sys_arg_t caps) { if (!is_set(t->caps, CAP_CAPS)) return SYS_RET1(ERR_PERM); diff --git a/common/uapi/dispatch.c b/common/uapi/dispatch.c index 30f29b3..37b551a 100644 --- a/common/uapi/dispatch.c +++ b/common/uapi/dispatch.c @@ -87,8 +87,8 @@ SYSCALL_DEFINE1(putch)(struct tcb *t, sys_arg_t a) } struct sys_ret handle_syscall(struct tcb *t, - sys_arg_t syscall, sys_arg_t a, sys_arg_t b, - sys_arg_t c, sys_arg_t d, sys_arg_t e) + sys_arg_t syscall, sys_arg_t a, sys_arg_t b, + sys_arg_t c, sys_arg_t d, sys_arg_t e) { adjust_syscall(t); @@ -122,9 +122,9 @@ struct sys_ret handle_syscall(struct tcb *t, case SYS_CLEAR_CAP: r = sys_clear_cap(t, a, b, c, d, e); break; case SYS_POWEROFF: r = sys_poweroff(t, a, b, c, d, e); break; default: - error("Syscall %zu outside allowed range [0 - %i]\n", syscall, - SYS_NUM - 1); - r = SYS_RET1(ERR_INVAL); + error("Syscall %zu outside allowed range [0 - %i]\n", syscall, + SYS_NUM - 1); + r = SYS_RET1(ERR_INVAL); }; if (check_canary(t)) { diff --git a/common/uapi/ipc.c b/common/uapi/ipc.c index 80d4906..860ec54 100644 --- a/common/uapi/ipc.c +++ b/common/uapi/ipc.c @@ -34,7 +34,7 @@ SYSCALL_DEFINE1(ipc_server)(struct tcb *t, sys_arg_t callback) * @return */ static struct sys_ret do_ipc(struct tcb *t, - sys_arg_t pid, + sys_arg_t pid, sys_arg_t d0, sys_arg_t d1, sys_arg_t d2, @@ -108,7 +108,8 @@ SYSCALL_DEFINE5(ipc_fwd)(struct tcb *t, sys_arg_t pid, * @param d3 IPC return value 3. * @return \c d0 and \c d1. */ -SYSCALL_DEFINE4(ipc_resp)(struct tcb *t, sys_arg_t d0, sys_arg_t d1, sys_arg_t d2, +SYSCALL_DEFINE4(ipc_resp)(struct tcb *t, sys_arg_t d0, sys_arg_t d1, + sys_arg_t d2, sys_arg_t d3) { struct tcb *r = get_cproc(t); diff --git a/common/uapi/mem.c b/common/uapi/mem.c index fccb0f7..1644a16 100644 --- a/common/uapi/mem.c +++ b/common/uapi/mem.c @@ -39,7 +39,8 @@ SYSCALL_DEFINE2(req_mem)(struct tcb *t, sys_arg_t size, sys_arg_t flags) * @return \ref OK and start of allocation when succesful, * \ref ERR_OOMEM and \c NULL otherwise. */ -SYSCALL_DEFINE3(req_fixmem)(struct tcb *t, sys_arg_t fixed, sys_arg_t size, sys_arg_t flags) +SYSCALL_DEFINE3(req_fixmem)(struct tcb *t, sys_arg_t fixed, sys_arg_t size, + sys_arg_t flags) { struct tcb *r = get_cproc(t); vm_t start = 0; @@ -81,7 +82,8 @@ SYSCALL_DEFINE1(free_mem)(struct tcb *t, sys_arg_t start) * @return \ref OK and start of allocation when succesful, * \ref ERR_OOMEM and \c NULL otherwise. */ -SYSCALL_DEFINE3(req_pmem)(struct tcb *t, sys_arg_t paddr, sys_arg_t size, sys_arg_t flags) +SYSCALL_DEFINE3(req_pmem)(struct tcb *t, sys_arg_t paddr, sys_arg_t size, + sys_arg_t flags) { /* this will require some pondering, but essentially this syscall should * only be used for device access, so any addresses requested should be @@ -124,7 +126,8 @@ SYSCALL_DEFINE2(req_sharedmem)(struct tcb *t, sys_arg_t size, sys_arg_t flags) * @return \ref OK and start of reference when succesful, * \ref ERR_OOMEM and \c NULL otherwise. */ -SYSCALL_DEFINE3(ref_sharedmem)(struct tcb *t, sys_arg_t tid, sys_arg_t va, sys_arg_t flags) +SYSCALL_DEFINE3(ref_sharedmem)(struct tcb *t, sys_arg_t tid, sys_arg_t va, + sys_arg_t flags) { struct tcb *t2 = get_tcb(tid); vm_t start = 0; diff --git a/include/apos/uapi.h b/include/apos/uapi.h index 99ab4e1..2d6f945 100644 --- a/include/apos/uapi.h +++ b/include/apos/uapi.h @@ -82,12 +82,12 @@ struct sys_ret { * * @param name Name of syscall. */ -#define SYSCALL_DECLARE0(name) \ +#define SYSCALL_DECLARE0(name) \ struct sys_ret sys_##name(struct tcb *t, \ - sys_arg_t a, \ - sys_arg_t b, \ - sys_arg_t c, \ - sys_arg_t d, \ + sys_arg_t a, \ + sys_arg_t b, \ + sys_arg_t c, \ + sys_arg_t d, \ sys_arg_t e); /** @@ -96,8 +96,9 @@ struct sys_ret { * @param name Name of syscall. * @param a Name of argument. */ -#define SYSCALL_DECLARE1(name, a) \ - struct sys_ret sys_##name(struct tcb *t, sys_arg_t a, sys_arg_t b, sys_arg_t c, \ +#define SYSCALL_DECLARE1(name, a) \ + struct sys_ret sys_##name(struct tcb *t, sys_arg_t a, sys_arg_t b, \ + sys_arg_t c, \ sys_arg_t d, sys_arg_t e); /** @@ -107,8 +108,9 @@ struct sys_ret { * @param a Name of first argument. * @param b Name of second argument. */ -#define SYSCALL_DECLARE2(name, a, b) \ - struct sys_ret sys_##name(struct tcb *t, sys_arg_t a, sys_arg_t b, sys_arg_t c, \ +#define SYSCALL_DECLARE2(name, a, b) \ + struct sys_ret sys_##name(struct tcb *t, sys_arg_t a, sys_arg_t b, \ + sys_arg_t c, \ sys_arg_t d, sys_arg_t e); /** @@ -119,8 +121,9 @@ struct sys_ret { * @param b Name of second argument. * @param c Name of third argument. */ -#define SYSCALL_DECLARE3(name, a, b, c) \ - struct sys_ret sys_##name(struct tcb *t, sys_arg_t a, sys_arg_t b, sys_arg_t c, \ +#define SYSCALL_DECLARE3(name, a, b, c) \ + struct sys_ret sys_##name(struct tcb *t, sys_arg_t a, sys_arg_t b, \ + sys_arg_t c, \ sys_arg_t d, sys_arg_t e); /** @@ -132,8 +135,9 @@ struct sys_ret { * @param c Name of third argument. * @param d Name of fourth argument. */ -#define SYSCALL_DECLARE4(name, a, b, c, d) \ - struct sys_ret sys_##name(struct tcb *t, sys_arg_t a, sys_arg_t b, sys_arg_t c, \ +#define SYSCALL_DECLARE4(name, a, b, c, d) \ + struct sys_ret sys_##name(struct tcb *t, sys_arg_t a, sys_arg_t b, \ + sys_arg_t c, \ sys_arg_t d, sys_arg_t e); /** @@ -146,8 +150,9 @@ struct sys_ret { * @param d Name of fourth argument. * @param e Name of fifth argument. */ -#define SYSCALL_DECLARE5(name, a, b, c, d, e) \ - struct sys_ret sys_##name(struct tcb *t, sys_arg_t a, sys_arg_t b, sys_arg_t c, \ +#define SYSCALL_DECLARE5(name, a, b, c, d, e) \ + struct sys_ret sys_##name(struct tcb *t, sys_arg_t a, sys_arg_t b, \ + sys_arg_t c, \ sys_arg_t d, sys_arg_t e); /** @@ -155,18 +160,19 @@ struct sys_ret { * * @param name Name of syscall. */ -#define SYSCALL_DEFINE0(name) \ - static inline struct sys_ret __##name(struct tcb *t); \ - struct sys_ret sys_##name(struct tcb *t, sys_arg_t a, sys_arg_t b, sys_arg_t c, \ - sys_arg_t d, sys_arg_t e) \ - { \ - UNUSED(a); \ - UNUSED(b); \ - UNUSED(c); \ - UNUSED(d); \ - UNUSED(e); \ - return __##name(t); \ - } \ +#define SYSCALL_DEFINE0(name) \ + static inline struct sys_ret __##name(struct tcb *t); \ + struct sys_ret sys_##name(struct tcb *t, sys_arg_t a, sys_arg_t b, \ + sys_arg_t c, \ + sys_arg_t d, sys_arg_t e) \ + { \ + UNUSED(a); \ + UNUSED(b); \ + UNUSED(c); \ + UNUSED(d); \ + UNUSED(e); \ + return __##name(t); \ + } \ static struct sys_ret __##name /** @@ -174,17 +180,18 @@ struct sys_ret { * * @param name Name of syscall. */ -#define SYSCALL_DEFINE1(name) \ - static inline struct sys_ret __##name(struct tcb *, sys_arg_t); \ - struct sys_ret sys_##name(struct tcb *t, sys_arg_t a, sys_arg_t b, sys_arg_t c, \ - sys_arg_t d, sys_arg_t e) \ - { \ - UNUSED(b); \ - UNUSED(c); \ - UNUSED(d); \ - UNUSED(e); \ - return __##name(t, a); \ - } \ +#define SYSCALL_DEFINE1(name) \ + static inline struct sys_ret __##name(struct tcb *, sys_arg_t); \ + struct sys_ret sys_##name(struct tcb *t, sys_arg_t a, sys_arg_t b, \ + sys_arg_t c, \ + sys_arg_t d, sys_arg_t e) \ + { \ + UNUSED(b); \ + UNUSED(c); \ + UNUSED(d); \ + UNUSED(e); \ + return __##name(t, a); \ + } \ static inline struct sys_ret __##name /** @@ -192,16 +199,18 @@ struct sys_ret { * * @param name Name of syscall. */ -#define SYSCALL_DEFINE2(name) \ - static inline struct sys_ret __##name(struct tcb *, sys_arg_t, sys_arg_t); \ - struct sys_ret sys_##name(struct tcb *t, sys_arg_t a, sys_arg_t b, sys_arg_t c, \ - sys_arg_t d, sys_arg_t e) \ - { \ - UNUSED(c); \ - UNUSED(d); \ - UNUSED(e); \ - return __##name(t, a, b); \ - } \ +#define SYSCALL_DEFINE2(name) \ + static inline struct sys_ret __##name(struct tcb *, sys_arg_t, \ + sys_arg_t); \ + struct sys_ret sys_##name(struct tcb *t, sys_arg_t a, sys_arg_t b, \ + sys_arg_t c, \ + sys_arg_t d, sys_arg_t e) \ + { \ + UNUSED(c); \ + UNUSED(d); \ + UNUSED(e); \ + return __##name(t, a, b); \ + } \ static inline struct sys_ret __##name /** @@ -209,16 +218,18 @@ struct sys_ret { * * @param name Name of syscall. */ -#define SYSCALL_DEFINE3(name) \ - static inline struct sys_ret __##name(struct tcb *, sys_arg_t, sys_arg_t, \ - sys_arg_t); \ - struct sys_ret sys_##name(struct tcb *t, sys_arg_t a, sys_arg_t b, sys_arg_t c, \ - sys_arg_t d, sys_arg_t e) \ - { \ - UNUSED(d); \ - UNUSED(e); \ - return __##name(t, a, b, c); \ - } \ +#define SYSCALL_DEFINE3(name) \ + static inline struct sys_ret __##name(struct tcb *, sys_arg_t, \ + sys_arg_t, \ + sys_arg_t); \ + struct sys_ret sys_##name(struct tcb *t, sys_arg_t a, sys_arg_t b, \ + sys_arg_t c, \ + sys_arg_t d, sys_arg_t e) \ + { \ + UNUSED(d); \ + UNUSED(e); \ + return __##name(t, a, b, c); \ + } \ static inline struct sys_ret __##name /** @@ -226,15 +237,17 @@ struct sys_ret { * * @param name Name of syscall. */ -#define SYSCALL_DEFINE4(name) \ - static inline struct sys_ret __##name(struct tcb *, sys_arg_t, sys_arg_t, sys_arg_t, \ - sys_arg_t); \ - struct sys_ret sys_##name(struct tcb *t, sys_arg_t a, sys_arg_t b, sys_arg_t c, \ - sys_arg_t d, sys_arg_t e) \ - { \ - UNUSED(e); \ - return __##name(t, a, b, c, d); \ - } \ +#define SYSCALL_DEFINE4(name) \ + static inline struct sys_ret __##name(struct tcb *, sys_arg_t, \ + sys_arg_t, sys_arg_t, \ + sys_arg_t); \ + struct sys_ret sys_##name(struct tcb *t, sys_arg_t a, sys_arg_t b, \ + sys_arg_t c, \ + sys_arg_t d, sys_arg_t e) \ + { \ + UNUSED(e); \ + return __##name(t, a, b, c, d); \ + } \ static inline struct sys_ret __##name /** @@ -242,14 +255,16 @@ struct sys_ret { * * @param name Name of syscall. */ -#define SYSCALL_DEFINE5(name) \ - static inline struct sys_ret __##name(struct tcb *, sys_arg_t, sys_arg_t, sys_arg_t, \ - sys_arg_t, sys_arg_t); \ - struct sys_ret sys_##name(struct tcb *t, sys_arg_t a, sys_arg_t b, sys_arg_t c, \ - sys_arg_t d, sys_arg_t e) \ - { \ - return __##name(t, a, b, c, d, e); \ - } \ +#define SYSCALL_DEFINE5(name) \ + static inline struct sys_ret __##name(struct tcb *, sys_arg_t, \ + sys_arg_t, sys_arg_t, \ + sys_arg_t, sys_arg_t); \ + struct sys_ret sys_##name(struct tcb *t, sys_arg_t a, sys_arg_t b, \ + sys_arg_t c, \ + sys_arg_t d, sys_arg_t e) \ + { \ + return __##name(t, a, b, c, d, e); \ + } \ static inline struct sys_ret __##name /** @name Misc syscalls. */ -- cgit v1.3