| 37,6 → 37,8 |
|---|
| .global paging_on |
| .global enable_l_apic_in_msr |
| .global interrupt_handlers |
| .global memsetb |
| .global memsetw |
| .global memcpy |
| .global memcpy_from_uspace |
| .global memcpy_from_uspace_failover_address |
| 44,6 → 46,15 |
|---|
| .global memcpy_to_uspace_failover_address |
| |
| |
| # Wrapper for generic memsetb |
| memsetb: |
| jmp _memsetb |
| |
| # Wrapper for generic memsetw |
| memsetw: |
| jmp _memsetw |
| |
| |
| #define MEMCPY_DST 4 |
| #define MEMCPY_SRC 8 |
| #define MEMCPY_SIZE 12 |
| 60,7 → 71,7 |
|---|
| * @param MEMCPY_SRC(%esp) Source address. |
| * @param MEMCPY_SIZE(%esp) Size. |
| * |
| * @return MEMCPY_SRC(%esp) on success and 0 on failure. |
| * @return MEMCPY_DST(%esp) on success and 0 on failure. |
| */ |
| memcpy: |
| memcpy_from_uspace: |
| 85,7 → 96,7 |
|---|
| 0: |
| movl %edx, %edi |
| movl %eax, %esi |
| movl MEMCPY_SRC(%esp), %eax /* MEMCPY_SRC(%esp), success */ |
| movl MEMCPY_DST(%esp), %eax /* MEMCPY_DST(%esp), success */ |
| ret |
| |
| /* |
| 136,6 → 147,46 |
|---|
| popfl |
| .endm |
| |
| /* |
| * The SYSENTER syscall mechanism can be used for syscalls with |
| * four or fewer arguments. To pass these four arguments, we |
| * use four registers: EDX, ECX, EBX, ESI. The syscall number |
| * is passed in EAX. We use EDI to remember the return address |
| * and EBP to remember the stack. The INT-based syscall mechanism |
| * can actually handle six arguments plus the syscall number |
| * entirely in registers. |
| */ |
| .global sysenter_handler |
| sysenter_handler: |
| sti |
| pushl %ebp # remember user stack |
| pushl %edi # remember return user address |
| |
| pushl %gs # remember TLS |
| |
| pushl %eax # syscall number |
| subl $8, %esp # unused sixth and fifth argument |
| pushl %esi # fourth argument |
| pushl %ebx # third argument |
| pushl %ecx # second argument |
| pushl %edx # first argument |
| |
| movw $16, %ax |
| movw %ax, %ds |
| movw %ax, %es |
| |
| cld |
| call syscall_handler |
| addl $28, %esp # remove arguments from stack |
| |
| pop %gs # restore TLS |
| |
| pop %edx # prepare return EIP for SYSEXIT |
| pop %ecx # prepare userspace ESP for SYSEXIT |
| |
| sysexit # return to userspace |
| |
| |
| ## Declare interrupt handlers |
| # |
| # Declare interrupt handlers for n interrupt |
| 217,14 → 268,6 |
|---|
| pushl %fs |
| pushl %gs |
| |
| #ifdef CONFIG_DEBUG_ALLREGS |
| pushl %ebx |
| pushl %ebp |
| pushl %edi |
| pushl %esi |
| #else |
| subl $16, %esp |
| #endif |
| pushl %edx |
| pushl %ecx |
| pushl %eax |
| 246,14 → 289,6 |
|---|
| popl %eax |
| popl %ecx |
| popl %edx |
| #ifdef CONFIG_DEBUG_ALLREGS |
| popl %esi |
| popl %edi |
| popl %ebp |
| popl %ebx |
| #else |
| addl $16, %esp |
| #endif |
| |
| popl %gs |
| popl %fs |