Rework trap handling assembly code
This commit is contained in:
@@ -2,10 +2,12 @@
|
||||
* PROJECT: ExectOS
|
||||
* COPYRIGHT: See COPYING.md in the top level directory
|
||||
* FILE: xtoskrnl/ar/amd64/archsup.S
|
||||
* DESCRIPTION: Provides AMD64 architecture features not implementable in C.
|
||||
* DESCRIPTION: Provides AMD64 architecture features not implementable in C
|
||||
* DEVELOPERS: Rafal Kupiec <belliash@codingworkshop.eu.org>
|
||||
*/
|
||||
|
||||
#include <amd64/asmsup.h>
|
||||
|
||||
.altmacro
|
||||
.text
|
||||
|
||||
@@ -32,6 +34,9 @@ ArpTrap\Vector:
|
||||
push $\Vector
|
||||
|
||||
/* Push General Purpose Registers */
|
||||
push %rbp
|
||||
push %rdi
|
||||
push %rsi
|
||||
push %r15
|
||||
push %r14
|
||||
push %r13
|
||||
@@ -40,66 +45,117 @@ ArpTrap\Vector:
|
||||
push %r10
|
||||
push %r9
|
||||
push %r8
|
||||
push %rbp
|
||||
push %rdi
|
||||
push %rsi
|
||||
push %rdx
|
||||
push %rcx
|
||||
push %rbx
|
||||
push %rax
|
||||
|
||||
/* Push Segments */
|
||||
mov %gs, %ax
|
||||
push %ax
|
||||
mov %fs, %ax
|
||||
push %ax
|
||||
mov %es, %ax
|
||||
push %ax
|
||||
mov %ds, %ax
|
||||
push %ax
|
||||
/* Reserve space for other registers and point RBP to the trap frame */
|
||||
sub $(TRAP_FRAME_SIZE - TRAP_REGISTERS_SIZE), %rsp
|
||||
lea (%rsp), %rbp
|
||||
|
||||
/* Push Control Registers */
|
||||
mov %cr3, %rax
|
||||
push %rax
|
||||
mov %cr2, %rax
|
||||
push %rax
|
||||
/* Store segment selectors */
|
||||
mov %gs, TrapSegGs(%rbp)
|
||||
mov %fs, TrapSegFs(%rbp)
|
||||
mov %es, TrapSegEs(%rbp)
|
||||
mov %ds, TrapSegDs(%rbp)
|
||||
|
||||
/* Push Debug Registers */
|
||||
/* Store debug registers */
|
||||
mov %dr7, %rax
|
||||
push %rax
|
||||
mov %rax, TrapDr7(%rbp)
|
||||
mov %dr6, %rax
|
||||
push %rax
|
||||
mov %rax, TrapDr6(%rbp)
|
||||
mov %dr3, %rax
|
||||
push %rax
|
||||
mov %rax, TrapDr3(%rbp)
|
||||
mov %dr2, %rax
|
||||
push %rax
|
||||
mov %rax, TrapDr2(%rbp)
|
||||
mov %dr1, %rax
|
||||
push %rax
|
||||
mov %rax, TrapDr1(%rbp)
|
||||
mov %dr0, %rax
|
||||
push %rax
|
||||
mov %rax, TrapDr0(%rbp)
|
||||
|
||||
/* Store CR2 and CR3 */
|
||||
mov %cr3, %rax
|
||||
mov %rax, TrapCr3(%rbp)
|
||||
mov %cr2, %rax
|
||||
mov %rax, TrapCr2(%rbp)
|
||||
|
||||
/* Store MxCsr register */
|
||||
stmxcsr TrapMxCsr(%rbp)
|
||||
|
||||
/* Store XMM registers */
|
||||
movdqa %xmm15, TrapXmm15(%rbp)
|
||||
movdqa %xmm14, TrapXmm14(%rbp)
|
||||
movdqa %xmm13, TrapXmm13(%rbp)
|
||||
movdqa %xmm12, TrapXmm12(%rbp)
|
||||
movdqa %xmm11, TrapXmm11(%rbp)
|
||||
movdqa %xmm10, TrapXmm10(%rbp)
|
||||
movdqa %xmm9, TrapXmm9(%rbp)
|
||||
movdqa %xmm8, TrapXmm8(%rbp)
|
||||
movdqa %xmm7, TrapXmm7(%rbp)
|
||||
movdqa %xmm6, TrapXmm6(%rbp)
|
||||
movdqa %xmm5, TrapXmm5(%rbp)
|
||||
movdqa %xmm4, TrapXmm4(%rbp)
|
||||
movdqa %xmm3, TrapXmm3(%rbp)
|
||||
movdqa %xmm2, TrapXmm2(%rbp)
|
||||
movdqa %xmm1, TrapXmm1(%rbp)
|
||||
movdqa %xmm0, TrapXmm0(%rbp)
|
||||
|
||||
/* Test previous mode and swap GS if needed */
|
||||
movl $0, TrapPreviousMode(%ebp)
|
||||
mov %cs, %ax
|
||||
and $1, %al
|
||||
mov %al, TrapPreviousMode(%rbp)
|
||||
jz KernelMode$\Vector
|
||||
swapgs
|
||||
|
||||
KernelMode$\Vector:
|
||||
/* Push Frame Pointer, clear direction flag and pass to trap dispatcher */
|
||||
mov %rsp, %rcx
|
||||
cld
|
||||
call ArpDispatchTrap
|
||||
|
||||
/* Skip space occupied by Debug Registers */
|
||||
add $(6 * 8), %rsp
|
||||
/* Test previous mode and swapgs if needed */
|
||||
testb $1, TrapPreviousMode(%rbp)
|
||||
jz KernelModeReturn$\Vector
|
||||
cli
|
||||
swapgs
|
||||
|
||||
/* Skip space occupied by CR2 and CR3 */
|
||||
add $(2 * 8), %rsp
|
||||
KernelModeReturn$\Vector:
|
||||
/* Restore XMM registers */
|
||||
movdqa TrapXmm0(%rbp), %xmm0
|
||||
movdqa TrapXmm1(%rbp), %xmm1
|
||||
movdqa TrapXmm2(%rbp), %xmm2
|
||||
movdqa TrapXmm3(%rbp), %xmm3
|
||||
movdqa TrapXmm4(%rbp), %xmm4
|
||||
movdqa TrapXmm5(%rbp), %xmm5
|
||||
movdqa TrapXmm6(%rbp), %xmm6
|
||||
movdqa TrapXmm7(%rbp), %xmm7
|
||||
movdqa TrapXmm8(%rbp), %xmm8
|
||||
movdqa TrapXmm9(%rbp), %xmm9
|
||||
movdqa TrapXmm10(%rbp), %xmm10
|
||||
movdqa TrapXmm11(%rbp), %xmm11
|
||||
movdqa TrapXmm12(%rbp), %xmm12
|
||||
movdqa TrapXmm13(%rbp), %xmm13
|
||||
movdqa TrapXmm14(%rbp), %xmm14
|
||||
movdqa TrapXmm15(%rbp), %xmm15
|
||||
|
||||
/* Skip space occupied by Segments */
|
||||
add $(4 * 2), %rsp
|
||||
/* Load MxCsr register */
|
||||
ldmxcsr TrapMxCsr(%rbp)
|
||||
|
||||
/* Restore segment selectors */
|
||||
mov TrapSegDs(%rbp), %ds
|
||||
mov TrapSegEs(%rbp), %es
|
||||
mov TrapSegFs(%rbp), %fs
|
||||
|
||||
/* Free stack space */
|
||||
add $(TRAP_FRAME_SIZE - TRAP_REGISTERS_SIZE), %rsp
|
||||
|
||||
/* Pop General Purpose Registers */
|
||||
pop %rax
|
||||
pop %rbx
|
||||
pop %rcx
|
||||
pop %rdx
|
||||
pop %rsi
|
||||
pop %rdi
|
||||
pop %rbp
|
||||
pop %r8
|
||||
pop %r9
|
||||
pop %r10
|
||||
@@ -108,6 +164,9 @@ ArpTrap\Vector:
|
||||
pop %r13
|
||||
pop %r14
|
||||
pop %r15
|
||||
pop %rsi
|
||||
pop %rdi
|
||||
pop %rbp
|
||||
|
||||
/* Skip error code and vector number, then return */
|
||||
add $(2 * 8), %rsp
|
||||
|
||||
@@ -6,6 +6,8 @@
|
||||
* DEVELOPERS: Rafal Kupiec <belliash@codingworkshop.eu.org>
|
||||
*/
|
||||
|
||||
#include <i686/asmsup.h>
|
||||
|
||||
.altmacro
|
||||
.text
|
||||
|
||||
@@ -40,36 +42,45 @@ _ArpTrap\Vector:
|
||||
push %ebx
|
||||
push %eax
|
||||
|
||||
/* Push Segments */
|
||||
mov %gs, %ax
|
||||
push %ax
|
||||
mov %fs, %ax
|
||||
push %ax
|
||||
mov %es, %ax
|
||||
push %ax
|
||||
mov %ds, %ax
|
||||
push %ax
|
||||
/* Reserve space for other registers and point RBP to the trap frame */
|
||||
sub $(TRAP_FRAME_SIZE - TRAP_REGISTERS_SIZE), %esp
|
||||
lea (%esp), %ebp
|
||||
|
||||
/* Push Control Registers */
|
||||
mov %cr3, %eax
|
||||
push %eax
|
||||
mov %cr2, %eax
|
||||
push %eax
|
||||
/* Store segment selectors */
|
||||
mov %gs, TrapSegGs(%ebp)
|
||||
mov %fs, TrapSegFs(%ebp)
|
||||
mov %es, TrapSegEs(%ebp)
|
||||
mov %ds, TrapSegDs(%ebp)
|
||||
|
||||
/* Push Debug Registers */
|
||||
/* Store debug registers */
|
||||
mov %dr7, %eax
|
||||
push %eax
|
||||
mov %eax, TrapDr7(%ebp)
|
||||
mov %dr6, %eax
|
||||
push %eax
|
||||
mov %eax, TrapDr6(%ebp)
|
||||
mov %dr3, %eax
|
||||
push %eax
|
||||
mov %eax, TrapDr3(%ebp)
|
||||
mov %dr2, %eax
|
||||
push %eax
|
||||
mov %eax, TrapDr2(%ebp)
|
||||
mov %dr1, %eax
|
||||
push %eax
|
||||
mov %eax, TrapDr1(%ebp)
|
||||
mov %dr0, %eax
|
||||
push %eax
|
||||
mov %eax, TrapDr0(%ebp)
|
||||
|
||||
/* Store CR2 and CR3 */
|
||||
mov %cr3, %eax
|
||||
mov %eax, TrapCr3(%ebp)
|
||||
mov %cr2, %eax
|
||||
mov %eax, TrapCr2(%ebp)
|
||||
|
||||
/* Test previous mode and swap GS if needed */
|
||||
movl $0, TrapPreviousMode(%ebp)
|
||||
mov %cs, %ax
|
||||
and $1, %al
|
||||
mov %al, TrapPreviousMode(%ebp)
|
||||
jz KernelMode$\Vector
|
||||
swapgs
|
||||
|
||||
KernelMode$\Vector:
|
||||
/* Push Frame Pointer, clear direction flag and pass to trap dispatcher */
|
||||
push %esp
|
||||
cld
|
||||
@@ -78,14 +89,20 @@ _ArpTrap\Vector:
|
||||
/* Clean up the stack */
|
||||
add $4, %esp
|
||||
|
||||
/* Skip space occupied by Debug Registers */
|
||||
add $(6 * 4), %esp
|
||||
/* Test previous mode and swapgs if needed */
|
||||
testb $1, TrapPreviousMode(%ebp)
|
||||
jz KernelModeReturn$\Vector
|
||||
cli
|
||||
swapgs
|
||||
|
||||
/* Skip space occupied by CR2 and CR3 */
|
||||
add $(2 * 4), %esp
|
||||
KernelModeReturn$\Vector:
|
||||
/* Restore segment selectors */
|
||||
mov TrapSegDs(%ebp), %ds
|
||||
mov TrapSegEs(%ebp), %es
|
||||
mov TrapSegFs(%ebp), %fs
|
||||
|
||||
/* Skip space occupied by Segments */
|
||||
add $(4 * 2), %esp
|
||||
/* Free stack space */
|
||||
add $(TRAP_FRAME_SIZE - TRAP_REGISTERS_SIZE), %esp
|
||||
|
||||
/* Pop General Purpose Registers */
|
||||
pop %eax
|
||||
|
||||
Reference in New Issue
Block a user