1.1 --- a/tools/firmware/vmxassist/util.c	Mon Nov 27 10:06:41 2006 +0000
     1.2 +++ b/tools/firmware/vmxassist/util.c	Mon Nov 27 10:08:12 2006 +0000
     1.3 @@ -62,14 +62,15 @@ dump_regs(struct regs *regs)
     1.4  		regs->eax, regs->ecx, regs->edx, regs->ebx);
     1.5  	printf("esp    %8x ebp    %8x esi    %8x edi    %8x\n",
     1.6  		regs->esp, regs->ebp, regs->esi, regs->edi);
     1.7 -	printf("eip    %8x eflags %8x cs     %8x ds     %8x\n",
     1.8 -		regs->eip, regs->eflags, regs->cs, regs->ds);
     1.9 -	printf("es     %8x fs     %8x uss    %8x uesp   %8x\n",
    1.10 -		regs->es, regs->fs, regs->uss, regs->uesp);
    1.11 +	printf("es     %8x ds     %8x fs     %8x gs     %8x\n",
    1.12 +		regs->es, regs->ds, regs->fs, regs->gs);
    1.13 +	printf("trapno %8x errno  %8x\n", regs->trapno, regs->errno);
    1.14 +	printf("eip    %8x cs     %8x eflags %8x\n",
    1.15 +		regs->eip, regs->cs, regs->eflags);
    1.16 +	printf("uesp   %8x uss    %8x \n",
    1.17 +		regs->uesp, regs->uss);
    1.18  	printf("ves    %8x vds    %8x vfs    %8x vgs    %8x\n",
    1.19  		regs->ves, regs->vds, regs->vfs, regs->vgs);
    1.20 -	if (regs->trapno != -1 || regs->errno != -1)
    1.21 -		printf("trapno %8x errno  %8x\n", regs->trapno, regs->errno);
    1.22  
    1.23  	printf("cr0    %8lx cr2    %8x cr3    %8lx cr4    %8lx\n",
    1.24  		(long)oldctx.cr0, get_cr2(),

     2.1 --- a/tools/firmware/vmxassist/vm86.h	Mon Nov 27 10:06:41 2006 +0000
     2.2 +++ b/tools/firmware/vmxassist/vm86.h	Mon Nov 27 10:08:12 2006 +0000
     2.3 @@ -33,11 +33,11 @@
     2.4  #ifndef __ASSEMBLY__
     2.5  
     2.6  struct regs {
     2.7 -        unsigned	edi, esi, ebp, esp, ebx, edx, ecx, eax;
     2.8 -        unsigned	ds, es, fs, gs;
     2.9 -        unsigned	trapno, errno;
    2.10 -        unsigned	eip, cs, eflags, uesp, uss;
    2.11 -        unsigned	ves, vds, vfs, vgs;
    2.12 +	unsigned	edi, esi, ebp, esp, ebx, edx, ecx, eax;
    2.13 +	unsigned	es, ds, fs, gs;
    2.14 +	unsigned	trapno, errno;
    2.15 +	unsigned	eip, cs, eflags, uesp, uss;
    2.16 +	unsigned	ves, vds, vfs, vgs;
    2.17  };
    2.18  
    2.19  enum vm86_mode {