diff options
37 files changed, 141 insertions, 131 deletions
@@ -1,8 +1,8 @@ # MIT License, Copyright (c) 2020 Marvin Borner CFLAGS_OPTIMIZATION = -finline -finline-functions -Ofast -CFLAGS_WARNINGS = -Wall -Wextra -pedantic -Wshadow -Wpointer-arith -Wwrite-strings -Wredundant-decls -Wnested-externs -Wformat=2 #-Wmissing-declarations # TODO: Make more methods static -CFLAGS_DEFAULT = $(CFLAGS_WARNINGS) $(CFLAGS_OPTIMIZATION) -std=c99 -m32 -nostdlib -nostdinc -fno-builtin -fno-profile-generate -mno-red-zone +CFLAGS_WARNINGS = -Wall -Wextra -Werror -Wshadow -Wpointer-arith -Wwrite-strings -Wredundant-decls -Wnested-externs -Wformat=2 -Wmissing-declarations -Wstrict-prototypes -Wmissing-prototypes -Wcast-qual -Wswitch-default -Wswitch-enum -Wlogical-op -Wunreachable-code -Wundef -Wold-style-definition -pedantic-errors +CFLAGS_DEFAULT = $(CFLAGS_WARNINGS) $(CFLAGS_OPTIMIZATION) -std=c99 -m32 -nostdlib -nostdinc -fno-builtin -fno-profile-generate -fno-omit-frame-pointer -fno-common -mno-red-zone all: compile @@ -27,7 +27,7 @@ This project is somewhat of a coding playground for me. It doesn't have any usef - Fast boot time (< 1s) - TCP/IP stack and rtl8139 driver - Small size (< 100KiB) -- Compiles with `-Wall -Wextra -pedantic-errors -std=c99 -Ofast` +- Compiles with `-Wall -Wextra -Werror -pedantic-errors -std=c99 -Ofast` ## Screenshot diff --git a/apps/window.c b/apps/window.c index 96691fa..ac29ba1 100644 --- a/apps/window.c +++ b/apps/window.c @@ -4,7 +4,7 @@ #include <gui.h> #include <print.h> -int main() +int main(void) { struct gui_window win = { 0 }; assert(gui_new_window(&win) > 0); @@ -53,7 +53,7 @@ static struct { u8 right : 1; } mouse = { 0 }; -static void buffer_flush() +static void buffer_flush(void) { #ifdef FLUSH_TIMEOUT static u32 time_flush = 0; diff --git a/boot/load.c b/boot/load.c index fea2395..69024c0 100644 --- a/boot/load.c +++ b/boot/load.c @@ -130,14 +130,14 @@ static u32 heap; void *read_inode(struct inode *in); struct inode *get_inode(int i); int find_inode(const char *name, int dir_inode); -void serial_install(); +void serial_install(void); void serial_print(const char *data); int main(void *data) { serial_install(); heap = 0xf000; - void (*entry)(); + void (*entry)(void *); *(void **)(&entry) = read_inode(get_inode(find_inode("kernel.bin", 2))); if (entry) { serial_print("Loaded kernel!\n"); @@ -211,7 +211,7 @@ static u32 strlen(const char *s) return ss - s; } -void serial_install() +void serial_install(void) { outb(0x3f8 + 1, 0x00); outb(0x3f8 + 3, 0x80); @@ -222,7 +222,7 @@ void serial_install() outb(0x3f8 + 4, 0x0B); } -static int is_transmit_empty() +static int is_transmit_empty(void) { return inb(0x3f8 + 5) & 0x20; } @@ -286,7 +286,7 @@ static void *buffer_read(int block) return ide_read(malloc(BLOCK_SIZE), block); } -static struct superblock *get_superblock() +static struct superblock *get_superblock(void) { struct superblock *sb = buffer_read(EXT2_SUPER); if (sb->magic != EXT2_MAGIC) @@ -294,7 +294,7 @@ static struct superblock *get_superblock() return sb; } -static struct bgd *get_bgd() +static struct bgd *get_bgd(void) { return buffer_read(EXT2_SUPER + 1); } diff --git a/kernel/drivers/interrupts.c b/kernel/drivers/interrupts.c index d9d514c..268bff5 100644 --- a/kernel/drivers/interrupts.c +++ b/kernel/drivers/interrupts.c @@ -29,7 +29,7 @@ void idt_set_gate(u8 num, u32 base, u16 sel, u8 flags) } // Install IDT -static void idt_install() +static void idt_install(void) { // Set IDT pointer and limit idt_ptr.limit = (sizeof(struct idt_entry) * 256) - 1; @@ -60,7 +60,7 @@ void irq_uninstall_handler(int irq) } // Remap the IRQ table -static void irq_remap() +static void irq_remap(void) { outb(0x20, 0x11); outb(0xA0, 0x11); diff --git a/kernel/drivers/keyboard.c b/kernel/drivers/keyboard.c index f7f9d2d..3ae3c0e 100644 --- a/kernel/drivers/keyboard.c +++ b/kernel/drivers/keyboard.c @@ -18,8 +18,9 @@ static u32 dev_id = 0; static int state = 0; static int merged = 0; -static void keyboard_handler() +static void keyboard_handler(struct regs *r) { + UNUSED(r); int scancode = inb(0x60); // TODO: Support more than two-byte scancodes diff --git a/kernel/drivers/mouse.c b/kernel/drivers/mouse.c index ce9d15c..40094d1 100644 --- a/kernel/drivers/mouse.c +++ b/kernel/drivers/mouse.c @@ -19,8 +19,9 @@ static u32 dev_id = 0; static struct event_mouse *event = NULL; -static void mouse_handler() +static void mouse_handler(struct regs *r) { + UNUSED(r); switch (mouse_cycle) { case 0: mouse_byte[0] = (char)inb(0x60); diff --git a/kernel/drivers/rtl8139.c b/kernel/drivers/rtl8139.c index 1f9eed9..753bd6a 100644 --- a/kernel/drivers/rtl8139.c +++ b/kernel/drivers/rtl8139.c @@ -82,8 +82,9 @@ static void rtl8139_find(u32 device, u16 vendor_id, u16 device_id, void *extra) } } -static void rtl8139_irq_handler() +static void rtl8139_irq_handler(struct regs *r) { + UNUSED(r); u16 status = inw(rtl_iobase + RTL_PORT_ISR); if (!status) return; diff --git a/kernel/features/fs.c b/kernel/features/fs.c index 9ea5458..c7aacd0 100644 --- a/kernel/features/fs.c +++ b/kernel/features/fs.c @@ -186,7 +186,7 @@ s32 vfs_stat(const char *path, struct stat *buf) return m->dev->vfs->stat(path, buf, m->dev); } -s32 vfs_wait(const char *path, s32 (*func)()) +s32 vfs_wait(const char *path, u32 func_ptr) { while (*path == ' ') path++; @@ -196,7 +196,7 @@ s32 vfs_wait(const char *path, s32 (*func)()) // Default wait if (!m->dev->vfs->wait) { - proc_wait_for(vfs_find_dev(path)->id, PROC_WAIT_DEV, func); + proc_wait_for(vfs_find_dev(path)->id, PROC_WAIT_DEV, func_ptr); return 1; } @@ -204,7 +204,7 @@ s32 vfs_wait(const char *path, s32 (*func)()) if (len > 1) path += len; - return m->dev->vfs->wait(path, func, m->dev); + return m->dev->vfs->wait(path, func_ptr, m->dev); } s32 vfs_poll(const char **files) @@ -217,7 +217,7 @@ s32 vfs_poll(const char **files) return p - files; for (const char **p = files; *p && **p; p++) - vfs_wait(*p, vfs_poll); + vfs_wait(*p, (u32)vfs_poll); return PROC_MAX_WAIT_IDS + 1; } diff --git a/kernel/features/load.c b/kernel/features/load.c index 3e1ea8e..f79e6b4 100644 --- a/kernel/features/load.c +++ b/kernel/features/load.c @@ -14,7 +14,7 @@ void proc_load(struct proc *proc, void *data) proc->regs.eip = (u32)data; } -int bin_load(char *path, struct proc *proc) +int bin_load(const char *path, struct proc *proc) { // TODO: Remove hardcoded filesize struct stat s = { 0 }; diff --git a/kernel/features/net.c b/kernel/features/net.c index be36f14..104538f 100644 --- a/kernel/features/net.c +++ b/kernel/features/net.c @@ -817,7 +817,7 @@ int net_receive(struct socket *socket, void *buf, u32 len) * Install */ -int net_installed() +int net_installed(void) { return rtl8139_installed() != 0; } diff --git a/kernel/features/proc.c b/kernel/features/proc.c index c21ffcc..48bde72 100644 --- a/kernel/features/proc.c +++ b/kernel/features/proc.c @@ -74,7 +74,7 @@ void scheduler(struct regs *regs) /* printf("{%d}", ((struct proc *)current->data)->pid); */ } -static void kernel_idle() +static void kernel_idle(void) { while (1) ; @@ -121,7 +121,7 @@ struct proc *proc_from_pid(u32 pid) return NULL; } -void proc_clear_quantum() +void proc_clear_quantum(void) { quantum = 0; } @@ -179,9 +179,10 @@ void proc_enable_waiting(u32 id, enum proc_wait_type type) if (w->ids[i].magic == PROC_WAIT_MAGIC && w->ids[i].id == id && w->ids[i].type == type) { struct regs *r = &p->regs; - if (w->ids[i].func) - r->eax = (u32)w->ids[i].func((char *)r->ebx, (void *)r->ecx, - r->edx, r->esi); + u32 (*func)(u32, u32, u32, u32) = + (u32(*)(u32, u32, u32, u32))w->ids[i].func_ptr; + if (w->ids[i].func_ptr) + r->eax = func(r->ebx, r->ecx, r->edx, r->esi); memset(&w->ids[i], 0, sizeof(w->ids[i])); p->wait.id_cnt--; p->state = PROC_RUNNING; @@ -196,7 +197,7 @@ void proc_enable_waiting(u32 id, enum proc_wait_type type) current = list_first_data(proc_list, proc_bak); } -void proc_wait_for(u32 id, enum proc_wait_type type, s32 (*func)()) +void proc_wait_for(u32 id, enum proc_wait_type type, u32 func_ptr) { u8 already_exists = 0; struct proc *p = proc_current(); @@ -204,7 +205,7 @@ void proc_wait_for(u32 id, enum proc_wait_type type, s32 (*func)()) // Check if already exists for (u32 i = 0; i < p->wait.id_cnt; i++) { if (p->wait.ids[i].id == id && p->wait.ids[i].type == type) { - assert(p->wait.ids[i].func == func); + assert(p->wait.ids[i].func_ptr == func_ptr); already_exists = 1; } } @@ -227,7 +228,7 @@ void proc_wait_for(u32 id, enum proc_wait_type type, s32 (*func)()) slot->magic = PROC_WAIT_MAGIC; slot->id = id; slot->type = type; - slot->func = func; + slot->func_ptr = func_ptr; p->wait.id_cnt++; end: @@ -369,7 +370,7 @@ static s32 procfs_read(const char *path, void *buf, u32 offset, u32 count, struc return -1; } -static s32 procfs_wait(const char *path, s32 (*func)(), struct device *dev) +static s32 procfs_wait(const char *path, u32 func_ptr, struct device *dev) { u32 pid = 0; procfs_parse_path(&path, &pid); @@ -381,10 +382,10 @@ static s32 procfs_wait(const char *path, s32 (*func)(), struct device *dev) path++; if (!memcmp(path, "msg", 4)) { - proc_wait_for(pid, PROC_WAIT_MSG, func); + proc_wait_for(pid, PROC_WAIT_MSG, func_ptr); return 1; } else { - proc_wait_for(dev->id, PROC_WAIT_DEV, func); + proc_wait_for(dev->id, PROC_WAIT_DEV, func_ptr); return 1; } } @@ -461,14 +462,14 @@ void proc_init(void) // Idle proc struct proc *kernel_proc = proc_make(); - void (*func)() = kernel_idle; + void (*func)(void) = kernel_idle; proc_load(kernel_proc, *(void **)&func); strcpy(kernel_proc->name, "idle"); kernel_proc->state = PROC_SLEEPING; idle_proc = list_add(proc_list, kernel_proc); struct node *new = list_add(proc_list, proc_make()); - bin_load((char *)"/bin/init", new->data); + bin_load("/bin/init", new->data); current = new; _eip = ((struct proc *)new->data)->regs.eip; diff --git a/kernel/features/syscall.c b/kernel/features/syscall.c index 538fd59..61c7479 100644 --- a/kernel/features/syscall.c +++ b/kernel/features/syscall.c @@ -41,7 +41,7 @@ static void syscall_handler(struct regs *r) if (vfs_ready((char *)r->ebx)) { r->eax = (u32)vfs_read((char *)r->ebx, (void *)r->ecx, r->edx, r->esi); } else { - if (vfs_wait((char *)r->ebx, vfs_read) < 0) + if (vfs_wait((char *)r->ebx, (u32)vfs_read) < 0) r->eax = -1; else proc_yield(r); diff --git a/kernel/inc/boot.h b/kernel/inc/boot.h index 98e964d..6bacc31 100644 --- a/kernel/inc/boot.h +++ b/kernel/inc/boot.h @@ -6,7 +6,7 @@ #include <def.h> -struct vid_info *boot_passed; +extern struct vid_info *boot_passed; struct vid_info { u32 mode; u32 *vbe; diff --git a/kernel/inc/fs.h b/kernel/inc/fs.h index 868cd3e..33b1afb 100644 --- a/kernel/inc/fs.h +++ b/kernel/inc/fs.h @@ -20,7 +20,7 @@ struct device { void *data; s32 (*read)(void *buf, u32 offset, u32 count, struct device *dev); s32 (*write)(void *buf, u32 offset, u32 count, struct device *dev); - u8 (*ready)(); + u8 (*ready)(void); }; void device_install(void); @@ -41,7 +41,7 @@ struct vfs { s32 (*read)(const char *path, void *buf, u32 offset, u32 count, struct device *dev); s32 (*write)(const char *path, void *buf, u32 offset, u32 count, struct device *dev); s32 (*stat)(const char *path, struct stat *buf, struct device *dev); - s32 (*wait)(const char *path, s32 (*func)(), struct device *dev); + s32 (*wait)(const char *path, u32 func_ptr, struct device *dev); u8 (*perm)(const char *path, enum vfs_perm perm, struct device *dev); u8 (*ready)(const char *path, struct device *dev); }; @@ -61,7 +61,7 @@ struct device *vfs_find_dev(const char *path); s32 vfs_read(const char *path, void *buf, u32 offset, u32 count); s32 vfs_write(const char *path, void *buf, u32 offset, u32 count); s32 vfs_stat(const char *path, struct stat *buf); -s32 vfs_wait(const char *path, s32 (*func)()); +s32 vfs_wait(const char *path, u32 func_ptr); s32 vfs_poll(const char **files); u8 vfs_ready(const char *path); diff --git a/kernel/inc/interrupts.h b/kernel/inc/interrupts.h index 1c475b1..30c91c3 100644 --- a/kernel/inc/interrupts.h +++ b/kernel/inc/interrupts.h @@ -37,56 +37,56 @@ void interrupts_install(void); // External handlers (ASM) -extern void isr0(); -extern void isr1(); -extern void isr2(); -extern void isr3(); -extern void isr4(); -extern void isr5(); -extern void isr6(); -extern void isr7(); -extern void isr8(); -extern void isr9(); -extern void isr10(); -extern void isr11(); -extern void isr12(); -extern void isr13(); -extern void isr14(); -extern void isr15(); -extern void isr16(); -extern void isr17(); -extern void isr18(); -extern void isr19(); -extern void isr20(); -extern void isr21(); -extern void isr22(); -extern void isr23(); -extern void isr24(); -extern void isr25(); -extern void isr26(); -extern void isr27(); -extern void isr28(); -extern void isr29(); -extern void isr30(); -extern void isr31(); -extern void isr128(); +extern void isr0(struct regs *r); +extern void isr1(struct regs *r); +extern void isr2(struct regs *r); +extern void isr3(struct regs *r); +extern void isr4(struct regs *r); +extern void isr5(struct regs *r); +extern void isr6(struct regs *r); +extern void isr7(struct regs *r); +extern void isr8(struct regs *r); +extern void isr9(struct regs *r); +extern void isr10(struct regs *r); +extern void isr11(struct regs *r); +extern void isr12(struct regs *r); +extern void isr13(struct regs *r); +extern void isr14(struct regs *r); +extern void isr15(struct regs *r); +extern void isr16(struct regs *r); +extern void isr17(struct regs *r); +extern void isr18(struct regs *r); +extern void isr19(struct regs *r); +extern void isr20(struct regs *r); +extern void isr21(struct regs *r); +extern void isr22(struct regs *r); +extern void isr23(struct regs *r); +extern void isr24(struct regs *r); +extern void isr25(struct regs *r); +extern void isr26(struct regs *r); +extern void isr27(struct regs *r); +extern void isr28(struct regs *r); +extern void isr29(struct regs *r); +extern void isr30(struct regs *r); +extern void isr31(struct regs *r); +extern void isr128(struct regs *r); -extern void irq0(); -extern void irq1(); -extern void irq2(); -extern void irq3(); -extern void irq4(); -extern void irq5(); -extern void irq6(); -extern void irq7(); -extern void irq8(); -extern void irq9(); -extern void irq10(); -extern void irq11(); -extern void irq12(); -extern void irq13(); -extern void irq14(); -extern void irq15(); -extern void irq128(); +extern void irq0(struct regs *r); +extern void irq1(struct regs *r); +extern void irq2(struct regs *r); +extern void irq3(struct regs *r); +extern void irq4(struct regs *r); +extern void irq5(struct regs *r); +extern void irq6(struct regs *r); +extern void irq7(struct regs *r); +extern void irq8(struct regs *r); +extern void irq9(struct regs *r); +extern void irq10(struct regs *r); +extern void irq11(struct regs *r); +extern void irq12(struct regs *r); +extern void irq13(struct regs *r); +extern void irq14(struct regs *r); +extern void irq15(struct regs *r); +extern void irq128(struct regs *r); #endif diff --git a/kernel/inc/load.h b/kernel/inc/load.h index 422a28c..407fbeb 100644 --- a/kernel/inc/load.h +++ b/kernel/inc/load.h @@ -6,6 +6,6 @@ #include <proc.h> void proc_load(struct proc *proc, void *data); -int bin_load(char *path, struct proc *proc); +int bin_load(const char *path, struct proc *proc); #endif diff --git a/kernel/inc/proc.h b/kernel/inc/proc.h index cd74b40..a232f46 100644 --- a/kernel/inc/proc.h +++ b/kernel/inc/proc.h @@ -30,7 +30,7 @@ struct proc_wait_identifier { u32 magic; u32 id; enum proc_wait_type type; - s32 (*func)(); + u32 func_ptr; }; struct proc_wait { @@ -63,9 +63,9 @@ u8 proc_super(void); struct proc *proc_from_pid(u32 pid); void proc_exit(struct proc *proc, int status); void proc_yield(struct regs *r); -void proc_clear_quantum(); +void proc_clear_quantum(void); void proc_enable_waiting(u32 id, enum proc_wait_type type); -void proc_wait_for(u32 id, enum proc_wait_type type, s32 (*func)()); +void proc_wait_for(u32 id, enum proc_wait_type type, u32 func_ptr); struct proc *proc_make(void); #endif diff --git a/kernel/main.c b/kernel/main.c index f8815eb..5e236a7 100644 --- a/kernel/main.c +++ b/kernel/main.c @@ -16,6 +16,8 @@ #include <syscall.h> #include <timer.h> +struct vid_info *boot_passed; + void kernel_main(struct vid_info *vid_info); // Decl void kernel_main(struct vid_info *vid_info) { @@ -100,8 +100,9 @@ static u8 cpu_has_feature(u32 feature) return (cpu_features & feature) != 0; } -static void fpu_handler() +static void fpu_handler(struct regs *r) { + UNUSED(r); __asm__ volatile("clts"); } diff --git a/libc/inc/def.h b/libc/inc/def.h index 02a2990..8ff6d81 100644 --- a/libc/inc/def.h +++ b/libc/inc/def.h @@ -23,6 +23,8 @@ typedef unsigned long long u64; * Macros */ +#define UNUSED(a) ((void)(a)) + #define EOF (-1) #define NULL ((void *)0) diff --git a/libc/inc/list.h b/libc/inc/list.h index 50b21c2..0b82b48 100644 --- a/libc/inc/list.h +++ b/libc/inc/list.h @@ -16,7 +16,7 @@ struct node { struct node *prev; }; -struct list *list_new(); +struct list *list_new(void); void list_destroy(struct list *list); /* struct node *list_new_node(); */ // TODO: Make node-specific things static/private? /* void list_add_node(struct list *list, struct node *node); */ diff --git a/libc/inc/mem.h b/libc/inc/mem.h index e4416dd..6c37844 100644 --- a/libc/inc/mem.h +++ b/libc/inc/mem.h @@ -5,8 +5,6 @@ #include <def.h> -int malloc_allocated; - void *malloc_debug(u32 size, const char *file, int line, const char *func, const char *inp); void free_debug(void *ptr, const char *file, int line, const char *func, const char *inp); #define malloc(size) malloc_debug((u32)(size), __FILE__, __LINE__, __func__, #size) diff --git a/libc/inc/random.h b/libc/inc/random.h index 50c849b..59add9b 100644 --- a/libc/inc/random.h +++ b/libc/inc/random.h @@ -6,7 +6,7 @@ #include <def.h> void srand(u32 seed); -u32 rand(); +u32 rand(void); char *randstr(u32 size); #endif diff --git a/libc/inc/serial.h b/libc/inc/serial.h index 6511952..4d04d6a 100644 --- a/libc/inc/serial.h +++ b/libc/inc/serial.h @@ -3,7 +3,7 @@ #ifndef SERIAL_H #define SERIAL_H -void serial_install(); +void serial_install(void); void serial_print(const char *data); #endif diff --git a/libc/inc/stack.h b/libc/inc/stack.h index 16725f8..f5ad52b 100644 --- a/libc/inc/stack.h +++ b/libc/inc/stack.h @@ -16,7 +16,7 @@ struct stack { struct stack_node *tail; }; -struct stack *stack_new(); +struct stack *stack_new(void); void stack_destroy(struct stack *stack); u32 stack_empty(struct stack *stack); u32 stack_push_bot(struct stack *stack, void *data); diff --git a/libc/inc/str.h b/libc/inc/str.h index 662cbe7..0ef49a6 100644 --- a/libc/inc/str.h +++ b/libc/inc/str.h @@ -8,8 +8,8 @@ u32 strlen(const char *s); char *strcpy(char *dst, const char *src); char *strncpy(char *dst, const char *src, u32 n); -char *strchr(const char *s, int c); -char *strrchr(const char *s, int c); +char *strchr(char *s, int c); +char *strrchr(char *s, int c); char *strcat(char *dst, const char *src); char *strncat(char *dst, const char *src, u32 n); int strcmp(const char *s1, const char *s2); diff --git a/libc/inc/sys.h b/libc/inc/sys.h index be4352f..5858579 100644 --- a/libc/inc/sys.h +++ b/libc/inc/sys.h @@ -65,7 +65,7 @@ int sysv(enum sys num, ...); * Syscall wrappers */ -#define loop() sys0(SYS_LOOP) +#define loop(void) sys0(SYS_LOOP) #define read(path, buf, offset, count) \ (s32) sys4(SYS_READ, (int)(path), (int)(buf), (int)(offset), (int)(count)) #define write(path, buf, offset, count) \ @@ -80,10 +80,10 @@ int sysv(enum sys num, ...); yield(); \ } \ } -#define yield() (int)sys0(SYS_YIELD) -#define time() (u32) sys0(SYS_TIME) +#define yield(void) (int)sys0(SYS_YIELD) +#define time(void) (u32) sys0(SYS_TIME) -static inline u32 getpid() +static inline u32 getpid(void) { u32 buf = 0; read("/proc/self/pid", &buf, 0, sizeof(buf)); diff --git a/libc/list.c b/libc/list.c index 330d65d..f96fb27 100644 --- a/libc/list.c +++ b/libc/list.c @@ -6,7 +6,7 @@ static int nonce = 0; -struct list *list_new() +struct list *list_new(void) { struct list *list = malloc(sizeof(*list)); list->head = NULL; @@ -29,7 +29,7 @@ void list_destroy(struct list *list) list = NULL; } -static struct node *list_new_node() +static struct node *list_new_node(void) { struct node *node = malloc(sizeof(*node)); node->data = NULL; @@ -9,14 +9,16 @@ void *memcpy(void *dest, const void *src, u32 n) { #ifdef userspace // Inspired by Jeko at osdev + u8 *dest_byte = dest; + const u8 *src_byte = src; for (u32 i = 0; i < n / 16; i++) { __asm__ volatile("movups (%0), %%xmm0\n" - "movntdq %%xmm0, (%1)\n" ::"r"(src), - "r"(dest) + "movntdq %%xmm0, (%1)\n" ::"r"(src_byte), + "r"(dest_byte) : "memory"); - src = ((u8 *)src) + 16; - dest = ((u8 *)dest) + 16; + src_byte += 16; + dest_byte += 16; } if (n & 7) { @@ -32,18 +34,18 @@ void *memcpy(void *dest, const void *src, u32 n) "movsb\n" "2:" : "=&c"(d0), "=&D"(d1), "=&S"(d2) - : "0"(n / 4), "q"(n), "1"((long)dest), "2"((long)src) + : "0"(n / 4), "q"(n), "1"((long)dest_byte), "2"((long)src_byte) : "memory"); } - return dest; + return dest_byte; #else // Inspired by jgraef at osdev u32 num_dwords = n / 4; u32 num_bytes = n % 4; u32 *dest32 = (u32 *)dest; - u32 *src32 = (u32 *)src; + const u32 *src32 = (const u32 *)src; u8 *dest8 = ((u8 *)dest) + num_dwords * 4; - u8 *src8 = ((u8 *)src) + num_dwords * 4; + const u8 *src8 = ((const u8 *)src) + num_dwords * 4; // TODO: What's faster? __asm__ volatile("rep movsl\n" @@ -89,11 +91,11 @@ void *memset(void *dest, int val, u32 n) void *memchr(void *src, int c, u32 n) { - const u8 *s = (const u8 *)src; + u8 *s = (u8 *)src; while (n-- > 0) { if (*s == c) - return (void *)s; + return s; s++; } return NULL; diff --git a/libc/random.c b/libc/random.c index a2a8273..8c8076f 100644 --- a/libc/random.c +++ b/libc/random.c @@ -11,7 +11,7 @@ void srand(u32 seed) g_seed = seed; } -u32 rand() +u32 rand(void) { g_seed = g_seed * 1103515245 + 12345; return (g_seed >> 16) & 0x7FFF; diff --git a/libc/serial.c b/libc/serial.c index 62263fb..b11ac26 100644 --- a/libc/serial.c +++ b/libc/serial.c @@ -5,7 +5,7 @@ #include <serial.h> #include <str.h> -void serial_install() +void serial_install(void) { outb(0x3f8 + 1, 0x00); outb(0x3f8 + 3, 0x80); @@ -16,7 +16,7 @@ void serial_install() outb(0x3f8 + 4, 0x0B); } -static int is_transmit_empty() +static int is_transmit_empty(void) { return inb(0x3f8 + 5) & 0x20; } diff --git a/libc/stack.c b/libc/stack.c index 0941e29..e86a8c6 100644 --- a/libc/stack.c +++ b/libc/stack.c @@ -6,7 +6,7 @@ static int nonce = 0; -struct stack *stack_new() +struct stack *stack_new(void) { struct stack *stack = malloc(sizeof(*stack)); stack->tail = NULL; @@ -29,7 +29,7 @@ void stack_destroy(struct stack *stack) stack = NULL; } -static struct stack_node *stack_new_node() +static struct stack_node *stack_new_node(void) { struct stack_node *node = malloc(sizeof(*node)); node->data = NULL; @@ -67,7 +67,7 @@ int strncmp(const char *s1, const char *s2, u32 n) return d; } -char *strchr(const char *s, int c) +char *strchr(char *s, int c) { while (*s != (char)c) { if (!*s) @@ -75,16 +75,16 @@ char *strchr(const char *s, int c) s++; } - return (char *)s; + return s; } -char *strrchr(const char *s, int c) +char *strrchr(char *s, int c) { char *ret = 0; do { if (*s == c) - ret = (char *)s; + ret = s; } while (*s++); return ret; diff --git a/libgui/png.c b/libgui/png.c index 03ff89e..5f55a3e 100644 --- a/libgui/png.c +++ b/libgui/png.c @@ -5228,7 +5228,7 @@ static u32 readChunk_iTXt(pngInfo *info, const pngDecoderSettings *decoder, cons png_free(str); } else { error = png_add_itext_sized(info, key, langtag, transkey, - (char *)(data + begin), length); + (const char *)(data + begin), length); } break; @@ -7253,8 +7253,9 @@ const char *png_error_text(u32 code) unreasonable memory consumption when decoding due to impossibly large ICC profile*/ case 113: return "ICC profile unreasonably large"; + default: + return "unknown error code"; } - return "unknown error code"; } #endif /*PNG_COMPILE_ERROR_TEXT*/ diff --git a/libnet/dns.c b/libnet/dns.c index 0ca2f99..6b59ac9 100644 --- a/libnet/dns.c +++ b/libnet/dns.c @@ -34,7 +34,7 @@ static u32 part_count(const char *name) static u32 part_len(const char *name, u32 index) { - char *data = (char *)name; + const char *data = name; u32 cnt = 0; for (u32 i = 0; i < strlen(name); i++) { |