ia64/xen-unstable

changeset 5468:fbaa44e9a167

bitkeeper revision 1.1709.1.13 (42b1c394PElLHEtfGVY2A9O1xIx4aQ)

serial port back to work again

Signed-off-by Kevin Tian <Kevin.tian@intel.com>
author djm@kirby.fc.hp.com
date Thu Jun 16 18:23:16 2005 +0000 (2005-06-16)
parents bb00ea361eb8
children f97b4f909b4b
files xen/arch/ia64/vmx_ivt.S
line diff
     1.1 --- a/xen/arch/ia64/vmx_ivt.S	Thu Jun 16 18:20:35 2005 +0000
     1.2 +++ b/xen/arch/ia64/vmx_ivt.S	Thu Jun 16 18:23:16 2005 +0000
     1.3 @@ -249,9 +249,9 @@ ENTRY(vmx_alt_itlb_miss)
     1.4  	movl r19=(((1 << IA64_MAX_PHYS_BITS) - 1) & ~0xfff)
     1.5  	;;
     1.6  	and r19=r19,r16		// clear ed, reserved bits, and PTE control bits
     1.7 -	shr.u r18=r16,57	// move address bit 61 to bit 4
     1.8 +	shr.u r18=r16,55	// move address bit 59 to bit 4
     1.9  	;;
    1.10 -	andcm r18=0x10,r18	// bit 4=~address-bit(61)
    1.11 +	and r18=0x10,r18	// bit 4=address-bit(61)
    1.12  	or r19=r17,r19		// insert PTE control bits into r19
    1.13  	;;
    1.14  	or r19=r19,r18		// set bit 4 (uncached) if the access was to region 6
    1.15 @@ -280,11 +280,11 @@ ENTRY(vmx_alt_dtlb_miss)
    1.16  	;;
    1.17  	and r22=IA64_ISR_CODE_MASK,r20		// get the isr.code field
    1.18  	tbit.nz p6,p7=r20,IA64_ISR_SP_BIT	// is speculation bit on?
    1.19 -	shr.u r18=r16,57			// move address bit 61 to bit 4
    1.20 +	shr.u r18=r16,55			// move address bit 59 to bit 4
    1.21  	and r19=r19,r16				// clear ed, reserved bits, and PTE control bits
    1.22  	tbit.nz p9,p0=r20,IA64_ISR_NA_BIT	// is non-access bit on?
    1.23  	;;
    1.24 -	andcm r18=0x10,r18	// bit 4=~address-bit(61)
    1.25 +	and r18=0x10,r18	// bit 4=address-bit(61)
    1.26  (p9) cmp.eq.or.andcm p6,p7=IA64_ISR_CODE_LFETCH,r22	// check isr.code field
    1.27  	dep r24=-1,r24,IA64_PSR_ED_BIT,1
    1.28  	or r19=r19,r17		// insert PTE control bits into r19