debuggers.hg

diff xen/arch/x86/vmx.c @ 3635:ed902e5c4b49

bitkeeper revision 1.1159.212.62 (41fff40aESe4aWS82z_rLHeonXpxuQ)

More x86/64 stuff.
Signed-off-by: keir.fraser@cl.cam.ac.uk
author kaf24@scramble.cl.cam.ac.uk
date Tue Feb 01 21:26:34 2005 +0000 (2005-02-01)
parents d9cdcc864e90
children bbe8541361dd d93748c50893
line diff
     1.1 --- a/xen/arch/x86/vmx.c	Tue Feb 01 09:24:57 2005 +0000
     1.2 +++ b/xen/arch/x86/vmx.c	Tue Feb 01 21:26:34 2005 +0000
     1.3 @@ -166,7 +166,7 @@ static void vmx_do_general_protection_fa
     1.4              eip, error_code);
     1.5  
     1.6      VMX_DBG_LOG(DBG_LEVEL_1,
     1.7 -            "eax=%x, ebx=%x, ecx=%x, edx=%x, esi=%x, edi=%x\n",
     1.8 +            "eax=%lx, ebx=%lx, ecx=%lx, edx=%lx, esi=%lx, edi=%lx\n",
     1.9              regs->eax, regs->ebx, regs->ecx, regs->edx, regs->esi, regs->edi);
    1.10  
    1.11      /* Reflect it back into the guest */
    1.12 @@ -186,7 +186,10 @@ static void vmx_vmexit_do_cpuid(unsigned
    1.13      __vmread(GUEST_EIP, &eip);
    1.14  
    1.15      VMX_DBG_LOG(DBG_LEVEL_1, 
    1.16 -            "do_cpuid: (eax) %x, (ebx) %x, (ecx) %x, (edx) %x, (esi) %x, (edi) %x\n", regs->eax, regs->ebx, regs->ecx, regs->edx, regs->esi, regs->edi);
    1.17 +                "do_cpuid: (eax) %lx, (ebx) %lx, (ecx) %lx, (edx) %lx,"
    1.18 +                " (esi) %lx, (edi) %lx\n",
    1.19 +                regs->eax, regs->ebx, regs->ecx, regs->edx,
    1.20 +                regs->esi, regs->edi);
    1.21  
    1.22      cpuid(input, &eax, &ebx, &ecx, &edx);
    1.23  
    1.24 @@ -213,16 +216,16 @@ static void vmx_vmexit_do_cpuid(unsigned
    1.25  static void vmx_dr_access (unsigned long exit_qualification, struct xen_regs *regs)
    1.26  {
    1.27      unsigned int reg;
    1.28 -    u32 *reg_p = 0;
    1.29 +    unsigned long *reg_p = 0;
    1.30      struct exec_domain *ed = current;
    1.31 -    u32 eip;
    1.32 +    unsigned long eip;
    1.33  
    1.34      __vmread(GUEST_EIP, &eip);
    1.35  
    1.36      reg = exit_qualification & DEBUG_REG_ACCESS_NUM;
    1.37  
    1.38      VMX_DBG_LOG(DBG_LEVEL_1, 
    1.39 -                "vmx_dr_access : eip=%08x, reg=%d, exit_qualification = %lx\n",
    1.40 +                "vmx_dr_access : eip=%lx, reg=%d, exit_qualification = %lx\n",
    1.41                  eip, reg, exit_qualification);
    1.42  
    1.43      switch(exit_qualification & DEBUG_REG_ACCESS_REG) {
    1.44 @@ -629,13 +632,14 @@ static void vmx_cr_access (unsigned long
    1.45  
    1.46  static inline void vmx_do_msr_read(struct xen_regs *regs)
    1.47  {
    1.48 -    VMX_DBG_LOG(DBG_LEVEL_1, "vmx_do_msr_read: ecx=%x, eax=%x, edx=%x",
    1.49 +    VMX_DBG_LOG(DBG_LEVEL_1, "vmx_do_msr_read: ecx=%lx, eax=%lx, edx=%lx",
    1.50              regs->ecx, regs->eax, regs->edx);
    1.51  
    1.52      rdmsr(regs->ecx, regs->eax, regs->edx);
    1.53  
    1.54 -    VMX_DBG_LOG(DBG_LEVEL_1, "vmx_do_msr_read returns: ecx=%x, eax=%x, edx=%x",
    1.55 -            regs->ecx, regs->eax, regs->edx);
    1.56 +    VMX_DBG_LOG(DBG_LEVEL_1, "vmx_do_msr_read returns: "
    1.57 +                "ecx=%lx, eax=%lx, edx=%lx",
    1.58 +                regs->ecx, regs->eax, regs->edx);
    1.59  }
    1.60  
    1.61  /*
    1.62 @@ -792,7 +796,9 @@ asmlinkage void vmx_vmexit_handler(struc
    1.63              __vmread(EXIT_QUALIFICATION, &va);
    1.64              __vmread(VM_EXIT_INTR_ERROR_CODE, &error_code);
    1.65              VMX_DBG_LOG(DBG_LEVEL_VMMU, 
    1.66 -                    "eax=%x, ebx=%x, ecx=%x, edx=%x, esi=%x, edi=%x\n", regs.eax, regs.ebx, regs.ecx, regs.edx, regs.esi, regs.edi);
    1.67 +                    "eax=%lx, ebx=%lx, ecx=%lx, edx=%lx, esi=%lx, edi=%lx\n",
    1.68 +                        regs.eax, regs.ebx, regs.ecx, regs.edx, regs.esi,
    1.69 +                        regs.edi);
    1.70              d->thread.arch_vmx.vmx_platform.mpci.inst_decoder_regs = &regs;
    1.71  
    1.72              if (!(error = vmx_do_page_fault(va, error_code))) {
    1.73 @@ -907,7 +913,7 @@ asmlinkage void vmx_vmexit_handler(struc
    1.74          break;
    1.75      case EXIT_REASON_MSR_WRITE:
    1.76          __vmread(GUEST_EIP, &eip);
    1.77 -        VMX_DBG_LOG(DBG_LEVEL_1, "MSR_WRITE: eip=%08lx, eax=%08x, edx=%08x",
    1.78 +        VMX_DBG_LOG(DBG_LEVEL_1, "MSR_WRITE: eip=%08lx, eax=%08lx, edx=%08lx",
    1.79                  eip, regs.eax, regs.edx);
    1.80          /* just ignore this point */
    1.81          __get_instruction_length(inst_len);