From b6924d994ccdbe86ea67351d3c94600e14f5ed1f Mon Sep 17 00:00:00 2001 From: Alex AUVOLAT Date: Thu, 17 May 2012 09:55:40 +0200 Subject: Nothing, just reverted some shit. --- src/kernel/task/syscall.cpp | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) (limited to 'src/kernel') diff --git a/src/kernel/task/syscall.cpp b/src/kernel/task/syscall.cpp index 7938e76..678677d 100644 --- a/src/kernel/task/syscall.cpp +++ b/src/kernel/task/syscall.cpp @@ -6,16 +6,16 @@ #define CALL0(name, scname) static void scname(registers* r) { r->eax = name(); } #define CALL1(name, scname) static void scname(registers* r) { \ - r->eax = name(r->ecx); } + r->eax = name(r->ebx); } #define CALL2(name, scname) static void scname(registers* r) { \ - r->eax = name(r->ecx, r->edx); } + r->eax = name(r->ebx, r->ecx); } #define CALL3(name, scname) static void scname(registers* r) { \ - r->eax = name(r->ecx, r->edx, r->esi); } + r->eax = name(r->ebx, r->ecx, r->edx); } #define CALL0V(name, scname) static void scname(registers* r) { name(); } -#define CALL1V(name, scname) static void scname(registers* r) { name(r->ecx); } -#define CALL2V(name, scname) static void scname(registers* r) { name(r->ecx, r->edx); } -#define CALL3V(name, scname) static void scname(registers* r) { name(r->ecx, r->edx, r->esi); } -#define CALL4V(name, scname) static void scname(registers* r) { name(r->ecx, r->edx, r->esi, r->edi); } +#define CALL1V(name, scname) static void scname(registers* r) { name(r->ebx); } +#define CALL2V(name, scname) static void scname(registers* r) { name(r->ebx, r->ecx); } +#define CALL3V(name, scname) static void scname(registers* r) { name(r->ebx, r->ecx, r->edx); } +#define CALL4V(name, scname) static void scname(registers* r) { name(r->ebx, r->ecx, r->edx, r->esi); } CALL0V(thread_exit, thread_exit_sc); CALL0V(schedule, schedule_sc); @@ -27,12 +27,12 @@ CALL1(process_sbrk, proc_sbrk_sc); CALL1V(process_brk, proc_brk_sc); static void printk_sc(registers *r) { - monitor_write((char*)r->ecx); + monitor_write((char*)r->ebx); } static void thread_new_sc(registers* r) { cli(); - new thread(current_thread->process, (thread_entry)r->ecx, (void*)r->edx, (void*)r->esi); + new thread(current_thread->process, (thread_entry)r->ebx, (void*)r->ecx, (void*)r->edx); sti(); } @@ -54,11 +54,7 @@ int_callback syscalls[NUMBER_OF_SYSCALLS] = { // This must correspond to common /* Called in idt_.asm on a system call (interrupt 64). Calls the correct syscall handler (if any). */ extern "C" void idt_syscallHandler(registers regs) { - if (regs.eax == 0) { - if (regs.ebx < NUMBER_OF_SYSCALLS && syscalls[regs.ebx] != 0) { - syscalls[regs.ebx](®s); - } - } else { - monitor_write("Hello. Object calls not implemented.\n"); + if (regs.eax < NUMBER_OF_SYSCALLS && syscalls[regs.eax] != 0) { + syscalls[regs.eax](®s); } } -- cgit v1.2.3