ia64/xen-unstable

changeset 9983:11b7dc3529b9

[IA64] remove remaining warnings in .S files

Add missing .endp in .S files.
Cleanup in Rules.mk.

Signed-off-by: Tristan Gingold <tristan.gingold@bull.net>
author awilliam@xenbuild.aw
date Tue May 09 15:25:32 2006 -0600 (2006-05-09)
parents 6e979aa0e6d2
children e2fba6729281
files xen/arch/ia64/Rules.mk xen/arch/ia64/vmx/vmx_entry.S xen/arch/ia64/xen/hyperprivop.S xen/arch/ia64/xen/xenasm.S
line diff
     1.1 --- a/xen/arch/ia64/Rules.mk	Tue May 09 15:23:33 2006 -0600
     1.2 +++ b/xen/arch/ia64/Rules.mk	Tue May 09 15:25:32 2006 -0600
     1.3 @@ -4,30 +4,30 @@
     1.4  HAS_ACPI := y
     1.5  VALIDATE_VT	?= n
     1.6  xen_ia64_dom0_virtual_physical	?= n
     1.7 +no_warns ?= n
     1.8  
     1.9  ifneq ($(COMPILE_ARCH),$(TARGET_ARCH))
    1.10  CROSS_COMPILE ?= /usr/local/sp_env/v2.2.5/i686/bin/ia64-unknown-linux-
    1.11  endif
    1.12 -AFLAGS  += -D__ASSEMBLY__ -nostdinc $(CPPFLAGS)
    1.13 -AFLAGS  += -mconstant-gp
    1.14 -CPPFLAGS  += -I$(BASEDIR)/include -I$(BASEDIR)/include/asm-ia64 	\
    1.15 -             -I$(BASEDIR)/include/asm-ia64/linux 			\
    1.16 -	     -I$(BASEDIR)/include/asm-ia64/linux-xen 			\
    1.17 -	     -I$(BASEDIR)/include/asm-ia64/linux-null 			\
    1.18 -             -I$(BASEDIR)/arch/ia64/linux -I$(BASEDIR)/arch/ia64/linux-xen
    1.19 +
    1.20 +# Used only by linux/Makefile.
    1.21 +AFLAGS_KERNEL  += -mconstant-gp
    1.22 +
    1.23 +# Note: .S -> .o rule uses AFLAGS and CFLAGS.
    1.24  
    1.25  CFLAGS  += -nostdinc -fno-builtin -fno-common -fno-strict-aliasing
    1.26  CFLAGS  += -mconstant-gp
    1.27  #CFLAGS  += -O3		# -O3 over-inlines making debugging tough!
    1.28  CFLAGS  += -O2		# but no optimization causes compile errors!
    1.29 -#CFLAGS  += -iwithprefix include -Wall -DMONITOR_BASE=$(MONITOR_BASE)
    1.30 -CFLAGS  += -iwithprefix include -Wall
    1.31 -CFLAGS  += -fomit-frame-pointer -I$(BASEDIR)/include -D__KERNEL__
    1.32 -CFLAGS  += -I$(BASEDIR)/include/asm-ia64 -I$(BASEDIR)/include/asm-ia64/linux \
    1.33 +CFLAGS  += -fomit-frame-pointer -D__KERNEL__
    1.34 +CFLAGS  += -iwithprefix include
    1.35 +CPPFLAGS+= -I$(BASEDIR)/include                                         \
    1.36 +           -I$(BASEDIR)/include/asm-ia64                                \
    1.37             -I$(BASEDIR)/include/asm-ia64/linux 				\
    1.38             -I$(BASEDIR)/include/asm-ia64/linux-xen 			\
    1.39  	   -I$(BASEDIR)/include/asm-ia64/linux-null 			\
    1.40             -I$(BASEDIR)/arch/ia64/linux -I$(BASEDIR)/arch/ia64/linux-xen
    1.41 +CFLAGS += $(CPPFLAGS)
    1.42  #CFLAGS  += -Wno-pointer-arith -Wredundant-decls
    1.43  CFLAGS  += -DIA64 -DXEN -DLINUX_2_6 -DV_IOSAPIC_READY
    1.44  CFLAGS	+= -ffixed-r13 -mfixed-range=f2-f5,f12-f127
    1.45 @@ -39,4 +39,8 @@ endif
    1.46  ifeq ($(xen_ia64_dom0_virtual_physical),y)
    1.47  CFLAGS	+= -DCONFIG_XEN_IA64_DOM0_VP
    1.48  endif
    1.49 +ifeq ($(no_warns),y)
    1.50 +CFLAGS	+= -Wa,--fatal-warnings
    1.51 +endif
    1.52 +
    1.53  LDFLAGS := -g
     2.1 --- a/xen/arch/ia64/vmx/vmx_entry.S	Tue May 09 15:23:33 2006 -0600
     2.2 +++ b/xen/arch/ia64/vmx/vmx_entry.S	Tue May 09 15:25:32 2006 -0600
     2.3 @@ -333,6 +333,7 @@ vmx_dorfirfi_back:
     2.4      mov b0=r16
     2.5      br.cond.sptk b0         // call the service
     2.6      ;;
     2.7 +END(ia64_leave_hypervisor)
     2.8  switch_rr7:
     2.9  // fall through
    2.10  GLOBAL_ENTRY(ia64_vmm_entry)
    2.11 @@ -363,7 +364,7 @@ ia64_vmm_entry_out:
    2.12      mov b0=r29
    2.13      ;;
    2.14      br.cond.sptk b0             // call pal service
    2.15 -END(ia64_leave_hypervisor)
    2.16 +END(ia64_vmm_entry)
    2.17  
    2.18  //r24 rfi_pfs
    2.19  //r17 address of rfi_pfs
     3.1 --- a/xen/arch/ia64/xen/hyperprivop.S	Tue May 09 15:23:33 2006 -0600
     3.2 +++ b/xen/arch/ia64/xen/hyperprivop.S	Tue May 09 15:25:32 2006 -0600
     3.3 @@ -176,7 +176,7 @@ 1:	// when we get to here r20=~=interrup
     3.4  
     3.5  	// if not one of the above, give up for now and do it the slow way
     3.6  	br.sptk.many dispatch_break_fault ;;
     3.7 -
     3.8 +END(fast_hyperprivop)
     3.9  
    3.10  // give up for now if: ipsr.be==1, ipsr.pp==1
    3.11  // from reflect_interruption, don't need to:
    3.12 @@ -329,6 +329,7 @@ ENTRY(hyper_ssm_i)
    3.13  	mov pr=r31,-1 ;;
    3.14  	rfi
    3.15  	;;
    3.16 +END(hyper_ssm_i)
    3.17  
    3.18  // reflect domain clock interrupt
    3.19  //	r31 == pr
    3.20 @@ -575,7 +576,7 @@ 1:
    3.21  	adds r21=XSI_IIM_OFS-XSI_PSR_IC_OFS,r18 ;;
    3.22  	st8 [r21]=r17;;
    3.23  	// fall through
    3.24 -
    3.25 +END(fast_break_reflect)
    3.26  
    3.27  // reflect to domain ivt+r20
    3.28  // sets up isr,iip,ipsr,ifs (FIXME: do iipa too)
    3.29 @@ -704,6 +705,7 @@ ENTRY(fast_reflect)
    3.30  	mov pr=r31,-1 ;;
    3.31  	rfi
    3.32  	;;
    3.33 +END(fast_reflect)
    3.34  
    3.35  // reflect access faults (0x2400,0x2800,0x5300) directly to domain
    3.36  //	r16 == isr
    3.37 @@ -743,6 +745,7 @@ GLOBAL_ENTRY(fast_access_reflect)
    3.38  	and r22=~3,r22;;
    3.39  	st8 [r23]=r22;;
    3.40  	br.cond.sptk.many fast_reflect;;
    3.41 +END(fast_access_reflect)
    3.42  
    3.43  // when we get to here, VHPT_CCHAIN_LOOKUP has failed and everything
    3.44  // is as it was at the time of original miss.  We want to preserve that
    3.45 @@ -938,6 +941,7 @@ 1:	// check the guest VHPT
    3.46  	extr.u r24=r24,2,6;;
    3.47  	// IFA already in PSCB
    3.48  	br.cond.sptk.many fast_insert;;
    3.49 +END(fast_tlb_miss_reflect)
    3.50  
    3.51  // we get here if fast_insert fails (e.g. due to metaphysical lookup)
    3.52  ENTRY(recover_and_page_fault)
    3.53 @@ -1127,9 +1131,10 @@ 1:	mov pr=r31,-1
    3.54  	;;
    3.55  	rfi
    3.56  	;;
    3.57 -
    3.58 +END(hyper_rfi)
    3.59 +	
    3.60  #ifdef RFI_TO_INTERRUPT
    3.61 -GLOBAL_ENTRY(rfi_check_extint)
    3.62 +ENTRY(rfi_check_extint)
    3.63  	//br.sptk.many dispatch_break_fault ;;
    3.64  
    3.65  	// r18=&vpsr.i|vpsr.ic, r21==vpsr, r22=vcr.iip
    3.66 @@ -1196,11 +1201,12 @@ GLOBAL_ENTRY(rfi_check_extint)
    3.67  	adds r29=15,r29;;
    3.68  	cmp.ge p6,p0=r29,r26	// if tpr masks interrupt, just rfi
    3.69  (p6)	br.cond.spnt.few just_do_rfi;;
    3.70 +END(rfi_check_extint)
    3.71  
    3.72  // this doesn't work yet (dies early after getting to user mode)
    3.73  // but happens relatively infrequently, so fix it later.
    3.74  // NOTE that these will be counted incorrectly for now (for privcnt output)
    3.75 -GLOBAL_ENTRY(rfi_with_interrupt)
    3.76 +ENTRY(rfi_with_interrupt)
    3.77  #if 1
    3.78  	br.sptk.many dispatch_break_fault ;;
    3.79  #endif
    3.80 @@ -1295,6 +1301,7 @@ GLOBAL_ENTRY(rfi_with_interrupt)
    3.81  	st4 [r20]=r0 ;;
    3.82  	mov pr=r31,-1 ;;
    3.83  	rfi
    3.84 +END(rfi_with_interrupt)
    3.85  #endif // RFI_TO_INTERRUPT
    3.86  
    3.87  ENTRY(hyper_cover)
    3.88 @@ -1330,6 +1337,7 @@ ENTRY(hyper_cover)
    3.89  	mov pr=r31,-1 ;;
    3.90  	rfi
    3.91  	;;
    3.92 +END(hyper_cover)
    3.93  
    3.94  // return from metaphysical mode (meta=1) to virtual mode (meta=0)
    3.95  ENTRY(hyper_ssm_dt)
    3.96 @@ -1366,6 +1374,7 @@ 1:	extr.u r26=r24,41,2 ;;
    3.97  	mov pr=r31,-1 ;;
    3.98  	rfi
    3.99  	;;
   3.100 +END(hyper_ssm_dt)
   3.101  
   3.102  // go to metaphysical mode (meta=1) from virtual mode (meta=0)
   3.103  ENTRY(hyper_rsm_dt)
   3.104 @@ -1403,6 +1412,7 @@ 1:	extr.u r26=r24,41,2 ;;
   3.105  	mov pr=r31,-1 ;;
   3.106  	rfi
   3.107  	;;
   3.108 +END(hyper_rsm_dt)
   3.109  
   3.110  ENTRY(hyper_get_tpr)
   3.111  #ifdef FAST_HYPERPRIVOP_CNT
   3.112 @@ -1826,7 +1836,7 @@ END(hyper_set_kr)
   3.113  // On entry:
   3.114  //	r18 == XSI_PSR_IC
   3.115  //	r31 == pr
   3.116 -GLOBAL_ENTRY(hyper_thash)
   3.117 +ENTRY(hyper_thash)
   3.118  #ifdef FAST_HYPERPRIVOP_CNT
   3.119  	movl r20=fast_hyperpriv_cnt+(8*HYPERPRIVOP_THASH);;
   3.120  	ld8 r21=[r20];;
   3.121 @@ -1974,15 +1984,16 @@ ENTRY(recover_and_dispatch_break_fault)
   3.122  #endif
   3.123  	mov b0=r29 ;;
   3.124  	br.sptk.many dispatch_break_fault;;
   3.125 +END(recover_and_dispatch_break_fault)
   3.126  
   3.127  //  Registers at entry
   3.128  //	r17 = break immediate (HYPERPRIVOP_ITC_D or I)
   3.129  //	r18 == XSI_PSR_IC_OFS
   3.130  //	r31 == pr
   3.131 -GLOBAL_ENTRY(hyper_itc)
   3.132 -ENTRY(hyper_itc_i)
   3.133 +ENTRY(hyper_itc)
   3.134 +hyper_itc_i:	
   3.135  	// fall through, hyper_itc_d handles both i and d
   3.136 -ENTRY(hyper_itc_d)
   3.137 +hyper_itc_d:	
   3.138  #ifndef FAST_ITC
   3.139  	br.sptk.many dispatch_break_fault ;;
   3.140  #else
   3.141 @@ -2023,6 +2034,7 @@ ENTRY(hyper_itc_d)
   3.142  	mov r16=r8;;
   3.143  	// fall through
   3.144  #endif
   3.145 +END(hyper_itc)
   3.146  
   3.147  #if defined(FAST_ITC) || defined (FAST_TLB_MISS_REFLECT)
   3.148  
   3.149 @@ -2034,7 +2046,7 @@ ENTRY(hyper_itc_d)
   3.150  //	r29 == saved value of b0 in case of recovery
   3.151  //	r30 == recovery ip if failure occurs
   3.152  //	r31 == pr
   3.153 -GLOBAL_ENTRY(fast_insert)
   3.154 +ENTRY(fast_insert)
   3.155  	// translate_domain_pte(r16=pteval,PSCB(ifa)=address,r24=itir)
   3.156  	mov r19=1;;
   3.157  	shl r20=r19,r24;;
     4.1 --- a/xen/arch/ia64/xen/xenasm.S	Tue May 09 15:23:33 2006 -0600
     4.2 +++ b/xen/arch/ia64/xen/xenasm.S	Tue May 09 15:25:32 2006 -0600
     4.3 @@ -337,7 +337,7 @@ END(dorfirfi)
     4.4  GLOBAL_ENTRY(dorfi)
     4.5          rfi
     4.6  	;;
     4.7 -END(dorfirfi)
     4.8 +END(dorfi)
     4.9  
    4.10  //
    4.11  // Long's Peak UART Offsets