aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/kernel/interrupts/isr.c12
-rw-r--r--src/kernel/kernel.c2
-rw-r--r--src/kernel/syscall/actions/sys_exec.c1
-rw-r--r--src/kernel/syscall/actions/sys_fork.c5
-rw-r--r--src/kernel/syscall/actions/sys_wait.c3
-rw-r--r--src/kernel/syscall/syscall.c1
-rw-r--r--src/kernel/tasks/process.c7
-rw-r--r--src/userspace/programs/init.c15
-rw-r--r--src/userspace/programs/root.c15
-rw-r--r--src/userspace/programs/sh.c14
10 files changed, 58 insertions, 17 deletions
diff --git a/src/kernel/interrupts/isr.c b/src/kernel/interrupts/isr.c
index 54584b4..d5866f5 100644
--- a/src/kernel/interrupts/isr.c
+++ b/src/kernel/interrupts/isr.c
@@ -106,11 +106,12 @@ const char *exception_messages[32] = { "Division By Zero",
// Master exception/interrupt/fault handler - halt via panic
void fault_handler(struct regs *r)
{
+ cli();
irq_handler_t handler = isr_routines[r->int_no];
if (handler) {
handler(r);
+ sti();
} else {
- cli();
u32 faulting_address;
asm("mov %%cr2, %0" : "=r"(faulting_address));
@@ -118,20 +119,19 @@ void fault_handler(struct regs *r)
r->eip, r->eax, r->ebx, r->ecx, r->edx, r->esp, faulting_address, r->eflags,
r->err_code, r->int_no, exception_messages[r->int_no]);
- char *message;
+ char message[128];
if (r->int_no <= 32) {
- message = (char *)exception_messages[r->int_no];
+ strcpy(message, (char *)exception_messages[r->int_no]);
strcat(message, " Exception");
} else {
- message = "Unknown Exception";
+ strcpy(message, "Unknown Exception");
}
if (current_proc != NULL) {
+ warn("%s: Halting process %d", message, current_proc->pid);
memcpy(&current_proc->registers, r, sizeof(struct regs));
process_suspend(current_proc->pid);
- warn("%s: Halting process %d", message, current_proc->pid);
scheduler(r);
- sti();
} else {
if (faulting_address != (u32)fb) {
panic("Page fault before multitasking started!");
diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c
index 1928d20..44b03fb 100644
--- a/src/kernel/kernel.c
+++ b/src/kernel/kernel.c
@@ -68,7 +68,7 @@ void kernel_main(u32 magic, u32 multiboot_address, u32 esp)
log("Content of /etc/test: %s", read_file("/etc/test"));
syscalls_install();
- kexec("/bin/init");
+ kexec("/bin/root");
halt_loop();
// asm ("div %0" :: "r"(0)); // Exception testing x/0
diff --git a/src/kernel/syscall/actions/sys_exec.c b/src/kernel/syscall/actions/sys_exec.c
index 049d085..99c6539 100644
--- a/src/kernel/syscall/actions/sys_exec.c
+++ b/src/kernel/syscall/actions/sys_exec.c
@@ -1,5 +1,6 @@
#include <stdint.h>
#include <tasks/process.h>
+#include <io/io.h>
u32 sys_exec(char *path)
{
diff --git a/src/kernel/syscall/actions/sys_fork.c b/src/kernel/syscall/actions/sys_fork.c
index f0a5711..084659e 100644
--- a/src/kernel/syscall/actions/sys_fork.c
+++ b/src/kernel/syscall/actions/sys_fork.c
@@ -4,16 +4,19 @@
#include <tasks/process.h>
#include <lib/lib.h>
#include <system.h>
+#include <io/io.h>
u32 sys_fork(struct regs *r)
{
+ cli();
struct page_directory *dir = paging_copy_user_directory(current_proc->cr3);
struct process *proc = process_make_new();
proc->cr3 = dir;
memcpy(&proc->registers, r, sizeof(struct regs));
proc->registers.eax = proc->pid;
- proc->pid = current_proc->pid;
+ proc->pid = current_proc->pid + 1;
+ sti();
process_spawn(proc);
return 0;
diff --git a/src/kernel/syscall/actions/sys_wait.c b/src/kernel/syscall/actions/sys_wait.c
index 7cea24f..6015b8b 100644
--- a/src/kernel/syscall/actions/sys_wait.c
+++ b/src/kernel/syscall/actions/sys_wait.c
@@ -1,7 +1,10 @@
+#include <stdint.h>
#include <tasks/process.h>
+#include <io/io.h>
u32 sys_wait(u32 pid, u32 *status, u32 options)
{
+ sti();
u32 ret;
if (pid < 0) { // Wait for any process in gid to die
diff --git a/src/kernel/syscall/syscall.c b/src/kernel/syscall/syscall.c
index f1ee003..a5048ef 100644
--- a/src/kernel/syscall/syscall.c
+++ b/src/kernel/syscall/syscall.c
@@ -40,7 +40,6 @@ void syscall_handler(struct regs *r)
r->eax = location(r);
else
r->eax = location(r->ebx, r->ecx, r->edx, r->esi, r->edi);
-
sti();
}
diff --git a/src/kernel/tasks/process.c b/src/kernel/tasks/process.c
index d2a75fd..b8dd808 100644
--- a/src/kernel/tasks/process.c
+++ b/src/kernel/tasks/process.c
@@ -2,6 +2,7 @@
#include <stddef.h>
#include <tasks/process.h>
#include <tasks/userspace.h>
+#include <io/io.h>
#include <interrupts/interrupts.h>
#include <system.h>
#include <lib/lib.h>
@@ -20,6 +21,7 @@ extern u32 stack_hold;
void scheduler(struct regs *regs)
{
+ cli();
memcpy(&current_proc->registers, regs, sizeof(struct regs));
timer_handler(regs);
@@ -29,7 +31,7 @@ void scheduler(struct regs *regs)
current_proc = root;
}
- //debug("Task switch to %s", current_proc->name);
+ debug("Task switch to %s with pid %d", current_proc->name, current_proc->pid);
while (current_proc->state == PROC_ASLEEP) {
current_proc = current_proc->next;
@@ -39,6 +41,7 @@ void scheduler(struct regs *regs)
memcpy(regs, &current_proc->registers, sizeof(struct regs));
paging_switch_directory(current_proc->cr3);
+ sti();
}
void process_init(struct process *proc)
@@ -125,7 +128,7 @@ void process_suspend(u32 pid)
struct process *proc = process_from_pid(pid);
if (proc == PID_NOT_FOUND) {
- warn("couldn't find PID for suspension");
+ warn("Couldn't find PID for suspension");
return;
}
diff --git a/src/userspace/programs/init.c b/src/userspace/programs/init.c
index f3ca614..1d53ee8 100644
--- a/src/userspace/programs/init.c
+++ b/src/userspace/programs/init.c
@@ -7,16 +7,27 @@
void main()
{
+ if (get_pid() != 2) {
+ printf("Wrong PID!\n");
+ exit(1);
+ }
+
// TODO: Fix page fault when mallocing
printf("Initializing userspace...\n");
+ // TODO: Fix occasional race conditions with cli/sti
+ // TODO: Fix scheduler turning off randomly..
u32 x;
u32 f = fork();
- if (f == 0)
+ if (f == 0) {
+ printf("Waiting...\n");
wait(&x);
- else
+ } else {
+ printf("Executing...\n");
exec("/bin/sh");
+ }
while (1) {
+ //printf("B");
};
} \ No newline at end of file
diff --git a/src/userspace/programs/root.c b/src/userspace/programs/root.c
new file mode 100644
index 0000000..d02f72c
--- /dev/null
+++ b/src/userspace/programs/root.c
@@ -0,0 +1,15 @@
+#include <stdio.h>
+#include <unistd.h>
+#include <syscall.h>
+
+// This process only exists because it can't crash
+void main()
+{
+ if (get_pid() != 1) {
+ printf("Wrong PID!\n");
+ exit(1);
+ }
+
+ exec("/bin/init");
+ printf("The init process crashed!");
+} \ No newline at end of file
diff --git a/src/userspace/programs/sh.c b/src/userspace/programs/sh.c
index bb1c9ea..12f8b2c 100644
--- a/src/userspace/programs/sh.c
+++ b/src/userspace/programs/sh.c
@@ -1,4 +1,7 @@
+#include <stdint.h>
#include <stdio.h>
+#include <stddef.h>
+#include <common.h>
#include <unistd.h>
#include <syscall.h>
#include <gui.h>
@@ -7,9 +10,12 @@ void main()
{
printf("[~] ");
- while (1) {
- putch(getch());
- }
+ /* while (1) { */
+ /* putch(getch()); */
+ /* } */
- syscall_halt();
+ /* syscall_halt(); */
+ while (1) {
+ //printf("A");
+ };
} \ No newline at end of file