Page MenuHomeFreeBSD
Files F154836181

D36302.id.diff
No OneTemporary
Actions

D36302.id.diff
View Options

diff --git a/sys/i386/i386/copyout_fast.s b/sys/i386/i386/copyout_fast.s
--- a/sys/i386/i386/copyout_fast.s
+++ b/sys/i386/i386/copyout_fast.s
@@ -93,7 +93,7 @@
popl %ecx
popl %edi
popl %esi
- rep; movsb
+pf_x1: rep; movsb
movl %ebx,%cr3
movl %eax,%esp
@@ -150,7 +150,7 @@
popl %ecx
popl %edi
popl %esi
- rep; movsb
+pf_x2: rep; movsb
movl %ebx,%cr3
@@ -197,7 +197,7 @@
cli
movl PCPU(TRAMPSTK),%esp
movl %eax,%cr3
- movl (%ecx),%eax
+pf_x3: movl (%ecx),%eax
movl %ebx,%cr3
movl %esi,%esp
sti
@@ -226,7 +226,7 @@
cli
movl PCPU(TRAMPSTK),%esp
movl %eax,%cr3
- movzwl (%ecx),%eax
+pf_x4: movzwl (%ecx),%eax
movl %ebx,%cr3
movl %esi,%esp
sti
@@ -252,7 +252,7 @@
cli
movl PCPU(TRAMPSTK),%esp
movl %eax,%cr3
- movzbl (%ecx),%eax
+pf_x5: movzbl (%ecx),%eax
movl %ebx,%cr3
movl %esi,%esp
sti
@@ -291,7 +291,7 @@
cli
movl PCPU(TRAMPSTK),%esp
movl %eax,%cr3
- movl %edi,(%ecx)
+pf_x6: movl %edi,(%ecx)
movl %ebx,%cr3
movl %esi,%esp
sti
@@ -319,7 +319,7 @@
cli
movl PCPU(TRAMPSTK),%esp
movl %eax,%cr3
- movw %di,(%ecx)
+pf_x7: movw %di,(%ecx)
movl %ebx,%cr3
movl %esi,%esp
sti
@@ -348,7 +348,7 @@
movl PCPU(TRAMPSTK),%esp
movl %eax,%cr3
movl %edi,%eax
- movb %al,(%ecx)
+pf_x8: movb %al,(%ecx)
movl %ebx,%cr3
movl %esi,%esp
sti
diff --git a/sys/i386/i386/exception.s b/sys/i386/i386/exception.s
--- a/sys/i386/i386/exception.s
+++ b/sys/i386/i386/exception.s
@@ -130,17 +130,41 @@
jmp irettraps
IDTVEC(page)
testl $PSL_VM, TF_EFLAGS-TF_ERR(%esp)
- jnz 1f
+ jnz 4f
testb $SEL_RPL_MASK, TF_CS-TF_ERR(%esp)
- jnz 1f
+ jnz 4f
cmpl $PMAP_TRM_MIN_ADDRESS, TF_EIP-TF_ERR(%esp)
- jb 1f
+ jb 4f
+ pushl %eax
+ movl TF_EIP-TF_ERR+4(%esp), %eax
+ addl $1f, %eax
+ call 5f
+1: cmpl $pf_x1, %eax
+ je 2f
+ cmpl $pf_x2, %eax
+ je 2f
+ cmpl $pf_x3, %eax
+ je 2f
+ cmpl $pf_x4, %eax
+ je 2f
+ cmpl $pf_x5, %eax
+ je 2f
+ cmpl $pf_x6, %eax
+ je 2f
+ cmpl $pf_x7, %eax
+ je 2f
+ cmpl $pf_x8, %eax
+ jne 3f
+2: popl %eax
movl %ebx, %cr3
movl %edx, TF_EIP-TF_ERR(%esp)
addl $4, %esp
iret
-1: pushl $T_PAGEFLT
+3: popl %eax
+4: pushl $T_PAGEFLT
jmp alltraps
+5: subl (%esp), %eax
+ retl
IDTVEC(rsvd_pti)
IDTVEC(rsvd)
pushl $0; TRAP(T_RESERVED)

File Metadata

Mime Type
text/plain
Expires
Thu, Apr 30, 1:40 PM (7 h, 49 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32521026
Default Alt Text
D36302.id.diff (2 KB)

Event Timeline