From 4f8ec6ecc42dd3ef73b51070bb4c76ea34d28d44 Mon Sep 17 00:00:00 2001 From: Aleksa Vuckovic Date: Sat, 25 Feb 2023 08:17:25 +0100 Subject: ANSI C: declarations outside for --- kernel/src/mem/heap.c | 10 ++++++---- kernel/src/mem/paging.c | 3 ++- kernel/src/mem/pmm.c | 4 ++-- 3 files changed, 10 insertions(+), 7 deletions(-) (limited to 'kernel/src/mem') diff --git a/kernel/src/mem/heap.c b/kernel/src/mem/heap.c index 0e703ab..308e404 100644 --- a/kernel/src/mem/heap.c +++ b/kernel/src/mem/heap.c @@ -31,13 +31,14 @@ void kheap_add_block(kheap_t *kheap, uint64_t addr, uint32_t size, uint8_t *bm = (uint8_t *)&kheapblock[1]; /* clear bitmap */ - for (size_t i = 0; i < bcnt; i++) { + size_t i; + for (i = 0; i < bcnt; i++) { bm[i] = 0; } uint32_t bcnt_used = upper_div((bcnt + (uint32_t)sizeof(kheapblock_t)), bsize); - for (size_t i = 0; i < bcnt_used; i++) { + for (i = 0; i < bcnt_used; i++) { bm[i] = 5; } @@ -68,13 +69,14 @@ void *kheap_alloc(kheap_t *kheap, uint32_t size) uint8_t *bm = (uint8_t *)&kheapblock[1]; /* find empty block */ - for (size_t i = 0; i < bcnt; i++) { + size_t i; + size_t j; + for (i = 0; i < bcnt; i++) { if (bm[i] != 0) { continue; } /* find bneed consecutive empty blocks */ - size_t j; for (j = 0; bm[i + j] == 0 && j < bneed && i + j < bcnt; j++) ; diff --git a/kernel/src/mem/paging.c b/kernel/src/mem/paging.c index 87097cd..cf62980 100644 --- a/kernel/src/mem/paging.c +++ b/kernel/src/mem/paging.c @@ -54,7 +54,8 @@ void init_paging(void) page_table_lvl3[510] = (uint64_t)page_table_lvl2 - KERNEL_VMA + (FLAG_PRESENT | FLAG_WRITABLE | FLAG_USER); /* 16mb kernel + 32mb heap + 2mb (32kb stack * 64 threads) = first 50mb */ - for (size_t i = 0; i < 25; i++) { + size_t i; + for (i = 0; i < 25; i++) { page_table_lvl2[i] = (uint64_t)0x0 + PAGE_SIZE * i + (FLAG_PRESENT | FLAG_WRITABLE | FLAG_USER | FLAG_HUGE); diff --git a/kernel/src/mem/pmm.c b/kernel/src/mem/pmm.c index 043043c..d0c8a9f 100644 --- a/kernel/src/mem/pmm.c +++ b/kernel/src/mem/pmm.c @@ -26,8 +26,8 @@ void init_pmm() (uint64_t) ~(PAGE_SIZE - 1)) + PAGE_SIZE : entry.base_addr; - for (uint64_t i = base; - i + PAGE_SIZE <= entry.base_addr + entry.length; + uint64_t i; + for (i = base; i + PAGE_SIZE <= entry.base_addr + entry.length; i += PAGE_SIZE) { if (i >= MEM_USED_BELOW) { free_mem_cnt++; -- cgit v1.2.3