diff options
| -rw-r--r-- | kernel/features/proc.c | 9 | ||||
| -rw-r--r-- | libs/libc/alloc.c | 2 | ||||
| -rw-r--r-- | libs/libc/inc/cpu.h | 2 | ||||
| -rw-r--r-- | libs/libc/print.c | 2 |
4 files changed, 8 insertions, 7 deletions
diff --git a/kernel/features/proc.c b/kernel/features/proc.c index 52627ed..2b2d2d2 100644 --- a/kernel/features/proc.c +++ b/kernel/features/proc.c @@ -16,7 +16,7 @@ #define PROC(node) ((struct proc *)node->data) -static u8 locked = 0; +static u32 locked = 0; static u32 current_pid = 0; static struct node *idle_proc = NULL; static struct node *current = NULL; @@ -132,6 +132,8 @@ void proc_state(struct proc *proc, enum proc_state state) void proc_exit(struct proc *proc, struct regs *r, s32 status) { + assert(proc != idle_proc->data); + struct node *running = list_first_data(proc_list_running, proc); if (!running || !list_remove(proc_list_running, running)) { struct node *blocked = list_first_data(proc_list_blocked, proc); @@ -156,6 +158,8 @@ void proc_exit(struct proc *proc, struct regs *r, s32 status) printf("\t-> 0x%x: %dB\n", link->vrange.base, link->vrange.size); iterator = iterator->next; } + } else { + printf("Process didn't leak memory!\n"); } stack_destroy(proc->messages); @@ -164,8 +168,7 @@ void proc_exit(struct proc *proc, struct regs *r, s32 status) free(proc); - if (current->data == proc) - proc_yield(r); + proc_yield(r); } void proc_yield(struct regs *r) diff --git a/libs/libc/alloc.c b/libs/libc/alloc.c index f45c5af..928a519 100644 --- a/libs/libc/alloc.c +++ b/libs/libc/alloc.c @@ -40,7 +40,7 @@ static int liballoc_free(void *ptr, u32 p) #endif -static u8 locked = 0; +static u32 locked = 0; static int liballoc_lock(void) { diff --git a/libs/libc/inc/cpu.h b/libs/libc/inc/cpu.h index 52e5571..4c6e721 100644 --- a/libs/libc/inc/cpu.h +++ b/libs/libc/inc/cpu.h @@ -14,7 +14,7 @@ void outb(u16 port, u8 data); void outw(u16 port, u16 data); void outl(u16 port, u32 data); -static inline void spinlock(u8 *ptr) +static inline void spinlock(u32 *ptr) { u32 prev; do diff --git a/libs/libc/print.c b/libs/libc/print.c index 7c19628..d990985 100644 --- a/libs/libc/print.c +++ b/libs/libc/print.c @@ -233,8 +233,6 @@ void print_trace(u32 count) __asm__ volatile("movl %%ebp, %0;" : "=r"(stk)); print("EBP\tEIP\n"); for (u32 i = 0; stk && i < count; i++) { - /* u32 eip = memory_valid((void *)stk->eip) ? stk->eip : stk->eip + 64; */ - /* printf("0x%x\t0x%x\n", stk->ebp, eip); */ printf("0x%x\t0x%x\n", stk->ebp, stk->eip); stk = stk->ebp; } |