Module Name: src
Committed By: uebayasi
Date: Sat Jun 22 05:20:57 UTC 2013
Modified Files:
src/sys/arch/amd64/amd64: busfunc.S
src/sys/arch/i386/i386: busfunc.S
Log Message:
Use END() to set ELF symbol size.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/amd64/amd64/busfunc.S
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/i386/i386/busfunc.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/amd64/busfunc.S
diff -u src/sys/arch/amd64/amd64/busfunc.S:1.10 src/sys/arch/amd64/amd64/busfunc.S:1.11
--- src/sys/arch/amd64/amd64/busfunc.S:1.10 Fri May 20 13:33:11 2011
+++ src/sys/arch/amd64/amd64/busfunc.S Sat Jun 22 05:20:57 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: busfunc.S,v 1.10 2011/05/20 13:33:11 joerg Exp $ */
+/* $NetBSD: busfunc.S,v 1.11 2013/06/22 05:20:57 uebayasi Exp $ */
/*-
* Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
@@ -52,6 +52,7 @@ ENTRY(bus_space_read_1)
xorl %eax, %eax
inb %dx, %al
ret
+END(bus_space_read_1)
/*
* uint16_t bus_space_read_2(bus_space_tag_t tag, bus_space_handle_t bsh,
@@ -67,6 +68,7 @@ ENTRY(bus_space_read_2)
xorl %eax, %eax
inw %dx, %ax
ret
+END(bus_space_read_2)
/*
* uint32_t bus_space_read_4(bus_space_tag_t tag, bus_space_handle_t bsh,
@@ -81,6 +83,7 @@ ENTRY(bus_space_read_4)
1:
inl %dx, %eax
ret
+END(bus_space_read_4)
/*
* uint64_t bus_space_read_8(bus_space_tag_t tag, bus_space_handle_t bsh,
@@ -92,6 +95,7 @@ ENTRY(bus_space_read_8)
je .Ldopanic
movq (%rdx), %rax
ret
+END(bus_space_read_8)
STRONG_ALIAS(bus_space_read_stream_1,bus_space_read_1)
STRONG_ALIAS(bus_space_read_stream_2,bus_space_read_2)
@@ -112,6 +116,7 @@ ENTRY(bus_space_write_1)
movl %ecx, %eax
outb %al, %dx
ret
+END(bus_space_write_1)
/*
* void bus_space_write_2(bus_space_tag_t tag, bus_space_handle_t bsh,
@@ -127,6 +132,7 @@ ENTRY(bus_space_write_2)
movl %ecx, %eax
outw %ax, %dx
ret
+END(bus_space_write_2)
/*
* void bus_space_write_4(bus_space_tag_t tag, bus_space_handle_t bsh,
@@ -142,6 +148,7 @@ ENTRY(bus_space_write_4)
movl %ecx, %eax
outl %eax, %dx
ret
+END(bus_space_write_4)
/*
* void bus_space_write_8(bus_space_tag_t tag, bus_space_handle_t bsh,
@@ -153,6 +160,7 @@ ENTRY(bus_space_write_8)
je .Ldopanic
movq %rcx, (%rdx)
ret
+END(bus_space_write_8)
STRONG_ALIAS(bus_space_write_stream_1,bus_space_write_1)
STRONG_ALIAS(bus_space_write_stream_2,bus_space_write_2)
@@ -180,6 +188,7 @@ ENTRY(bus_space_read_multi_1)
decq %r8
jnz 1b
ret
+END(bus_space_read_multi_1)
/*
* void bus_space_read_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh,
@@ -202,6 +211,7 @@ ENTRY(bus_space_read_multi_2)
decq %r8
jnz 1b
ret
+END(bus_space_read_multi_2)
/*
* void bus_space_read_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh,
@@ -224,6 +234,7 @@ ENTRY(bus_space_read_multi_4)
decq %r8
jnz 1b
ret
+END(bus_space_read_multi_4)
/*
* void bus_space_read_multi_8(bus_space_tag_t tag, bus_space_handle_t bsh,
@@ -241,6 +252,7 @@ ENTRY(bus_space_read_multi_8)
decq %r8
jnz 1b
ret
+END(bus_space_read_multi_8)
STRONG_ALIAS(bus_space_read_multi_stream_1,bus_space_read_multi_1)
STRONG_ALIAS(bus_space_read_multi_stream_2,bus_space_read_multi_2)
@@ -268,6 +280,7 @@ ENTRY(bus_space_write_multi_1)
decq %r8
jnz 1b
ret
+END(bus_space_write_multi_1)
/*
* void bus_space_write_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh,
@@ -290,6 +303,7 @@ ENTRY(bus_space_write_multi_2)
decq %r8
jnz 1b
ret
+END(bus_space_write_multi_2)
/*
* void bus_space_write_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh,
@@ -312,6 +326,7 @@ ENTRY(bus_space_write_multi_4)
decq %r8
jnz 1b
ret
+END(bus_space_write_multi_4)
/*
* void bus_space_write_multi_8(bus_space_tag_t tag, bus_space_handle_t bsh,
@@ -329,6 +344,7 @@ ENTRY(bus_space_write_multi_8)
decq %r8
jnz 1b
ret
+END(bus_space_write_multi_8)
STRONG_ALIAS(bus_space_write_multi_stream_1,bus_space_write_multi_1)
STRONG_ALIAS(bus_space_write_multi_stream_2,bus_space_write_multi_2)
@@ -358,6 +374,7 @@ ENTRY(bus_space_read_region_1)
leaq 1(%rcx), %rcx
jnz 3b
ret
+END(bus_space_read_region_1)
/*
* void bus_space_read_region_2(bus_space_tag_t tag, bus_space_handle_t bsh,
@@ -382,6 +399,7 @@ ENTRY(bus_space_read_region_2)
leaq 2(%rcx), %rcx
jnz 3b
ret
+END(bus_space_read_region_2)
/*
* void bus_space_read_region_4(bus_space_tag_t tag, bus_space_handle_t bsh,
@@ -406,6 +424,7 @@ ENTRY(bus_space_read_region_4)
leaq 4(%rcx), %rcx
jnz 3b
ret
+END(bus_space_read_region_4)
/*
* void bus_space_read_region_8(bus_space_tag_t tag, bus_space_handle_t bsh,
@@ -420,6 +439,7 @@ ENTRY(bus_space_read_region_8)
rep
movsq %ds:(%rsi), %es:(%rdi)
ret
+END(bus_space_read_region_8)
STRONG_ALIAS(bus_space_read_region_stream_1,bus_space_read_region_1)
STRONG_ALIAS(bus_space_read_region_stream_2,bus_space_read_region_2)
@@ -449,6 +469,7 @@ ENTRY(bus_space_write_region_1)
leaq 1(%rdx), %rdx
jnz 3b
ret
+END(bus_space_write_region_1)
/*
* void bus_space_write_region_2(bus_space_tag_t tag, bus_space_handle_t bsh,
@@ -473,6 +494,7 @@ ENTRY(bus_space_write_region_2)
leaq 2(%rdx), %rdx
jnz 3b
ret
+END(bus_space_write_region_2)
/*
* void bus_space_write_region_4(bus_space_tag_t tag, bus_space_handle_t bsh,
@@ -497,6 +519,7 @@ ENTRY(bus_space_write_region_4)
leaq 4(%rdx), %rdx
jnz 3b
ret
+END(bus_space_write_region_4)
/*
* void bus_space_write_region_8(bus_space_tag_t tag, bus_space_handle_t bsh,
@@ -511,6 +534,7 @@ ENTRY(bus_space_write_region_8)
rep
movsq %ds:(%rsi), %es:(%rdi)
ret
+END(bus_space_write_region_8)
STRONG_ALIAS(bus_space_write_region_stream_1,bus_space_write_region_1)
STRONG_ALIAS(bus_space_write_region_stream_2,bus_space_write_region_2)
Index: src/sys/arch/i386/i386/busfunc.S
diff -u src/sys/arch/i386/i386/busfunc.S:1.8 src/sys/arch/i386/i386/busfunc.S:1.9
--- src/sys/arch/i386/i386/busfunc.S:1.8 Fri May 20 13:17:12 2011
+++ src/sys/arch/i386/i386/busfunc.S Sat Jun 22 05:20:57 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: busfunc.S,v 1.8 2011/05/20 13:17:12 joerg Exp $ */
+/* $NetBSD: busfunc.S,v 1.9 2013/06/22 05:20:57 uebayasi Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: busfunc.S,v 1.8 2011/05/20 13:17:12 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: busfunc.S,v 1.9 2013/06/22 05:20:57 uebayasi Exp $");
#include "assym.h"
@@ -50,6 +50,7 @@ ENTRY(bus_space_read_1)
xorl %eax, %eax
inb %dx, %al
ret
+END(bus_space_read_1)
/*
* uint16_t bus_space_read_2(bus_space_tag_t tag, bus_space_handle_t bsh,
@@ -67,6 +68,7 @@ ENTRY(bus_space_read_2)
xorl %eax, %eax
inw %dx, %ax
ret
+END(bus_space_read_2)
/*
* uint32_t bus_space_read_4(bus_space_tag_t tag, bus_space_handle_t bsh,
@@ -83,6 +85,7 @@ ENTRY(bus_space_read_4)
1:
inl %dx, %eax
ret
+END(bus_space_read_4)
STRONG_ALIAS(bus_space_read_stream_1,bus_space_read_1)
STRONG_ALIAS(bus_space_read_stream_2,bus_space_read_2)
@@ -104,6 +107,7 @@ ENTRY(bus_space_write_1)
1:
outb %al, %dx
ret
+END(bus_space_write_1)
/*
* void bus_space_write_2(bus_space_tag_t tag, bus_space_handle_t bsh,
@@ -121,6 +125,7 @@ ENTRY(bus_space_write_2)
1:
outw %ax, %dx
ret
+END(bus_space_write_2)
/*
* void bus_space_write_4(bus_space_tag_t tag, bus_space_handle_t bsh,
@@ -138,6 +143,7 @@ ENTRY(bus_space_write_4)
1:
outl %eax, %dx
ret
+END(bus_space_write_4)
STRONG_ALIAS(bus_space_write_stream_1,bus_space_write_1)
STRONG_ALIAS(bus_space_write_stream_2,bus_space_write_2)
@@ -169,6 +175,7 @@ ENTRY(bus_space_read_multi_1)
jnz 1b
popl %edi
ret
+END(bus_space_read_multi_1)
/*
* void bus_space_read_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh,
@@ -196,6 +203,7 @@ ENTRY(bus_space_read_multi_2)
jnz 1b
popl %edi
ret
+END(bus_space_read_multi_2)
/*
* void bus_space_read_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh,
@@ -223,6 +231,7 @@ ENTRY(bus_space_read_multi_4)
jnz 1b
popl %edi
ret
+END(bus_space_read_multi_4)
STRONG_ALIAS(bus_space_read_multi_stream_1,bus_space_read_multi_1)
STRONG_ALIAS(bus_space_read_multi_stream_2,bus_space_read_multi_2)
@@ -254,6 +263,7 @@ ENTRY(bus_space_write_multi_1)
jnz 1b
popl %esi
ret
+END(bus_space_write_multi_1)
/*
* void bus_space_write_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh,
@@ -281,6 +291,7 @@ ENTRY(bus_space_write_multi_2)
jnz 1b
popl %esi
ret
+END(bus_space_write_multi_2)
/*
* void bus_space_write_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh,
@@ -308,6 +319,7 @@ ENTRY(bus_space_write_multi_4)
jnz 1b
popl %esi
ret
+END(bus_space_write_multi_4)
STRONG_ALIAS(bus_space_write_multi_stream_1,bus_space_write_multi_1)
STRONG_ALIAS(bus_space_write_multi_stream_2,bus_space_write_multi_2)
@@ -342,6 +354,7 @@ ENTRY(bus_space_read_region_1)
jnz 2b
popl %edi
ret
+END(bus_space_read_region_1)
/*
* void bus_space_read_region_2(bus_space_tag_t tag, bus_space_handle_t bsh,
@@ -372,6 +385,7 @@ ENTRY(bus_space_read_region_2)
jnz 2b
popl %edi
ret
+END(bus_space_read_region_2)
/*
* void bus_space_read_region_4(bus_space_tag_t tag, bus_space_handle_t bsh,
@@ -402,6 +416,7 @@ ENTRY(bus_space_read_region_4)
jnz 2b
popl %edi
ret
+END(bus_space_read_region_4)
STRONG_ALIAS(bus_space_read_region_stream_1,bus_space_read_region_1)
STRONG_ALIAS(bus_space_read_region_stream_2,bus_space_read_region_2)
@@ -436,6 +451,7 @@ ENTRY(bus_space_write_region_1)
jnz 2b
popl %esi
ret
+END(bus_space_write_region_1)
/*
* void bus_space_write_region_2(bus_space_tag_t tag, bus_space_handle_t bsh,
@@ -466,6 +482,7 @@ ENTRY(bus_space_write_region_2)
jnz 2b
popl %esi
ret
+END(bus_space_write_region_2)
/*
* void bus_space_write_region_4(bus_space_tag_t tag, bus_space_handle_t bsh,
@@ -496,6 +513,7 @@ ENTRY(bus_space_write_region_4)
jnz 2b
popl %esi
ret
+END(bus_space_write_region_4)
STRONG_ALIAS(bus_space_write_region_stream_1,bus_space_write_region_1)
STRONG_ALIAS(bus_space_write_region_stream_2,bus_space_write_region_2)
