From c4bee44adf8e8377b2d8d7e8bcd83277b690821c Mon Sep 17 00:00:00 2001 From: Kimplul Date: Fri, 7 Jan 2022 19:01:25 +0200 Subject: Prefix static functions with __ + Probably completely unnecessary stylistic thing, but I'll roll with it --- arch/riscv64/kernel/vmem.c | 4 ++-- common/debug.c | 4 ++-- common/initrd.c | 12 ++++++------ common/mem_regions.c | 24 ++++++++++++------------ common/pmem.c | 28 ++++++++++++++-------------- common/sp_tree.c | 22 +++++++++++----------- stylesheet.txt | 7 +++++++ 7 files changed, 54 insertions(+), 47 deletions(-) create mode 100644 stylesheet.txt diff --git a/arch/riscv64/kernel/vmem.c b/arch/riscv64/kernel/vmem.c index adde661..0424948 100644 --- a/arch/riscv64/kernel/vmem.c +++ b/arch/riscv64/kernel/vmem.c @@ -137,7 +137,7 @@ void flush_tlb_all() __asm__ volatile ("sfence.vma\n" ::: "memory"); } -static void start_vmem(struct vm_branch *branch, enum mm_mode m) +static void __start_vmem(struct vm_branch *branch, enum mm_mode m) { branch = (struct vm_branch *)__pa(branch); @@ -160,7 +160,7 @@ struct vm_branch *init_vmem(void *fdt) populate_root_branch(b); /* update which memory branch to use */ - start_vmem(b, Sv39); + __start_vmem(b, Sv39); return b; } diff --git a/common/debug.c b/common/debug.c index afc04e7..aab5abc 100644 --- a/common/debug.c +++ b/common/debug.c @@ -80,7 +80,7 @@ static void __putchar(char c) port->data = c; } -static enum serial_dev serial_dev_enum(const char *dev_name) +static enum serial_dev __serial_dev_enum(const char *dev_name) { if (strncmp("ns16550", dev_name, 7) == 0) return NS16550A; @@ -99,7 +99,7 @@ struct dbg_info dbg_from_fdt(void *fdt) const char *dev_name = (const char *)fdt_getprop(fdt, stdout_offset, "compatible", NULL); - enum serial_dev dev = serial_dev_enum(dev_name); + enum serial_dev dev = __serial_dev_enum(dev_name); /* get serial device address */ struct cell_info ci = get_reginfo(fdt, stdout); diff --git a/common/initrd.c b/common/initrd.c index 77ce091..691685a 100644 --- a/common/initrd.c +++ b/common/initrd.c @@ -23,7 +23,7 @@ struct __packed cpio_header { char c_check[8]; }; -static struct cpio_header *next_entry(struct cpio_header *cp) +static struct cpio_header *__next_entry(struct cpio_header *cp) { size_t blen = align_up(sizeof(struct cpio_header) + convnum(cp->c_namesize, 8, 16), 4); size_t tlen = align_up(convnum(cp->c_filesize, 8, 16), 4); @@ -31,10 +31,10 @@ static struct cpio_header *next_entry(struct cpio_header *cp) return (struct cpio_header *)(((char *)cp) + blen + tlen); } -static struct cpio_header *find_file(char *c, char* fname, size_t fname_len) +static struct cpio_header *__find_file(char *c, char* fname, size_t fname_len) { struct cpio_header *cp = (struct cpio_header *)c; - for(; cp; cp = next_entry(cp)){ + for(; cp; cp = __next_entry(cp)){ size_t namelen = convnum(cp->c_namesize, 8, 16); if(namelen == 0) return 0; @@ -82,14 +82,14 @@ static size_t init_nlen = ARRAY_SIZE(init_n) - 1; /* ignore trailing NULL */ size_t get_init_size(void *fdt) { char *c = (char *)get_initrdbase(fdt); - struct cpio_header *cp = find_file(c, init_n, init_nlen); + struct cpio_header *cp = __find_file(c, init_n, init_nlen); return convnum(cp->c_filesize, 8, 16); } vm_t get_init_base(void *fdt) { char *c = (char *)get_initrdbase(fdt); - struct cpio_header *cp = find_file(c, init_n, init_nlen); + struct cpio_header *cp = __find_file(c, init_n, init_nlen); size_t name_len = convnum(cp->c_namesize, 8, 16); return ((vm_t)cp) + align_up(sizeof(struct cpio_header) + name_len, 4); } @@ -98,7 +98,7 @@ void move_init(void *fdt, void *target) { char *c = (char *)get_initrdbase(fdt); - struct cpio_header *cp = find_file(c, init_n, init_nlen); + struct cpio_header *cp = __find_file(c, init_n, init_nlen); size_t name_len = convnum(cp->c_namesize, 8, 16); size_t file_len = convnum(cp->c_filesize, 8, 16); diff --git a/common/mem_regions.c b/common/mem_regions.c index 29395ec..7b9b629 100644 --- a/common/mem_regions.c +++ b/common/mem_regions.c @@ -23,7 +23,7 @@ * maybe not even anything with sp_trees but more a weakness of binary trees in * general? */ -static struct mem_region *insert_free_region(struct mem_region_root *r, struct mem_region *m) +static struct mem_region *__insert_free_region(struct mem_region_root *r, struct mem_region *m) { struct sp_node *n = sp_root(r->free_regions), *p = NULL; size_t start = m->start; @@ -66,7 +66,7 @@ static struct mem_region *insert_free_region(struct mem_region_root *r, struct m return m; } -static struct mem_region *insert_used_region(struct mem_region_root *r, struct mem_region *m) +static struct mem_region *__insert_used_region(struct mem_region_root *r, struct mem_region *m) { struct sp_node *n = sp_root(r->used_regions), *p = NULL; vm_t start = m->start; @@ -108,7 +108,7 @@ stat_t init_region(struct mem_region_root *r, vm_t start, size_t arena_size) struct mem_region *m = get_mem_node(); m->start = start; m->end = start + arena_size; - insert_free_region(r, m); + __insert_free_region(r, m); return OK; } @@ -239,7 +239,7 @@ struct mem_region *find_free_region(struct mem_region_root *r, size_t size, size return quick_best; } -static vm_t partition_region(struct mem_region_root *r, struct mem_region *m, +static vm_t __partition_region(struct mem_region_root *r, struct mem_region *m, size_t pages, size_t align) { sp_remove(&sp_root(r->free_regions), &m->sp_n); @@ -259,7 +259,7 @@ static vm_t partition_region(struct mem_region_root *r, struct mem_region *m, if(n->prev) n->prev->next = n; - insert_free_region(r, n); + __insert_free_region(r, n); } if(post_start != post_end){ @@ -268,13 +268,13 @@ static vm_t partition_region(struct mem_region_root *r, struct mem_region *m, if(n->next) n->next->prev = n; - insert_free_region(r, n); + __insert_free_region(r, n); } m->end = end; m->start = start; mark_region_used(m->flags); - insert_used_region(r, m); + __insert_used_region(r, m); return __addr(start); } @@ -294,7 +294,7 @@ vm_t alloc_region(struct mem_region_root *r, if(!m) return 0; - return partition_region(r, m, pages, align); + return __partition_region(r, m, pages, align); } @@ -329,7 +329,7 @@ vm_t alloc_fixed_region(struct mem_region_root *r, return 0; /* actually start marking region used */ - return partition_region(r, m, pages, start - m->start); + return __partition_region(r, m, pages, start - m->start); } static void __try_coalesce_prev(struct mem_region_root *r, struct mem_region *m) @@ -378,7 +378,7 @@ static void __try_coalesce_next(struct mem_region_root *r, struct mem_region *m) } } -static void try_coalesce_regions(struct mem_region_root *r, struct mem_region *m) +static void __try_coalesce_regions(struct mem_region_root *r, struct mem_region *m) { __try_coalesce_prev(r, m); __try_coalesce_next(r, m); @@ -397,8 +397,8 @@ stat_t free_region(struct mem_region_root *r, vm_t start) sp_remove(&sp_root(r->used_regions), &m->sp_n); mark_region_unused(m->flags); - try_coalesce_regions(r, m); - insert_free_region(r, m); + __try_coalesce_regions(r, m); + __insert_free_region(r, m); return OK; } diff --git a/common/pmem.c b/common/pmem.c index 1246210..04b771e 100644 --- a/common/pmem.c +++ b/common/pmem.c @@ -346,7 +346,7 @@ pm_t probe_pmap(pm_t ram_base, size_t ram_size) return cont; } -static void mark_area_used(pm_t base, pm_t top) +static void __mark_area_used(pm_t base, pm_t top) { size_t area_left = top - base; pm_t runner = base; @@ -360,7 +360,7 @@ static void mark_area_used(pm_t base, pm_t top) mark_used(BASE_PAGE, runner); } -static void mark_reserved_mem(void *fdt) +static void __mark_reserved_mem(void *fdt) { int rmem_offset = fdt_path_offset(fdt, "/reserved-memory/mmode_resv0"); struct cell_info ci = get_reginfo(fdt, "/reserved-memory/mmode_resv0"); @@ -374,10 +374,10 @@ static void mark_reserved_mem(void *fdt) rmem_reg += sizeof(fdt32_t); pm_t top = (pm_t)fdt_load_int_ptr(ci.size_cells, rmem_reg) + base; - mark_area_used((pm_t)__va(base), (pm_t)__va(top)); + __mark_area_used((pm_t)__va(base), (pm_t)__va(top)); } -static pm_t get_ramtop(void *fdt) +static pm_t __get_ramtop(void *fdt) { struct cell_info ci = get_reginfo(fdt, "/memory"); int mem_offset = fdt_path_offset(fdt, "/memory"); @@ -393,13 +393,13 @@ static pm_t get_ramtop(void *fdt) return (pm_t)fdt_load_int_ptr(ci.size_cells, mem_reg) + base; } -static pm_t get_fdttop(void *fdt) +static pm_t __get_fdttop(void *fdt) { const char *b = (const char *)fdt; return (pm_t)(b + fdt_totalsize(fdt)); } -static pm_t get_fdtbase(void *fdt) +static pm_t __get_fdtbase(void *fdt) { /* lol */ return (pm_t)fdt; @@ -413,11 +413,11 @@ void init_pmem(void *fdt) arch_pmem_conf(fdt, &max_order, &base_bits, bits); init_mem(max_order, bits, base_bits); - pm_t ram_size = get_ramtop(fdt) - RAM_BASE; + pm_t ram_size = __get_ramtop(fdt) - RAM_BASE; pm_t ram_base = (pm_t)__va(RAM_BASE); pm_t initrd_top = get_initrdtop(fdt); - pm_t fdt_top = get_fdttop(fdt); + pm_t fdt_top = __get_fdttop(fdt); /* find probably most suitable contiguous region of ram for our physical * ram map */ @@ -432,21 +432,21 @@ void init_pmem(void *fdt) /* mark init stack, this should be unmapped once we get to executing * processes */ - mark_area_used((pm_t)__va(PM_STACK_BASE), (pm_t)__va(PM_STACK_TOP)); + __mark_area_used((pm_t)__va(PM_STACK_BASE), (pm_t)__va(PM_STACK_TOP)); /* mark kernel */ /* this could be made more explicit, I suppose. */ - mark_area_used(VM_KERN, VM_KERN + PM_KERN_SIZE); + __mark_area_used(VM_KERN, VM_KERN + PM_KERN_SIZE); /* mark fdt and initrd */ - mark_area_used(get_initrdbase(fdt), initrd_top); - mark_area_used(get_fdtbase(fdt), fdt_top); + __mark_area_used(get_initrdbase(fdt), initrd_top); + __mark_area_used(__get_fdtbase(fdt), fdt_top); /* mark pmap */ - mark_area_used(pmap_base, pmap_base + actual_size); + __mark_area_used(pmap_base, pmap_base + actual_size); /* mark reserved mem */ - mark_reserved_mem(fdt); + __mark_reserved_mem(fdt); init_mem_blocks(); diff --git a/common/sp_tree.c b/common/sp_tree.c index abfaa4b..495b843 100644 --- a/common/sp_tree.c +++ b/common/sp_tree.c @@ -1,6 +1,6 @@ #include -inline static void __sp_turn_left(struct sp_node *n) +static void __sp_turn_left(struct sp_node *n) { struct sp_node *l = sp_left(n); struct sp_node *p = sp_paren(n); @@ -19,7 +19,7 @@ inline static void __sp_turn_left(struct sp_node *n) sp_lparen(n) = n; } -inline static void __sp_turn_right(struct sp_node *n) +static void __sp_turn_right(struct sp_node *n) { struct sp_node *r = sp_right(n); struct sp_node *p = sp_paren(n); @@ -38,7 +38,7 @@ inline static void __sp_turn_right(struct sp_node *n) sp_rparen(n) = n; } -inline static int __sp_balance(struct sp_node *n) +static int __sp_balance(struct sp_node *n) { int l = 0; int r = 0; @@ -52,7 +52,7 @@ inline static int __sp_balance(struct sp_node *n) return l - r; } -inline static int __sp_max_hint(struct sp_node *n) +static int __sp_max_hint(struct sp_node *n) { int l = 0; int r = 0; @@ -69,7 +69,7 @@ inline static int __sp_max_hint(struct sp_node *n) return r; } -inline static void sp_update(struct sp_node **root, struct sp_node *n) +static void __sp_update(struct sp_node **root, struct sp_node *n) { while(n){ @@ -115,10 +115,10 @@ void sp_insert(struct sp_node **root, struct sp_node *p, sp_right(p) = n; sp_paren(n) = p; - sp_update(root, n); + __sp_update(root, n); } -inline static void __sp_replace_right(struct sp_node *n, struct sp_node *r) +static void __sp_replace_right(struct sp_node *n, struct sp_node *r) { struct sp_node *p = sp_paren(n); struct sp_node *rp = sp_paren(r); @@ -149,7 +149,7 @@ inline static void __sp_replace_right(struct sp_node *n, struct sp_node *r) sp_lparen(n) = r; } -inline static void __sp_replace_left(struct sp_node *n, struct sp_node *l) +static void __sp_replace_left(struct sp_node *n, struct sp_node *l) { struct sp_node *p = sp_paren(n); struct sp_node *lp = sp_paren(l); @@ -190,7 +190,7 @@ void sp_remove(struct sp_node **root, struct sp_node *del) *root = least; __sp_replace_right(del, least); - sp_update(root, sp_right(least)); + __sp_update(root, sp_right(least)); return; } @@ -201,7 +201,7 @@ void sp_remove(struct sp_node **root, struct sp_node *del) *root = most; __sp_replace_left(del, most); - sp_update(root, sp_left(most)); + __sp_update(root, sp_left(most)); return; } @@ -218,7 +218,7 @@ void sp_remove(struct sp_node **root, struct sp_node *del) else sp_right(paren) = 0; - sp_update(root, paren); + __sp_update(root, paren); } struct sp_node *sp_first(struct sp_node *n) diff --git a/stylesheet.txt b/stylesheet.txt new file mode 100644 index 0000000..688cae5 --- /dev/null +++ b/stylesheet.txt @@ -0,0 +1,7 @@ +Mostly the same as the Linux coding standars, some additions: ++ Local functions should be marked static and be prefixed with __, the idea is + to hopefully minimize confusion about which header file the function came from. + I know, pretty dumb, but looks cool :) + ++ structs and enums shouldn't be suffixed with _t, whereas scalar types + should. -- cgit v1.3