Author: attilio
Date: Tue Jul 19 12:41:57 2011
New Revision: 224216
URL: http://svn.freebsd.org/changeset/base/224216
Log:
On 64 bit architectures size_t is 8 bytes, thus it should use an 8 bytes
storage.
Fix the sintrcnt/sintrnames specification.
No MFC is previewed for this patch.
Reported, reviewed and tested by: marcel
Approved by: re (kib)
Modified:
head/sys/ia64/ia64/locore.S
head/sys/mips/mips/exception.S
head/sys/powerpc/aim/locore64.S
head/sys/sparc64/sparc64/exception.S
Modified: head/sys/ia64/ia64/locore.S
==============================================================================
--- head/sys/ia64/ia64/locore.S Tue Jul 19 11:04:58 2011 (r224215)
+++ head/sys/ia64/ia64/locore.S Tue Jul 19 12:41:57 2011 (r224216)
@@ -207,13 +207,13 @@ intr_n = 1
intr_n = intr_n + 1
.endr
EXPORT(sintrnames)
- .word INTRCNT_COUNT * INTRNAME_LEN
+ data8 INTRCNT_COUNT * INTRNAME_LEN
.align 8
EXPORT(intrcnt)
.fill INTRCNT_COUNT, 8, 0
EXPORT(sintrcnt)
- .word INTRCNT_COUNT
+ data8 INTRCNT_COUNT * 8
.text
// in0: image base
Modified: head/sys/mips/mips/exception.S
==============================================================================
--- head/sys/mips/mips/exception.S Tue Jul 19 11:04:58 2011
(r224215)
+++ head/sys/mips/mips/exception.S Tue Jul 19 12:41:57 2011
(r224216)
@@ -1140,13 +1140,21 @@ END(MipsFPTrap)
intrnames:
.space INTRCNT_COUNT * (MAXCOMLEN + 1) * 2
sintrnames:
+#ifdef __mips_n64
+ .quad INTRCNT_COUNT * (MAXCOMLEN + 1) * 2
+#else
.word INTRCNT_COUNT * (MAXCOMLEN + 1) * 2
+#endif
.align 4
intrcnt:
.space INTRCNT_COUNT * 4 * 2
sintrcnt:
+#ifdef __mips_n64
+ .quad INTRCNT_COUNT * 4 * 2
+#else
.word INTRCNT_COUNT * 4 * 2
+#endif
/*
Modified: head/sys/powerpc/aim/locore64.S
==============================================================================
--- head/sys/powerpc/aim/locore64.S Tue Jul 19 11:04:58 2011
(r224215)
+++ head/sys/powerpc/aim/locore64.S Tue Jul 19 12:41:57 2011
(r224216)
@@ -91,13 +91,13 @@ GLOBAL(esym)
GLOBAL(intrnames)
.space INTRCNT_COUNT * (MAXCOMLEN + 1) * 2
GLOBAL(sintrnames)
- .word INTRCNT_COUNT * (MAXCOMLEN + 1) * 2
+ .quad INTRCNT_COUNT * (MAXCOMLEN + 1) * 2
.align 4
GLOBAL(intrcnt)
.space INTRCNT_COUNT * 4 * 2
GLOBAL(sintrcnt)
- .word INTRCNT_COUNT * 4 * 2
+ .quad INTRCNT_COUNT * 4 * 2
.text
.globl btext
Modified: head/sys/sparc64/sparc64/exception.S
==============================================================================
--- head/sys/sparc64/sparc64/exception.S Tue Jul 19 11:04:58 2011
(r224215)
+++ head/sys/sparc64/sparc64/exception.S Tue Jul 19 12:41:57 2011
(r224216)
@@ -375,13 +375,13 @@ END(rsf_fatal)
intrnames:
.space IV_MAX * (MAXCOMLEN + 1)
sintrnames:
- .word IV_MAX * (MAXCOMLEN + 1)
+ .quad IV_MAX * (MAXCOMLEN + 1)
.globl intrcnt, sintrcnt
intrcnt:
.space IV_MAX * 8
sintrcnt:
- .word IV_MAX * 8
+ .quad IV_MAX * 8
.text
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
