direct-io.hg

changeset 3791:2e65191dbd80

bitkeeper revision 1.1181 (420ca996keP3Po6VzQplsJpxQ7eTyg)

Not sure why BK didn't pick this up last time...
author sos22@douglas.cl.cam.ac.uk
date Fri Feb 11 12:48:22 2005 +0000 (2005-02-11)
parents dbf3fa962906
children c31ea2f7dd9e
files .rootkeys xen/arch/x86/Makefile xen/arch/x86/cdb.c xen/arch/x86/x86_32/call_with_regs.S xen/arch/x86/x86_32/cdb_trap.S
line diff
     1.1 --- a/.rootkeys	Fri Feb 11 12:37:10 2005 +0000
     1.2 +++ b/.rootkeys	Fri Feb 11 12:48:22 2005 +0000
     1.3 @@ -923,7 +923,7 @@ 41c0c411ODt8uEmV-yUxpQLpqimE5Q xen/arch/
     1.4  41f97ef5139vN42cOYHfX_Ac8WOOjA xen/arch/x86/vmx_platform.c
     1.5  41c0c4128URE0dxcO15JME_MuKBPfg xen/arch/x86/vmx_vmcs.c
     1.6  419cbedeQDg8IrO3izo3o5rQNlo0kQ xen/arch/x86/x86_32/asm-offsets.c
     1.7 -4107c15e_NqNYew2EXroXz2mgTAMWQ xen/arch/x86/x86_32/cdb_trap.S
     1.8 +4107c15e_NqNYew2EXroXz2mgTAMWQ xen/arch/x86/x86_32/call_with_regs.S
     1.9  4202391dkvdTZ8GhWXe3Gqf9EOgWXg xen/arch/x86/x86_32/domain_build.c
    1.10  3e32af9aRnYGl4GMOaDKp7JdfhOGhg xen/arch/x86/x86_32/domain_page.c
    1.11  3ddb79bcecupHj56ZbTa3B0FxDowMg xen/arch/x86/x86_32/entry.S
     2.1 --- a/xen/arch/x86/Makefile	Fri Feb 11 12:37:10 2005 +0000
     2.2 +++ b/xen/arch/x86/Makefile	Fri Feb 11 12:48:22 2005 +0000
     2.3 @@ -13,7 +13,6 @@ endif
     2.4  
     2.5  ifneq ($(crash_debug),y)
     2.6  OBJS := $(patsubst cdb%.o,,$(OBJS))
     2.7 -OBJS := $(patsubst $(TARGET_SUBARCH)/cdb%.o,,$(OBJS))
     2.8  endif
     2.9  
    2.10  default: $(TARGET)
     3.1 --- a/xen/arch/x86/cdb.c	Fri Feb 11 12:37:10 2005 +0000
     3.2 +++ b/xen/arch/x86/cdb.c	Fri Feb 11 12:48:22 2005 +0000
     3.3 @@ -317,7 +317,7 @@ xdb_ctx = {
     3.4  	serhnd : -1
     3.5  };
     3.6  
     3.7 -void
     3.8 +int
     3.9  __trap_to_cdb(struct xen_regs *regs)
    3.10  {
    3.11  	int resume = 0;
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/xen/arch/x86/x86_32/call_with_regs.S	Fri Feb 11 12:48:22 2005 +0000
     4.3 @@ -0,0 +1,36 @@
     4.4 +.global call_with_registers
     4.5 +
     4.6 +#include <asm/asm-offsets.h>
     4.7 +
     4.8 +	// int call_with_registers(void (*f)(struct xen_regs *r)) ->
     4.9 +	// build a xen_regs structure, and then call f with that.
    4.10 +call_with_registers:
    4.11 +	pushf
    4.12 +	subl $XREGS_user_sizeof, %esp
    4.13 +	movl %ebx, XREGS_ebx(%esp)
    4.14 +	movl %ecx, XREGS_ecx(%esp)
    4.15 +	movl %edx, XREGS_edx(%esp)
    4.16 +	movl %esi, XREGS_esi(%esp)
    4.17 +	movl %edi, XREGS_edi(%esp)
    4.18 +	movl %ebp, XREGS_ebp(%esp)
    4.19 +	movl %eax, XREGS_eax(%esp)
    4.20 +	movw $0, XREGS_error_code(%esp)
    4.21 +	movw $0, XREGS_entry_vector(%esp)
    4.22 +	movl XREGS_user_sizeof+4(%esp), %eax
    4.23 +	movl %eax, XREGS_eip(%esp)
    4.24 +	movl %cs, XREGS_cs(%esp)
    4.25 +	movl XREGS_user_sizeof(%esp), %eax
    4.26 +	movl %eax, XREGS_eflags(%esp)
    4.27 +	movl %esp, XREGS_esp(%esp)
    4.28 +	addl $XREGS_user_sizeof+4, XREGS_esp(%esp)
    4.29 +	movl %ss, XREGS_ss(%esp)
    4.30 +	movl %es, XREGS_es(%esp)
    4.31 +	movl %ds, XREGS_ds(%esp)
    4.32 +	movl %fs, XREGS_fs(%esp)
    4.33 +	movl %gs, XREGS_gs(%esp)
    4.34 +
    4.35 +	movl XREGS_user_sizeof+8(%esp), %eax
    4.36 +	pushl %esp
    4.37 +	call *%eax
    4.38 +	add $XREGS_user_sizeof + 8, %esp
    4.39 +	ret
     5.1 --- a/xen/arch/x86/x86_32/cdb_trap.S	Fri Feb 11 12:37:10 2005 +0000
     5.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.3 @@ -1,36 +0,0 @@
     5.4 -.global call_with_registers
     5.5 -
     5.6 -#include <asm/asm-offsets.h>
     5.7 -
     5.8 -	// int call_with_registers(void (*f)(struct xen_regs *r)) ->
     5.9 -	// build a xen_regs structure, and then call f with that.
    5.10 -call_with_registers:
    5.11 -	pushf
    5.12 -	subl $XREGS_user_sizeof, %esp
    5.13 -	movl %ebx, XREGS_ebx(%esp)
    5.14 -	movl %ecx, XREGS_ecx(%esp)
    5.15 -	movl %edx, XREGS_edx(%esp)
    5.16 -	movl %esi, XREGS_esi(%esp)
    5.17 -	movl %edi, XREGS_edi(%esp)
    5.18 -	movl %ebp, XREGS_ebp(%esp)
    5.19 -	movl %eax, XREGS_eax(%esp)
    5.20 -	movw $0, XREGS_error_code(%esp)
    5.21 -	movw $0, XREGS_entry_vector(%esp)
    5.22 -	movl XREGS_user_sizeof+4(%esp), %eax
    5.23 -	movl %eax, XREGS_eip(%esp)
    5.24 -	movl %cs, XREGS_cs(%esp)
    5.25 -	movl XREGS_user_sizeof(%esp), %eax
    5.26 -	movl %eax, XREGS_eflags(%esp)
    5.27 -	movl %esp, XREGS_esp(%esp)
    5.28 -	addl $XREGS_user_sizeof+4, XREGS_esp(%esp)
    5.29 -	movl %ss, XREGS_ss(%esp)
    5.30 -	movl %es, XREGS_es(%esp)
    5.31 -	movl %ds, XREGS_ds(%esp)
    5.32 -	movl %fs, XREGS_fs(%esp)
    5.33 -	movl %gs, XREGS_gs(%esp)
    5.34 -
    5.35 -	movl XREGS_user_sizeof+8(%esp), %eax
    5.36 -	pushl %esp
    5.37 -	call *%eax
    5.38 -	add $XREGS_user_sizeof + 8, %esp
    5.39 -	ret