summaryrefslogtreecommitdiff
path: root/kernel/src
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/src')
-rw-r--r--kernel/src/apic/apic.c6
-rw-r--r--kernel/src/apic/madt.c4
-rw-r--r--kernel/src/apic/rsdp.c20
-rw-r--r--kernel/src/boot/multiboot2.c3
-rw-r--r--kernel/src/cpu/idt.c3
-rw-r--r--kernel/src/fs/ext2.c16
-rw-r--r--kernel/src/libk/serial_stdio.c8
-rw-r--r--kernel/src/libk/stdio.c8
-rw-r--r--kernel/src/libk/string.c19
-rw-r--r--kernel/src/mem/heap.c10
-rw-r--r--kernel/src/mem/paging.c3
-rw-r--r--kernel/src/mem/pmm.c4
-rw-r--r--kernel/src/misc/graphics.c18
-rw-r--r--kernel/src/misc/stdbuff.c6
14 files changed, 80 insertions, 48 deletions
diff --git a/kernel/src/apic/apic.c b/kernel/src/apic/apic.c
index f543c82..ad3ccec 100644
--- a/kernel/src/apic/apic.c
+++ b/kernel/src/apic/apic.c
@@ -29,7 +29,9 @@ void init_ap_cpus()
init_mutex(&cnt_lock);
map_addr(lapic_addr, lapic_addr, FLAG_PRESENT);
- for (size_t i = 0; i < numcores; i++) {
+ size_t i;
+ size_t j;
+ for (i = 0; i < numcores; i++) {
/* do not start BSP, that's already running this code */
if (cpu_apic_ids[i] == bspid)
continue;
@@ -75,7 +77,7 @@ void init_ap_cpus()
/* send STARTUP IPI (twice) */
- for (size_t j = 0; j < 2; j++) {
+ for (j = 0; j < 2; j++) {
/* clear APIC errors */
*((__volatile__ uint32_t *)(lapic_addr + 0x280)) = 0;
/* select AP */
diff --git a/kernel/src/apic/madt.c b/kernel/src/apic/madt.c
index 3a152aa..24f739c 100644
--- a/kernel/src/apic/madt.c
+++ b/kernel/src/apic/madt.c
@@ -17,8 +17,8 @@ void parse_madt()
memcpy(madt, madt_addr, sizeof(struct MADT));
lapic_addr = madt->lapic_addr;
- for (size_t curr_size = sizeof(struct MADT);
- curr_size < madt->h.Length;) {
+ size_t curr_size;
+ for (curr_size = sizeof(struct MADT); curr_size < madt->h.Length;) {
struct MADT_type_header *m = (struct MADT_type_header *)kalloc(
sizeof(struct MADT_type_header));
memcpy(m,
diff --git a/kernel/src/apic/rsdp.c b/kernel/src/apic/rsdp.c
index c12b63f..6a1505f 100644
--- a/kernel/src/apic/rsdp.c
+++ b/kernel/src/apic/rsdp.c
@@ -8,10 +8,13 @@ uint64_t *find_rsdp()
{
map_addr(0x0, 0x0, FLAG_PRESENT);
const char *rsdp_cs = "RSD PTR ";
- for (uint64_t i = 0x10; i < 0x100000; i += 0x10) {
+ uint64_t i;
+ size_t j;
+
+ for (i = 0x10; i < 0x100000; i += 0x10) {
char *x = (char *)i;
uint8_t ind = 1;
- for (size_t j = 0; j < strlen(rsdp_cs); j++) {
+ for (j = 0; j < strlen(rsdp_cs); j++) {
if (rsdp_cs[j] != x[j]) {
ind = 0;
break;
@@ -43,8 +46,9 @@ void list_sys_tables(void)
uint32_t entries =
(rsdt->Length - (uint32_t)sizeof(struct ACPI_header)) / 4;
-
- for (size_t i = 0; i < entries; i++) {
+ size_t i;
+ size_t j;
+ for (i = 0; i < entries; i++) {
uint32_t na_addr = (uint32_t)rsdp_desc->RsdtAddress +
(uint32_t)sizeof(struct ACPI_header) +
(uint32_t)i * 4;
@@ -56,7 +60,7 @@ void list_sys_tables(void)
memcpy(t, (uint64_t *)(uint64_t)addr,
sizeof(struct ACPI_header));
- for (size_t j = 0; j < 4; j++) {
+ for (j = 0; j < 4; j++) {
printf("%c", t->Signature[j]);
}
printf(", ");
@@ -88,7 +92,9 @@ uint64_t *find_sys_table_addr(const char *signature)
uint32_t entries =
(rsdt->Length - (uint32_t)sizeof(struct ACPI_header)) / 4;
- for (size_t i = 0; i < entries; i++) {
+ size_t i;
+ size_t j;
+ for (i = 0; i < entries; i++) {
uint32_t na_addr = (uint32_t)rsdp_desc->RsdtAddress +
(uint32_t)sizeof(struct ACPI_header) +
(uint32_t)i * 4;
@@ -101,7 +107,7 @@ uint64_t *find_sys_table_addr(const char *signature)
sizeof(struct ACPI_header));
int ind = 1;
- for (size_t j = 0; j < 4; j++) {
+ for (j = 0; j < 4; j++) {
if (t->Signature[j] != signature[j])
ind = 0;
}
diff --git a/kernel/src/boot/multiboot2.c b/kernel/src/boot/multiboot2.c
index 1958ac1..180277d 100644
--- a/kernel/src/boot/multiboot2.c
+++ b/kernel/src/boot/multiboot2.c
@@ -33,7 +33,8 @@ void init_mmap(mb2_tag_mmap *tag_mmap)
INIT_LIST(mmap.list)
/* get data and store it into list */
- for (size_t i = sizeof(mb2_tag_mmap); i < tag_mmap->size;
+ size_t i;
+ for (i = sizeof(mb2_tag_mmap); i < tag_mmap->size;
i += sizeof(mb2_tag_mmap_entry)) {
mmap_t *curr_mmap_entry = (mmap_t *)kalloc(sizeof(mmap_t));
memcpy(&curr_mmap_entry->mmap_entry, (char *)tag_mmap + i,
diff --git a/kernel/src/cpu/idt.c b/kernel/src/cpu/idt.c
index bc3e143..5ac6386 100644
--- a/kernel/src/cpu/idt.c
+++ b/kernel/src/cpu/idt.c
@@ -70,7 +70,8 @@ void init_idt_table(void)
/* interrupts */
add_to_idt(32, (uint64_t)irq0, GDT_CODE_SEG, INTERRUPT_GATE);
add_to_idt(33, (uint64_t)irq1, GDT_CODE_SEG, INTERRUPT_GATE);
- for (size_t i = 34; i < 256; i++) {
+ size_t i;
+ for (i = 34; i < 256; i++) {
add_to_idt((uint16_t)i, (uint64_t)irq2, GDT_CODE_SEG,
INTERRUPT_GATE);
}
diff --git a/kernel/src/fs/ext2.c b/kernel/src/fs/ext2.c
index 0420a08..c56e865 100644
--- a/kernel/src/fs/ext2.c
+++ b/kernel/src/fs/ext2.c
@@ -10,8 +10,8 @@ ext2_superblock_t *ext2_superblock;
void read_block(uint32_t block_num, void *block_ptr)
{
uint32_t sectors_per_block = BLOCK_SIZE / SECTOR_SIZE;
-
- for (size_t i = 0; i < sectors_per_block; i++) {
+ size_t i;
+ for (i = 0; i < sectors_per_block; i++) {
read_sector(block_num * sectors_per_block + i,
(disc_sector_t *)block_ptr + i);
}
@@ -86,7 +86,9 @@ dentry_list_t *directory_to_entries(uint32_t inode)
return dentry_list;
/* read inode contents */
- for (size_t i = 0; i < 12; i++) {
+ size_t i;
+ size_t block_offset;
+ for (i = 0; i < 12; i++) {
if (ext2_inode->dbp[i] == 0)
break;
@@ -95,7 +97,7 @@ dentry_list_t *directory_to_entries(uint32_t inode)
read_block(ext2_inode->dbp[i], block);
/* parse block */
- for (size_t block_offset = 0; block_offset < BLOCK_SIZE;) {
+ for (block_offset = 0; block_offset < BLOCK_SIZE;) {
/* get dentry header */
dentry_list_t *ext2_dentry_list =
(dentry_list_t *)kalloc(sizeof(dentry_list_t));
@@ -168,7 +170,8 @@ char *files_to_buffer(uint32_t inode)
data = (char *)kalloc(size + 1);
uint32_t block_num = upper_div(size, BLOCK_SIZE);
- for (size_t i = 0; i < min(block_num, 12); i++) {
+ size_t i;
+ for (i = 0; i < min(block_num, 12); i++) {
char block[BLOCK_SIZE];
read_block(ext2_inode->dbp[i], block);
memcpy(data + i * BLOCK_SIZE, block,
@@ -185,7 +188,8 @@ char *files_to_buffer(uint32_t inode)
path_t *path_to_list(const char *path)
{
- size_t i, j;
+ size_t i;
+ size_t j;
path_t *divided_path = (path_t *)kalloc(sizeof(path_t));
INIT_LIST(divided_path->list)
diff --git a/kernel/src/libk/serial_stdio.c b/kernel/src/libk/serial_stdio.c
index 002eb9e..020917b 100644
--- a/kernel/src/libk/serial_stdio.c
+++ b/kernel/src/libk/serial_stdio.c
@@ -14,7 +14,8 @@ void serial_print_char(char c)
void serial_print_string(const char *s)
{
- for (size_t i = 0; i < strlen(s); i++) {
+ size_t i;
+ for (i = 0; i < strlen(s); i++) {
serial_print_char(s[i]);
}
}
@@ -47,11 +48,12 @@ void serial_vprintf(const char *s, va_list list)
{
lock(serial_stdio_lock);
size_t count = 0;
- for (size_t i = 0; i < strlen(s); i++)
+ size_t i;
+ for (i = 0; i < strlen(s); i++)
if (s[i] == '%')
count++;
- for (size_t i = 0; i < strlen(s); i++) {
+ for (i = 0; i < strlen(s); i++) {
if (s[i] == '%') {
i++;
if (s[i] == 'c')
diff --git a/kernel/src/libk/stdio.c b/kernel/src/libk/stdio.c
index f410ccd..6fea685 100644
--- a/kernel/src/libk/stdio.c
+++ b/kernel/src/libk/stdio.c
@@ -36,7 +36,8 @@ void print_char(char c)
void print_string(const char *s)
{
- for (size_t i = 0; i < strlen(s); i++) {
+ size_t i;
+ for (i = 0; i < strlen(s); i++) {
print_char(s[i]);
}
}
@@ -69,11 +70,12 @@ void vprintf(const char *s, va_list list)
{
lock(stdio_lock);
size_t count = 0;
- for (size_t i = 0; i < strlen(s); i++)
+ size_t i;
+ for (i = 0; i < strlen(s); i++)
if (s[i] == '%')
count++;
- for (size_t i = 0; i < strlen(s); i++) {
+ for (i = 0; i < strlen(s); i++) {
if (s[i] == '%') {
i++;
if (s[i] == 'c')
diff --git a/kernel/src/libk/string.c b/kernel/src/libk/string.c
index b8fd659..176a07d 100644
--- a/kernel/src/libk/string.c
+++ b/kernel/src/libk/string.c
@@ -17,7 +17,8 @@ uint64_t stoi(const char *s)
uint64_t num = 0;
size_t n = strlen(s);
- for (size_t i = 0; i < n; i++) {
+ size_t i;
+ for (i = 0; i < n; i++) {
num *= 10;
num += (uint64_t)(s[i] - '0');
}
@@ -29,10 +30,11 @@ void strrev(char *s)
{
size_t n = strlen(s);
char a[100];
- for (size_t i = 0; i < n; i++) {
+ size_t i;
+ for (i = 0; i < n; i++) {
a[i] = s[n - 1 - i];
}
- for (size_t i = 0; i < n; i++) {
+ for (i = 0; i < n; i++) {
s[i] = a[i];
}
}
@@ -80,7 +82,8 @@ void memcpy(const void *destptr, const void *srcptr, size_t n)
uint8_t *dest = (uint8_t *)destptr;
const uint8_t *src = (const uint8_t *)srcptr;
- for (size_t i = 0; i < n; i++) {
+ size_t i;
+ for (i = 0; i < n; i++) {
dest[i] = src[i];
}
}
@@ -88,8 +91,8 @@ void memcpy(const void *destptr, const void *srcptr, size_t n)
void memset(const void *destptr, uint8_t value, size_t n)
{
uint8_t *dest = (uint8_t *)destptr;
-
- for (size_t i = 0; i < n; i++) {
+ size_t i;
+ for (i = 0; i < n; i++) {
dest[i] = value;
}
}
@@ -101,8 +104,8 @@ int32_t memcmp(const void *aptr, const void *bptr)
const size_t len_a = strlen((char *)a);
const size_t len_b = strlen((char *)b);
-
- for (size_t i = 0; i < len_a && i < len_b; i++) {
+ size_t i;
+ for (i = 0; i < len_a && i < len_b; i++) {
if (a[i] != b[i])
return a[i] - b[i];
}
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++;
diff --git a/kernel/src/misc/graphics.c b/kernel/src/misc/graphics.c
index 8f2dd05..38665a5 100644
--- a/kernel/src/misc/graphics.c
+++ b/kernel/src/misc/graphics.c
@@ -27,8 +27,10 @@ void set_color(fb_t *fb, uint32_t char_col, uint32_t bg_col)
void clear_screen(fb_t fb)
{
- for (size_t i = 0; i < fb.height; i++) {
- for (size_t j = 0; j < fb.width; j++) {
+ size_t i;
+ size_t j;
+ for (i = 0; i < fb.height; i++) {
+ for (j = 0; j < fb.width; j++) {
fb_draw_pixel(fb, (int32_t)i, (int32_t)j, BLACK);
}
}
@@ -48,8 +50,9 @@ void fb_draw_line_low(fb_t fb, int32_t x0, int32_t y0, int32_t x1, int32_t y1,
}
int32_t D = (2 * dy) - dx;
int32_t y = y0;
+ int32_t x;
- for (int32_t x = x0; x <= x1; x++) {
+ for (x = x0; x <= x1; x++) {
fb_draw_pixel(fb, x, y, col);
if (D > 0) {
y = y + yi;
@@ -73,7 +76,8 @@ void fb_draw_line_high(fb_t fb, int32_t x0, int32_t y0, int32_t x1, int32_t y1,
int32_t D = (2 * dx) - dy;
int32_t x = x0;
- for (int32_t y = y0; y <= y1; y++) {
+ int32_t y;
+ for (y = y0; y <= y1; y++) {
fb_draw_pixel(fb, x, y, col);
if (D > 0) {
x = x + xi;
@@ -106,8 +110,10 @@ void fb_draw_character(fb_t fb, char c, int32_t x, int32_t y)
return;
int32_t offset = 32 + c * 16;
- for (int32_t i = 0; i < 16; i++) {
- for (int32_t j = 0; j < 8; j++) {
+ int32_t i;
+ int32_t j;
+ for (i = 0; i < 16; i++) {
+ for (j = 0; j < 8; j++) {
if (font[offset + i] & (1 << (7 - j))) {
fb_draw_pixel(fb, x + j, y + i, fb.char_col);
} else {
diff --git a/kernel/src/misc/stdbuff.c b/kernel/src/misc/stdbuff.c
index 4362882..b58d92d 100644
--- a/kernel/src/misc/stdbuff.c
+++ b/kernel/src/misc/stdbuff.c
@@ -14,7 +14,8 @@ stdbuff *init_buff(uint32_t buff_size)
void read_buff(stdbuff *buffer, char *dest_ptr, size_t read_size)
{
- for (size_t i = 0; i < read_size; i++) {
+ size_t i;
+ for (i = 0; i < read_size; i++) {
memcpy(dest_ptr + i,
buffer->data + ((buffer->tail + i) % buffer->size), 1);
}
@@ -24,7 +25,8 @@ void read_buff(stdbuff *buffer, char *dest_ptr, size_t read_size)
void write_buff(stdbuff *buffer, const char *src_ptr, size_t write_size)
{
- for (size_t i = 0; i < write_size; i++) {
+ size_t i;
+ for (i = 0; i < write_size; i++) {
memcpy(buffer->data + ((buffer->head + i) % buffer->size),
src_ptr + i, 1);
}
generated by cgit v1.2.3 (git 2.46.0) at 2025-12-17 08:10:45 +0000