diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/init/syscall.s | 2 | ||||
| -rw-r--r-- | src/kernel/arch/i386/boot.s | 2 | ||||
| -rw-r--r-- | src/kernel/arch/i386/gdt/farjump.s | 3 | ||||
| -rw-r--r-- | src/kernel/arch/i386/interrupts/isr_stub.s | 3 |
4 files changed, 3 insertions, 7 deletions
diff --git a/src/init/syscall.s b/src/init/syscall.s index bea1452..0af49f3 100644 --- a/src/init/syscall.s +++ b/src/init/syscall.s @@ -7,7 +7,6 @@ _syscall: push %edi push %ebp -// note: i could squeeze out another parameter out of %ebp mov 20(%esp), %eax mov 24(%esp), %ebx mov %esp, %ecx @@ -16,6 +15,7 @@ _syscall: mov 32(%esp), %edi mov 36(%esp), %ebp sysenter + _syscall_ret: pop %ebp pop %edi diff --git a/src/kernel/arch/i386/boot.s b/src/kernel/arch/i386/boot.s index 9fd7d5d..ea31aa1 100644 --- a/src/kernel/arch/i386/boot.s +++ b/src/kernel/arch/i386/boot.s @@ -23,5 +23,3 @@ halt_cpu: cli 1: hlt jmp 1b - -.size _start, . - _start diff --git a/src/kernel/arch/i386/gdt/farjump.s b/src/kernel/arch/i386/gdt/farjump.s index 85d8ba5..2885d2b 100644 --- a/src/kernel/arch/i386/gdt/farjump.s +++ b/src/kernel/arch/i386/gdt/farjump.s @@ -4,6 +4,5 @@ gdt_farjump: /* retf pops off the return address and code segment off the stack. * it turns out that in the i386 cdecl calling convention they're in - * the correct place already. - */ + * the correct place already. */ retf diff --git a/src/kernel/arch/i386/interrupts/isr_stub.s b/src/kernel/arch/i386/interrupts/isr_stub.s index 614dc7f..8efb1b7 100644 --- a/src/kernel/arch/i386/interrupts/isr_stub.s +++ b/src/kernel/arch/i386/interrupts/isr_stub.s @@ -2,11 +2,10 @@ .global _isr_stubs _isr_stubs: - .rept 256 - .align 8 pushal call _isr_stage2 + .align 8 .endr _isr_stage2: |