d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use local unique labels inside most often used macros.

Browse Source 
Discussed with:	bde
Sponsored by:	The FreeBSD Foundation
MFC after:	1 week
This commit is contained in:
kib 2018-05-22 13:45:40 +00:00
parent 1249d61e8d
commit b10c76de35
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sys/i386/include/asmacros.h
View File

@ -189,9 +189,9 @@
movl PCPU(KESP0), %edx
movl $TF_SZ, %ecx
testl $PSL_VM, TF_EFLAGS(%esp)
jz 1001f
jz .L\@.1
addl $VM86_STACK_SPACE, %ecx
1001: subl %ecx, %edx
.L\@.1: subl %ecx, %edx
movl %edx, %edi
movl %esp, %esi
rep; movsb
@ -199,9 +199,9 @@
.endm
.macro LOAD_KCR3
call 1000f
1000: popl %eax
movl (tramp_idleptd - 1000b)(%eax), %eax
call .L\@.1
.L\@.1: popl %eax
movl (tramp_idleptd - .L\@.1)(%eax), %eax
movl %eax, %cr3
.endm
@ -212,17 +212,17 @@
.macro KENTER
testl $PSL_VM, TF_EFLAGS(%esp)
jz 1f
jz .L\@.1
LOAD_KCR3
movl PCPU(CURPCB), %eax
testl $PCB_VM86CALL, PCB_FLAGS(%eax)
jnz 3f
jnz .L\@.3
NMOVE_STACKS
jmp 3f
1: testb $SEL_RPL_MASK, TF_CS(%esp)
jz 3f
2: MOVE_STACKS
3:
jmp .L\@.3
.L\@.1: testb $SEL_RPL_MASK, TF_CS(%esp)
jz .L\@.3
.L\@.2: MOVE_STACKS
.L\@.3:
.endm
#endif /* LOCORE */