Avoid using v8 opcodes; use ba instead of b for unconditional branches.

2 files changed, 37 insertions, 37 deletions

diff --git a/sys/sparc64/sparc64/exception.S b/sys/sparc64/sparc64/exception.S
index e33e902..6126d59 100644
--- a/sys/sparc64/sparc64/exception.S
+++ b/sys/sparc64/sparc64/exception.S
@@ -219,7 +219,7 @@ ENTRY(tl1_kstack_fault)
 	clr	%fp
 
 	set	trap, %o2
-	b	%xcc, tl1_trap
+	ba	%xcc, tl1_trap
 	 mov	T_KSTACK_FAULT | T_KERNEL, %o0
 END(tl1_kstack_fault)
 
@@ -318,7 +318,7 @@ END(tl1_kstack_fault)
  * Generate a T_SPILL or T_FILL trap if the window operation fails.
  */
 #define	RSF_TRAP(type) \
-	b	%xcc, tl0_sftrap ; \
+	ba	%xcc, tl0_sftrap ; \
 	 mov	type, %g2 ; \
 	.align	16
 
@@ -326,7 +326,7 @@ END(tl1_kstack_fault)
  * Game over if the window operation fails.
  */
 #define	RSF_FATAL(type) \
-	b	%xcc, rsf_fatal ; \
+	ba	%xcc, rsf_fatal ; \
 	 mov	type, %g2 ; \
 	.align	16
 
@@ -345,7 +345,7 @@ END(tl1_kstack_fault)
  * Spill to the pcb if a spill to the user stack in kernel mode fails.
  */
 #define	RSF_SPILL_TOPCB \
-	b,a	%xcc, tl1_spill_topcb ; \
+	ba,a	%xcc, tl1_spill_topcb ; \
 	 nop ; \
 	.align	16
 
@@ -468,7 +468,7 @@ END(rsf_fatal)
 	tl1_split
 	clr	%o1
 	set	trap, %o2
-	b	%xcc, tl1_trap
+	ba	%xcc, tl1_trap
 	 mov	\type | T_KERNEL, %o0
 	.endm
 
@@ -490,7 +490,7 @@ END(rsf_fatal)
 	ldxa	[%g0 + AA_IMMU_SFSR] %asi, %g4
 	stxa	%g0, [%g0 + AA_IMMU_SFSR] %asi
 	membar	#Sync
-	b	%xcc, tl0_sfsr_trap
+	ba	%xcc, tl0_sfsr_trap
 	 mov	T_INSTRUCTION_EXCEPTION, %g2
 	.align	32
 	.endm
@@ -502,7 +502,7 @@ END(rsf_fatal)
 	ldxa	[%g0 + AA_DMMU_SFSR] %asi, %g4
 	stxa	%g0, [%g0 + AA_DMMU_SFSR] %asi
 	membar	#Sync
-	b	%xcc, tl0_sfsr_trap
+	ba	%xcc, tl0_sfsr_trap
 	 mov	T_DATA_EXCEPTION, %g2
 	.align	32
 	.endm
@@ -513,7 +513,7 @@ END(rsf_fatal)
 	ldxa	[%g0 + AA_DMMU_SFSR] %asi, %g4
 	stxa	%g0, [%g0 + AA_DMMU_SFSR] %asi
 	membar	#Sync
-	b	%xcc, tl0_sfsr_trap
+	ba	%xcc, tl0_sfsr_trap
 	 mov	T_MEM_ADDRESS_NOT_ALIGNED, %g2
 	.align	32
 	.endm
@@ -531,7 +531,7 @@ END(tl0_sfsr_trap)
 	.macro	tl0_intr level, mask
 	tl0_split
 	set	\mask, %o1
-	b	%xcc, tl0_intr
+	ba	%xcc, tl0_intr
 	 mov	\level, %o0
 	.align	32
 	.endm
@@ -908,7 +908,7 @@ ENTRY(tl0_dmmu_miss_trap)
 	clr	%o1
 	set	trap, %o2
 	mov	%g2, %o3
-	b	%xcc, tl1_trap
+	ba	%xcc, tl1_trap
 	 mov	T_DATA_MISS | T_KERNEL, %o0
 END(tl0_dmmu_miss_trap)
 
@@ -1033,7 +1033,7 @@ tl1_dmmu_prot_user:
 	/*
 	 * Not in user tsb, call c code.
 	 */
-	b,a	%xcc, tl0_dmmu_prot_trap
+	ba,a	%xcc, tl0_dmmu_prot_trap
 	 nop
 END(tl0_dmmu_prot_1)
 
@@ -1099,7 +1099,7 @@ ENTRY(tl0_dmmu_prot_trap)
 	mov	%g2, %o3
 	mov	%g3, %o4
 	mov	%g4, %o5
