ia64/xen-unstable

changeset 11046:ed22e77a1399

[IA64] reformatting hyperprivop.S for 80-column readability

Minor reformatting to hyperprivop.S to make it readable
on 80-column displays, as requested by Linux coding style.
Minor formatting changes and typo corrections to get the
style more in line with the other .S files.

Signed-off-by: Al Stone <ahs3@fc.hp.com>
author awilliam@xenbuild.aw
date Fri Aug 18 13:31:48 2006 -0600 (2006-08-18)
parents 8c6bb45901e7
children 493bb0265c12
files xen/arch/ia64/xen/hyperprivop.S
line diff
     1.1 --- a/xen/arch/ia64/xen/hyperprivop.S	Wed Aug 16 14:28:57 2006 -0600
     1.2 +++ b/xen/arch/ia64/xen/hyperprivop.S	Fri Aug 18 13:31:48 2006 -0600
     1.3 @@ -18,7 +18,8 @@
     1.4  
     1.5  
     1.6  #define	_PAGE_PPN_MASK	0x0003fffffffff000 //asm/pgtable.h doesn't do assembly
     1.7 -#define PAGE_PHYS	0x0010000000000761 //__pgprot(__DIRTY_BITS|_PAGE_PL_2|_PAGE_AR_RWX)
     1.8 +#define PAGE_PHYS	0x0010000000000761 //__pgprot(__DIRTY_BITS|
     1.9 +					   //         _PAGE_PL_2|_PAGE_AR_RWX)
    1.10  #define _PAGE_PL_2	(2<<7)
    1.11  
    1.12  #if 1	 // change to 0 to turn off all fast paths
    1.13 @@ -32,10 +33,10 @@
    1.14  	
    1.15  //#define FAST_TICK // mostly working (unat problems) but default off for now
    1.16  //#define FAST_TLB_MISS_REFLECT	// mostly working but default off for now
    1.17 -# undef FAST_ITC	//XXX TODO fast_itc doesn't suport dom0 vp yet.
    1.18 +# undef FAST_ITC		//XXX TODO fast_itc doesn't support dom0 vp yet
    1.19  # define FAST_BREAK
    1.20 -# undef FAST_ACCESS_REFLECT //XXX TODO fast_access_reflect
    1.21 -                            //    doesn't support dom0 vp yet.
    1.22 +# undef FAST_ACCESS_REFLECT 	//XXX TODO fast_access_reflect
    1.23 +                            	//    doesn't support dom0 vp yet.
    1.24  # define FAST_RFI
    1.25  # define FAST_SSM_I
    1.26  # define FAST_PTC_GA
    1.27 @@ -104,79 +105,100 @@ GLOBAL_ENTRY(fast_hyperprivop)
    1.28  1:	// when we get to here r20=~=interrupts pending
    1.29  	// Check pending event indication
    1.30  (p7)	movl r20=THIS_CPU(current_psr_i_addr);;
    1.31 -(p7)	ld8 r20=[r20];;
    1.32 -(p7)	adds r20=-1,r20;;	/* evtchn_upcall_pending */
    1.33 -(p7)	ld1 r20=[r20];;
    1.34 +(p7)	ld8 r20=[r20]
    1.35 +	;;
    1.36 +(p7)	adds r20=-1,r20				// evtchn_upcall_pending
    1.37 +	;;
    1.38 +(p7)	ld1 r20=[r20]
    1.39 +	;;
    1.40  
    1.41  	// HYPERPRIVOP_RFI?
    1.42  	cmp.eq p7,p6=HYPERPRIVOP_RFI,r17
    1.43 -(p7)	br.sptk.many hyper_rfi;;
    1.44 +(p7)	br.sptk.many hyper_rfi
    1.45 +	;;
    1.46  
    1.47  	// HYPERPRIVOP_GET_IVR?
    1.48  	cmp.eq p7,p6=HYPERPRIVOP_GET_IVR,r17
    1.49 -(p7)	br.sptk.many hyper_get_ivr;;
    1.50 +(p7)	br.sptk.many hyper_get_ivr
    1.51 +	;;
    1.52  
    1.53  	cmp.ne p7,p0=r20,r0
    1.54 -(p7)	br.spnt.many dispatch_break_fault ;;
    1.55 +(p7)	br.spnt.many dispatch_break_fault
    1.56 +	;;
    1.57  
    1.58  	// HYPERPRIVOP_COVER?
    1.59  	cmp.eq p7,p6=HYPERPRIVOP_COVER,r17
    1.60 -(p7)	br.sptk.many hyper_cover;;
    1.61 +(p7)	br.sptk.many hyper_cover
    1.62 +	;;
    1.63  
    1.64  	// HYPERPRIVOP_SSM_DT?
    1.65  	cmp.eq p7,p6=HYPERPRIVOP_SSM_DT,r17
    1.66 -(p7)	br.sptk.many hyper_ssm_dt;;
    1.67 +(p7)	br.sptk.many hyper_ssm_dt
    1.68 +	;;
    1.69  
    1.70  	// HYPERPRIVOP_RSM_DT?
    1.71  	cmp.eq p7,p6=HYPERPRIVOP_RSM_DT,r17
    1.72 -(p7)	br.sptk.many hyper_rsm_dt;;
    1.73 +(p7)	br.sptk.many hyper_rsm_dt
    1.74 +	;;
    1.75  
    1.76  	// HYPERPRIVOP_GET_TPR?
    1.77  	cmp.eq p7,p6=HYPERPRIVOP_GET_TPR,r17
    1.78 -(p7)	br.sptk.many hyper_get_tpr;;
    1.79 +(p7)	br.sptk.many hyper_get_tpr
    1.80 +	;;
    1.81  
    1.82  	// HYPERPRIVOP_SET_TPR?
    1.83  	cmp.eq p7,p6=HYPERPRIVOP_SET_TPR,r17
    1.84 -(p7)	br.sptk.many hyper_set_tpr;;
    1.85 +(p7)	br.sptk.many hyper_set_tpr
    1.86 +	;;
    1.87  
    1.88  	// HYPERPRIVOP_EOI?
    1.89  	cmp.eq p7,p6=HYPERPRIVOP_EOI,r17
    1.90 -(p7)	br.sptk.many hyper_eoi;;
    1.91 +(p7)	br.sptk.many hyper_eoi
    1.92 +	;;
    1.93  
    1.94  	// HYPERPRIVOP_SET_ITM?
    1.95  	cmp.eq p7,p6=HYPERPRIVOP_SET_ITM,r17
    1.96 -(p7)	br.sptk.many hyper_set_itm;;
    1.97 +(p7)	br.sptk.many hyper_set_itm
    1.98 +	;;
    1.99  
   1.100  	// HYPERPRIVOP_SET_RR?
   1.101  	cmp.eq p7,p6=HYPERPRIVOP_SET_RR,r17
   1.102 -(p7)	br.sptk.many hyper_set_rr;;
   1.103 +(p7)	br.sptk.many hyper_set_rr
   1.104 +	;;
   1.105  
   1.106  	// HYPERPRIVOP_GET_RR?
   1.107  	cmp.eq p7,p6=HYPERPRIVOP_GET_RR,r17
   1.108 -(p7)	br.sptk.many hyper_get_rr;;
   1.109 +(p7)	br.sptk.many hyper_get_rr
   1.110 +	;;
   1.111  
   1.112  	// HYPERPRIVOP_PTC_GA?
   1.113  	cmp.eq p7,p6=HYPERPRIVOP_PTC_GA,r17
   1.114 -(p7)	br.sptk.many hyper_ptc_ga;;
   1.115 +(p7)	br.sptk.many hyper_ptc_ga
   1.116 +	;;
   1.117  
   1.118  	// HYPERPRIVOP_ITC_D?
   1.119  	cmp.eq p7,p6=HYPERPRIVOP_ITC_D,r17
   1.120 -(p7)	br.sptk.many hyper_itc_d;;
   1.121 +(p7)	br.sptk.many hyper_itc_d
   1.122 +	;;
   1.123  
   1.124  	// HYPERPRIVOP_ITC_I?
   1.125  	cmp.eq p7,p6=HYPERPRIVOP_ITC_I,r17
   1.126 -(p7)	br.sptk.many hyper_itc_i;;
   1.127 +(p7)	br.sptk.many hyper_itc_i
   1.128 +	;;
   1.129  
   1.130  	// HYPERPRIVOP_THASH?
   1.131  	cmp.eq p7,p6=HYPERPRIVOP_THASH,r17
   1.132 -(p7)	br.sptk.many hyper_thash;;
   1.133 +(p7)	br.sptk.many hyper_thash
   1.134 +	;;
   1.135  
   1.136  	// HYPERPRIVOP_SET_KR?
   1.137  	cmp.eq p7,p6=HYPERPRIVOP_SET_KR,r17
   1.138 -(p7)	br.sptk.many hyper_set_kr;;
   1.139 +(p7)	br.sptk.many hyper_set_kr
   1.140 +	;;
   1.141  
   1.142  	// if not one of the above, give up for now and do it the slow way
   1.143 -	br.sptk.many dispatch_break_fault ;;
   1.144 +	br.sptk.many dispatch_break_fault
   1.145 +	;;
   1.146  END(fast_hyperprivop)
   1.147  
   1.148  // give up for now if: ipsr.be==1, ipsr.pp==1
   1.149 @@ -701,9 +723,9 @@ ENTRY(fast_reflect)
   1.150  	.mem.offset 0,0; st8.spill [r2]=r30,16;
   1.151  	.mem.offset 8,0; st8.spill [r3]=r31,16 ;;
   1.152  #ifdef HANDLE_AR_UNAT
   1.153 -	// r16~r23 are preserved regsin bank0 regs, we need to restore them,
   1.154 -    // r24~r31 are scratch regs, we don't need to handle NaT bit,
   1.155 -    // because OS handler must assign it before access it
   1.156 +	// r16~r23 are preserved regs in bank0 regs, we need to restore them,
   1.157 +	// r24~r31 are scratch regs, we don't need to handle NaT bit,
   1.158 +	// because OS handler must assign it before access it
   1.159  	ld8 r16=[r2],16;
   1.160  	ld8 r17=[r3],16;;
   1.161  	ld8 r18=[r2],16;
   1.162 @@ -1114,7 +1136,8 @@ just_do_rfi:
   1.163  (p7)	st4 [r18]=r19;;
   1.164  (p6)	st4 [r18]=r0;;
   1.165  	// force on psr.ic, i, dt, rt, it, bn
   1.166 -	movl r20=(IA64_PSR_I|IA64_PSR_IC|IA64_PSR_DT|IA64_PSR_RT|IA64_PSR_IT|IA64_PSR_BN)
   1.167 +	movl r20=(IA64_PSR_I|IA64_PSR_IC|IA64_PSR_DT|IA64_PSR_RT| \
   1.168 +	          IA64_PSR_IT|IA64_PSR_BN)
   1.169  	;;
   1.170  	or r21=r21,r20
   1.171  	;;