upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-26 03:08:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

i386: simplify flow control in irettraps

Browse source 
(cherry picked from commit 54e1546e09)
This commit is contained in:
Konstantin Belousov 2022-08-22 08:56:45 +03:00
parent 79ceb5107b
commit bf71e2e267
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
sys/i386/i386/exception.s
View file

@ -236,27 +236,24 @@ irettraps:
jne 2f
/* -8 because exception did not switch ring */
movl $(2 * TF_SZ - TF_EIP - 8), %ecx
jmp 6f
jmp 5f
2: leal (doreti_popl_ds - 1b)(%ebx), %edx
cmpl %edx, TF_EIP(%esp)
jne 3f
movl $(2 * TF_SZ - TF_DS - 8), %ecx
jmp 6f
jmp 5f
3: leal (doreti_popl_es - 1b)(%ebx), %edx
cmpl %edx, TF_EIP(%esp)
jne 4f
movl $(2 * TF_SZ - TF_ES - 8), %ecx
jmp 6f
jmp 5f
4: leal (doreti_popl_fs - 1b)(%ebx), %edx
cmpl %edx, TF_EIP(%esp)
jne 5f
jne calltrap
movl $(2 * TF_SZ - TF_FS - 8), %ecx
jmp 6f
/* kernel mode, normal */
5: FAKE_MCOUNT(TF_EIP(%esp))
jmp calltrap
6: cmpl $PMAP_TRM_MIN_ADDRESS, %esp /* trampoline stack ? */
jb 5b /* if not, no need to change stacks */
5: cmpl $PMAP_TRM_MIN_ADDRESS, %esp /* trampoline stack ? */
jb calltrap /* if not, no need to change stacks */
movl (tramp_idleptd - 1b)(%ebx), %eax
movl %eax, %cr3
movl PCPU(KESP0), %edx
@ -265,7 +262,7 @@ irettraps:
movl %esp, %esi
rep; movsb
movl %edx, %esp
FAKE_MCOUNT(TF_EIP(%esp))
/* kernel mode, normal */
jmp calltrap
/*