-	b	%xcc, tl1_trap
+	ba	%xcc, tl1_trap
 	 mov	T_DATA_PROTECTION | T_KERNEL, %o0
 END(tl0_dmmu_prot_trap)
 
@@ -1150,7 +1150,7 @@ ENTRY(tl0_sftrap)
 	tl0_split
 	clr	%o1
 	set	trap, %o2
-	b	%xcc, tl0_trap
+	ba	%xcc, tl0_trap
 	 mov	%g2, %o0
 END(tl0_sftrap)
 
@@ -1205,7 +1205,7 @@ END(tl0_fp_restore)
 	ldxa	[%g0 + AA_IMMU_SFSR] %asi, %g4
 	stxa	%g0, [%g0 + AA_IMMU_SFSR] %asi
 	membar	#Sync
-	b	%xcc, tl1_insn_exceptn_trap
+	ba	%xcc, tl1_insn_exceptn_trap
 	 mov	T_INSTRUCTION_EXCEPTION | T_KERNEL, %g2
 	.align	32
 	.endm
@@ -1216,7 +1216,7 @@ ENTRY(tl1_insn_exceptn_trap)
 	set	trap, %o2
 	mov	%g3, %o4
 	mov	%g4, %o5
-	b	%xcc, tl1_trap
+	ba	%xcc, tl1_trap
 	 mov	%g2, %o0
 END(tl1_insn_exceptn_trap)
 
@@ -1252,26 +1252,26 @@ END(tl1_fp_disabled_1)
 
 	.macro	tl1_data_excptn
 	wrpr	%g0, PSTATE_ALT, %pstate
-	b,a	%xcc, tl1_data_excptn_trap
+	ba,a	%xcc, tl1_data_excptn_trap
 	 nop
 	.align	32
 	.endm
 
 ENTRY(tl1_data_excptn_trap)
 	RESUME_SPILLFILL_MMU_CLR_SFSR
-	b	%xcc, tl1_sfsr_trap
+	ba	%xcc, tl1_sfsr_trap
 	 mov	T_DATA_EXCEPTION | T_KERNEL, %g2
 END(tl1_data_excptn_trap)
 
 	.macro	tl1_align
-	b,a	%xcc, tl1_align_trap
+	ba,a	%xcc, tl1_align_trap
 	 nop
 	.align	32
 	.endm
 
 ENTRY(tl1_align_trap)
 	RESUME_SPILLFILL_ALIGN
-	b	%xcc, tl1_sfsr_trap
+	ba	%xcc, tl1_sfsr_trap
 	 mov	T_MEM_ADDRESS_NOT_ALIGNED | T_KERNEL, %g2
 END(tl1_data_excptn_trap)
 
@@ -1287,14 +1287,14 @@ ENTRY(tl1_sfsr_trap)
 	set	trap, %o2
 	mov	%g3, %o4
 	mov	%g4, %o5
-	b	%xcc, tl1_trap
+	ba	%xcc, tl1_trap
 	 mov	%g2, %o0
 END(tl1_sfsr_trap)
 
 	.macro	tl1_intr level, mask
 	tl1_split
 	set	\mask, %o1
-	b	%xcc, tl1_intr
+	ba	%xcc, tl1_intr
 	 mov	\level, %o0
 	.align	32
 	.endm
@@ -1403,7 +1403,7 @@ ENTRY(tl1_immu_miss_trap)
 	clr	%o1
 	set	trap, %o2
 	mov	%g2, %o3
-	b	%xcc, tl1_trap
+	ba	%xcc, tl1_trap
 	 mov	T_INSTRUCTION_MISS | T_KERNEL, %o0
 END(tl1_immu_miss_trap)
 
@@ -1522,7 +1522,7 @@ ENTRY(tl1_dmmu_miss_trap)
 	clr	%o1
 	set	trap, %o2
 	mov	%g2, %o3
-	b	%xcc, tl1_trap
+	ba	%xcc, tl1_trap
 	 mov	T_DATA_MISS | T_KERNEL, %o0
 END(tl1_dmmu_miss_trap)
 
@@ -1662,7 +1662,7 @@ ENTRY(tl1_dmmu_prot_trap)
 	mov	%g2, %o3
 	mov	%g3, %o4
 	mov	%g4, %o5
-	b	%xcc, tl1_trap
+	ba	%xcc, tl1_trap
 	 mov	T_DATA_PROTECTION | T_KERNEL, %o0
 END(tl1_dmmu_prot_trap)
 
@@ -2332,7 +2332,7 @@ ENTRY(tl0_intr)
 	call	critical_exit
 	 nop
 
-	b,a	%xcc, tl0_ret
+	ba,a	%xcc, tl0_ret
 	 nop
 END(tl0_intr)
 
