Attachment #440632 for bug #588780




        ASSERT_INTERRUPTS_ENABLED
        mov   %fs,%edi
        testb $2,UREGS_cs+8(%rsp)
        ASM_STAC
        jz    1f
        /* Push new frame at registered guest-OS stack base. */
        movl  VCPU_kernel_sp(%rbx),%esi

        movl  TRAPBOUNCE_error_code(%rdx),%eax
.Lft8:  movl  %eax,%fs:(%rsi)           # ERROR CODE
1:
        ASM_CLAC
        /* Rewrite our stack frame and return to guest-OS mode. */
        /* IA32 Ref. Vol. 3: TF, VM, RF and NT flags are cleared on trap. */
        andl  $~(X86_EFLAGS_VM|X86_EFLAGS_RF|\

        addl  $4,%esi
compat_crash_page_fault:
.Lft14: mov   %edi,%fs
        ASM_CLAC
        movl  %esi,%edi
        call  show_page_walk
        jmp   dom_crash_sync_extable

Lines 420-425 domain_crash_page_fault_16: Link Here

(-)a/xen/arch/x86/x86_64/entry.S (-1 / +1 lines)
420	domain_crash_page_fault_8:	420	domain_crash_page_fault_8:
421	addq $8,%rsi	421	addq $8,%rsi
422	domain_crash_page_fault:	422	domain_crash_page_fault:
		423	ASM_CLAC
423	movq %rsi,%rdi	424	movq %rsi,%rdi
424	call show_page_walk	425	call show_page_walk
425	ENTRY(dom_crash_sync_extable)	426	ENTRY(dom_crash_sync_extable)
426	-

Return to bug 588780

Lines 319-324 compat_create_bounce_frame: Link Here

(-)a/xen/arch/x86/x86_64/compat/entry.S (+3 lines)
319	ASSERT_INTERRUPTS_ENABLED	319	ASSERT_INTERRUPTS_ENABLED
320	mov %fs,%edi	320	mov %fs,%edi
321	testb $2,UREGS_cs+8(%rsp)	321	testb $2,UREGS_cs+8(%rsp)
		322	ASM_STAC
322	jz 1f	323	jz 1f
323	/* Push new frame at registered guest-OS stack base. */	324	/* Push new frame at registered guest-OS stack base. */
324	movl VCPU_kernel_sp(%rbx),%esi	325	movl VCPU_kernel_sp(%rbx),%esi
Lines 364-369 compat_create_bounce_frame: Link Here
364	movl TRAPBOUNCE_error_code(%rdx),%eax	365	movl TRAPBOUNCE_error_code(%rdx),%eax
365	.Lft8: movl %eax,%fs:(%rsi) # ERROR CODE	366	.Lft8: movl %eax,%fs:(%rsi) # ERROR CODE
366	1:	367	1:
		368	ASM_CLAC
367	/* Rewrite our stack frame and return to guest-OS mode. */	369	/* Rewrite our stack frame and return to guest-OS mode. */
368	/* IA32 Ref. Vol. 3: TF, VM, RF and NT flags are cleared on trap. */	370	/* IA32 Ref. Vol. 3: TF, VM, RF and NT flags are cleared on trap. */
369	andl $~(X86_EFLAGS_VM\|X86_EFLAGS_RF\|\	371	andl $~(X86_EFLAGS_VM\|X86_EFLAGS_RF\|\
Lines 403-408 compat_crash_page_fault_4: Link Here
403	addl $4,%esi	405	addl $4,%esi
404	compat_crash_page_fault:	406	compat_crash_page_fault:
405	.Lft14: mov %edi,%fs	407	.Lft14: mov %edi,%fs
		408	ASM_CLAC
406	movl %esi,%edi	409	movl %esi,%edi
407	call show_page_walk	410	call show_page_walk
408	jmp dom_crash_sync_extable	411	jmp dom_crash_sync_extable