svn commit: r295727 - in projects/mips64-clang/sys/mips: include mips

[Sean Bruno]

Author: sbruno
Date: Wed Feb 17 22:58:47 2016
New Revision: 295727
URL: https://svnweb.freebsd.org/changeset/base/295727

Log:
  Sundry ASM changes here to play nice with the Clang IAS.
  
  Submitted by:	emaste

Modified:
  projects/mips64-clang/sys/mips/include/asm.h
  projects/mips64-clang/sys/mips/mips/exception.S
  projects/mips64-clang/sys/mips/mips/fp.S
  projects/mips64-clang/sys/mips/mips/locore.S

Modified: projects/mips64-clang/sys/mips/include/asm.h
==============================================================================
--- projects/mips64-clang/sys/mips/include/asm.h	Wed Feb 17 22:58:08 2016	(r295726)
+++ projects/mips64-clang/sys/mips/include/asm.h	Wed Feb 17 22:58:47 2016	(r295727)
@@ -253,7 +253,7 @@ _C_LABEL(x):
 	MSG(msg)
 
 #define	MSG(msg)			\
-	.rdata;				\
+	.section .rdata;		\
 9:	.asciiz	msg;			\
 	.text
 

Modified: projects/mips64-clang/sys/mips/mips/exception.S
==============================================================================
--- projects/mips64-clang/sys/mips/mips/exception.S	Wed Feb 17 22:58:08 2016	(r295726)
+++ projects/mips64-clang/sys/mips/mips/exception.S	Wed Feb 17 22:58:47 2016	(r295727)
@@ -197,7 +197,9 @@ VECTOR(MipsException, unknown)
 	PTR_SLL	k1, k1, 1			# shift to get 8-byte offset
 #endif
 1:
+	.set	at
 	PTR_LA	k0, _C_LABEL(machExceptionTable)  # get base of the jump table
+	.set	noat
 	PTR_ADDU k0, k0, k1			# Get the address of the
 						#  function entry.  Note that
 						#  the cause is already

Modified: projects/mips64-clang/sys/mips/mips/fp.S
==============================================================================
--- projects/mips64-clang/sys/mips/mips/fp.S	Wed Feb 17 22:58:08 2016	(r295726)
+++ projects/mips64-clang/sys/mips/mips/fp.S	Wed Feb 17 22:58:47 2016	(r295727)
@@ -115,7 +115,7 @@ NESTED(MipsEmulateFP, CALLFRAME_SIZ, ra)
 	ctc1	a1, MIPS_FPU_CSR
 	j	a3
 
-	.rdata
+	.section .rdata
 func_fmt_tbl:
 	.word	add_s		# 0
 	.word	add_d		# 0
@@ -2272,7 +2272,7 @@ LEAF(get_fs_int)
 	lw	a3, get_fs_int_tbl(a3)		# switch on register number
 	j	a3
 
-	.rdata
+	.section .rdata
 get_fs_int_tbl:
 	.word	get_fs_int_f0
 	.word	get_fs_int_f2
@@ -2370,7 +2370,7 @@ LEAF(get_ft_fs_s)
 	lw	a3, get_ft_s_tbl(a3)		# switch on register number
 	j	a3
 
-	.rdata
+	.section .rdata
 get_ft_s_tbl:
 	.word	get_ft_s_f0
 	.word	get_ft_s_f2
@@ -2468,7 +2468,7 @@ XLEAF(get_fs_s)
 	lw	a3, get_fs_s_tbl(a3)		# switch on register number
 	j	a3
 
-	.rdata
+	.section .rdata
 get_fs_s_tbl:
 	.word	get_fs_s_f0
 	.word	get_fs_s_f2
@@ -2572,7 +2572,7 @@ LEAF(get_ft_fs_d)
 	lw	a3, get_ft_d_tbl(a3)		# switch on register number
 	j	a3
 
-	.rdata
+	.section .rdata
 get_ft_d_tbl:
 	.word	get_ft_d_f0
 	.word	get_ft_d_f2
@@ -2687,7 +2687,7 @@ XLEAF(get_fs_d)
 	lw	a3, get_fs_d_tbl(a3)		# switch on register number
 	j	a3
 
-	.rdata
+	.section .rdata
 get_fs_d_tbl:
 	.word	get_fs_d_f0
 	.word	get_fs_d_f2
@@ -2805,7 +2805,7 @@ LEAF(get_cmp_s)
 	lw	a3, cmp_fs_s_tbl(a3)		# switch on register number
 	j	a3
 
-	.rdata
+	.section .rdata
 cmp_fs_s_tbl:
 	.word	cmp_fs_s_f0
 	.word	cmp_fs_s_f2
@@ -2883,7 +2883,7 @@ cmp_fs_s_done:
 	lw	a3, cmp_ft_s_tbl(a3)		# switch on register number
 	j	a3
 
-	.rdata
+	.section .rdata
 cmp_ft_s_tbl:
 	.word	cmp_ft_s_f0
 	.word	cmp_ft_s_f2
@@ -2983,7 +2983,7 @@ LEAF(get_cmp_d)
 	lw	a3, cmp_fs_d_tbl(a3)		# switch on register number
 	j	a3
 
-	.rdata
+	.section .rdata
 cmp_fs_d_tbl:
 	.word	cmp_fs_d_f0
 	.word	cmp_fs_d_f2
@@ -3077,7 +3077,7 @@ cmp_fs_d_done:
 	lw	a3, cmp_ft_d_tbl(a3)		# switch on register number
 	j	a3
 
-	.rdata
+	.section .rdata
 cmp_ft_d_tbl:
 	.word	cmp_ft_d_f0
 	.word	cmp_ft_d_f2
@@ -3202,7 +3202,7 @@ XLEAF(set_fd_word)
 	lw	a3, set_fd_s_tbl(a3)		# switch on register number
 	j	a3
 
-	.rdata
+	.section .rdata
 set_fd_s_tbl:
 	.word	set_fd_s_f0
 	.word	set_fd_s_f2
@@ -3297,7 +3297,7 @@ LEAF(set_fd_d)
 	lw	a3, set_fd_d_tbl(a3)		# switch on register number
 	j	a3
 
-	.rdata
+	.section .rdata
 set_fd_d_tbl:
 	.word	set_fd_d_f0
 	.word	set_fd_d_f2

Modified: projects/mips64-clang/sys/mips/mips/locore.S
==============================================================================
--- projects/mips64-clang/sys/mips/mips/locore.S	Wed Feb 17 22:58:08 2016	(r295726)
+++ projects/mips64-clang/sys/mips/mips/locore.S	Wed Feb 17 22:58:47 2016	(r295727)
@@ -180,7 +180,7 @@ VECTOR(_locore, unknown)
 	PTR_SUBU	sp, a0, CALLFRAME_SIZ
 
 	jal	_C_LABEL(mi_startup)		# mi_startup(frame)
-	sw	zero, CALLFRAME_SIZ - 8(sp)	# Zero out old fp for debugger
+	sw	zero, ((CALLFRAME_SIZ) - 8)(sp) # Zero out old fp for debugger
 
 	PANIC("Startup failed!")