@@ -2901,6 +2901,6 @@ ENTRY(fork_trampoline)
 	mov	%l1, %o1
 	call	fork_exit
 	 mov	%l2, %o2
-	b,a	%xcc, tl0_ret
+	ba,a	%xcc, tl0_ret
 	 nop
 END(fork_trampoline)
diff --git a/sys/sparc64/sparc64/support.S b/sys/sparc64/sparc64/support.S
index c4ce362..2d1c8cb 100644
--- a/sys/sparc64/sparc64/support.S
+++ b/sys/sparc64/sparc64/support.S
@@ -79,7 +79,7 @@ __FBSDID("$FreeBSD$");
 	ST(b, da) %g1, [dst] dasi ; \
 	brz,pn	%g1, 3f ; \
 	 inc	src ; \
-	b	%xcc, 1b ; \
+	ba	%xcc, 1b ; \
 	 inc	dst ; \
 2:	mov	ENAMETOOLONG, %g1 ; \
 3:	sub	src, %g2, %g2 ; \
@@ -117,7 +117,7 @@ __FBSDID("$FreeBSD$");
 	bz,a,pt	%xcc, 2f ; \
 	 inc	1, len ; \
 	ST(b, da) pat, [dst] dasi ; \
-	b	%xcc, 1b ; \
+	ba	%xcc, 1b ; \
 	 inc	dst ; \
 	.align 16 ; \
 2:	deccc	32, len ; \
@@ -127,21 +127,21 @@ __FBSDID("$FreeBSD$");
 	ST(x, da) pat, [dst + 8] dasi ; \
 	ST(x, da) pat, [dst + 16] dasi ; \
 	ST(x, da) pat, [dst + 24] dasi ; \
-	b	%xcc, 2b ; \
+	ba	%xcc, 2b ; \
 	 inc	32, dst ; \
 	.align 16 ; \
 3:	deccc	8, len ; \
 	bl,a,pn	%xcc, 4f ; \
 	 inc	8, len ; \
 	ST(x, da) pat, [dst] dasi ; \
-	b	%xcc, 3b ; \
+	ba	%xcc, 3b ; \
 	 inc	8, dst ; \
 	.align 16 ; \
 4:	deccc	1, len ; \
 	bl,a,pn	%xcc, 5f ; \
 	 nop ; \
 	ST(b, da) pat, [dst] dasi ; \
-	b	%xcc, 4b ; \
+	ba	%xcc, 4b ; \
 	 inc	1, dst ; \
 5:
 
@@ -170,13 +170,13 @@ __FBSDID("$FreeBSD$");
 	LD(ub, sa) [src] sasi, %g1 ; \
 	ST(b, da) %g1, [dst] dasi ; \
 	inc	1, src ; \
-	b	%xcc, 1b ; \
+	ba	%xcc, 1b ; \
 	 inc	1, dst ; \
 	.align 16 ; \
 2:	btst	7, src ; \
 	bz,a,pt	%xcc, 3f ; \
 	 nop ; \
-	b,a	%xcc, 5f ; \
+	ba,a	%xcc, 5f ; \
 	.align 16 ; \
 3:	deccc	32, len ; \
 	bl,a,pn	%xcc, 4f ; \
@@ -190,7 +190,7 @@ __FBSDID("$FreeBSD$");
 	ST(x, da) %g3, [dst + 16] dasi ; \
 	ST(x, da) %g4, [dst + 24] dasi ; \
 	inc	32, src ; \
-	b	%xcc, 3b ; \
+	ba	%xcc, 3b ; \
 	 inc	32, dst ; \
 	.align 16 ; \
 4:	deccc	8, len ; \
@@ -199,7 +199,7 @@ __FBSDID("$FreeBSD$");
 	LD(x, sa) [src] sasi, %g1 ; \
 	ST(x, da) %g1, [dst] dasi ; \
 	inc	8, src ; \
-	b	%xcc, 4b ; \
+	ba	%xcc, 4b ; \
 	 inc	8, dst ; \
 	.align 16 ; \
 5:	deccc	1, len ; \
@@ -208,7 +208,7 @@ __FBSDID("$FreeBSD$");
 	LD(ub, sa) [src] sasi, %g1 ; \
 	ST(b, da) %g1, [dst] dasi ; \
 	inc	src ; \
-	b	%xcc, 5b ; \
+	ba	%xcc, 5b ; \
 	 inc	dst ; \
 6:
 
@@ -293,7 +293,7 @@ ENTRY(bcopy)
 	dec	1, %o0
 	ldub	[%o0], %g1
 	dec	1, %o1
-	b	%xcc, 1b
+	ba	%xcc, 1b
 	 stb	%g1, [%o1]
 2:	retl
 	 nop