diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/debug.c | 4 | ||||
| -rw-r--r-- | common/nodes.c | 2 | ||||
| -rw-r--r-- | common/pmem.c | 26 | ||||
| -rw-r--r-- | common/tcb.c | 42 |
4 files changed, 37 insertions, 37 deletions
diff --git a/common/debug.c b/common/debug.c index ae56ab1..af35031 100644 --- a/common/debug.c +++ b/common/debug.c @@ -174,8 +174,8 @@ static size_t __integral_val(ssize_t value, size_t base, size_t flags, size_t ret = 0; signed char c = 0; -#define handle_type(x) \ - c = (x)value % (x)base; \ +#define handle_type(x) \ + c = (x)value % (x)base; \ value = (x)value / (x)base; if (!is_set(flags, UNSIGN_FLAG)) { diff --git a/common/nodes.c b/common/nodes.c index 30d3cfb..c54bbe8 100644 --- a/common/nodes.c +++ b/common/nodes.c @@ -38,7 +38,7 @@ * being free) */ -#define node_region(r) \ +#define node_region(r) \ ((struct node_region *)((uintptr_t)(r) & ~(BASE_PAGE_SIZE - 1))) static struct node_region *__create_region() diff --git a/common/pmem.c b/common/pmem.c index 197a0b8..cd3666d 100644 --- a/common/pmem.c +++ b/common/pmem.c @@ -30,28 +30,28 @@ #include <libfdt.h> /* NOTE: these are all for pnum_t, i.e. O0_SHIFT is from 0 */ -#define __foreach_page(var, start, end, attr, neg) \ - for (size_t i = num_indexes(start); i < num_elems(end); ++i) \ - if (var->attr[i] == (mm_info_t)(-1)) \ - continue; \ - else \ - for (pnum_t page = i * MM_OINFO_WIDTH, j = 0; \ - j < (pnum_t)MIN((end)-i * MM_OINFO_WIDTH, \ - MM_OINFO_WIDTH); \ - ++j, ++page) \ +#define __foreach_page(var, start, end, attr, neg) \ + for (size_t i = num_indexes(start); i < num_elems(end); ++i) \ + if (var->attr[i] == (mm_info_t)(-1)) \ + continue; \ + else \ + for (pnum_t page = i * MM_OINFO_WIDTH, j = 0; \ + j < (pnum_t)MIN((end)-i * MM_OINFO_WIDTH, \ + MM_OINFO_WIDTH); \ + ++j, ++page) \ if (neg(is_nset(var->attr[i], j))) #define NEG ! -#define foreach_full_page(var, start, order) \ +#define foreach_full_page(var, start, order) \ __foreach_page(var, start, var->entries, full, ) -#define foreach_not_full_page(var, start, order) \ +#define foreach_not_full_page(var, start, order) \ __foreach_page(var, start, var->entries, full, NEG) -#define foreach_used_page(var, start, order) \ +#define foreach_used_page(var, start, order) \ __foreach_page(var, start, var->entries, used, ) -#define foreach_not_used_page(var, start, order) \ +#define foreach_not_used_page(var, start, order) \ __foreach_page(var, start, var->entries, used, NEG) typedef uint32_t mm_info_t; diff --git a/common/tcb.c b/common/tcb.c index 1382f67..316cc3e 100644 --- a/common/tcb.c +++ b/common/tcb.c @@ -192,35 +192,35 @@ stat_t destroy_proc(struct tcb *p) return __destroy_thread_data(p); } -#define DEFINE_ATTACH(name, type) \ - stat_t name(struct tcb *r, struct tcb *t) \ - { \ - hard_assert(r != t, ERR_INVAL); \ - struct tcb *next = r->type.next; \ - t->type.next = next; \ -\ +#define DEFINE_ATTACH(name, type) \ + stat_t name(struct tcb *r, struct tcb *t) \ + { \ + hard_assert(r != t, ERR_INVAL); \ + struct tcb *next = r->type.next; \ + t->type.next = next; \ + \ if (next) { next->type.prev = t; } \ -\ - t->type.prev = r; \ - r->type.next = t; \ - return OK; \ + \ + t->type.prev = r; \ + r->type.next = t; \ + return OK; \ } DEFINE_ATTACH(attach_rpc, rpc); DEFINE_ATTACH(attach_proc, proc); -#define DEFINE_DETACH(name, type) \ - stat_t name(struct tcb *r, struct tcb *t) \ - { \ - MAYBE_UNUSED(r); \ - hard_assert(r != t, ERR_INVAL); \ - struct tcb *prev = t->type.prev; \ - struct tcb *next = t->type.next; \ -\ +#define DEFINE_DETACH(name, type) \ + stat_t name(struct tcb *r, struct tcb *t) \ + { \ + MAYBE_UNUSED(r); \ + hard_assert(r != t, ERR_INVAL); \ + struct tcb *prev = t->type.prev; \ + struct tcb *next = t->type.next; \ + \ if (prev) { prev->type.next = next; } \ if (next) { next->type.prev = prev; } \ -\ - return OK; \ + \ + return OK; \ } DEFINE_DETACH(detach_rpc, rpc); |