diff options
| author | Andreas Kling <awesomekling@gmail.com> | 2019-01-31 17:31:23 +0100 |
|---|---|---|
| committer | Andreas Kling <awesomekling@gmail.com> | 2019-01-31 17:31:23 +0100 |
| commit | ffab6897aa1bc668f98130b4bb485a4602509938 (patch) | |
| tree | a4d1933fc390ea0803bb3826353262fbf06b885f /Kernel/Syscall.cpp | |
| parent | 27fa09aee492e6c8da9168d24f0b1d2c5d2162d5 (diff) | |
| download | serenity-ffab6897aa1bc668f98130b4bb485a4602509938.zip | |
Big, possibly complete sweep of naming changes.
Diffstat (limited to 'Kernel/Syscall.cpp')
| -rw-r--r-- | Kernel/Syscall.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Kernel/Syscall.cpp b/Kernel/Syscall.cpp index c29298f363..848465a50a 100644 --- a/Kernel/Syscall.cpp +++ b/Kernel/Syscall.cpp @@ -4,13 +4,13 @@ #include "Console.h" #include "Scheduler.h" -extern "C" void syscall_entry(RegisterDump&); -extern "C" void syscall_ISR(); +extern "C" void syscall_trap_entry(RegisterDump&); +extern "C" void syscall_trap_handler(); extern volatile RegisterDump* syscallRegDump; asm( - ".globl syscall_ISR \n" - "syscall_ISR:\n" + ".globl syscall_trap_handler \n" + "syscall_trap_handler:\n" " pusha\n" " pushw %ds\n" " pushw %es\n" @@ -26,7 +26,7 @@ asm( " popw %fs\n" " popw %gs\n" " mov %esp, %eax\n" - " call syscall_entry\n" + " call syscall_trap_entry\n" " popw %gs\n" " popw %gs\n" " popw %fs\n" @@ -40,7 +40,7 @@ namespace Syscall { void initialize() { - register_user_callable_interrupt_handler(0x80, syscall_ISR); + register_user_callable_interrupt_handler(0x80, syscall_trap_handler); kprintf("syscall: int 0x80 handler installed\n"); } @@ -232,7 +232,7 @@ static dword handle(RegisterDump& regs, dword function, dword arg1, dword arg2, } -void syscall_entry(RegisterDump& regs) +void syscall_trap_entry(RegisterDump& regs) { dword function = regs.eax; dword arg1 = regs.edx; |