diff options
Diffstat (limited to 'sys/amd64')
| -rw-r--r-- | sys/amd64/include/bus_amd64.h | 76 | ||||
| -rw-r--r-- | sys/amd64/include/bus_at386.h | 76 |
2 files changed, 116 insertions, 36 deletions
diff --git a/sys/amd64/include/bus_amd64.h b/sys/amd64/include/bus_amd64.h index 9e41835..b480e04 100644 --- a/sys/amd64/include/bus_amd64.h +++ b/sys/amd64/include/bus_amd64.h @@ -128,7 +128,8 @@ static __inline void bus_space_unmap(bus_space_tag_t t, bus_space_handle_t bsh, bus_size_t size); static __inline void -bus_space_unmap(bus_space_tag_t t, bus_space_handle_t bsh, bus_size_t size) +bus_space_unmap(bus_space_tag_t t __unused, bus_space_handle_t bsh __unused, + bus_size_t size __unused) { } @@ -142,8 +143,8 @@ static __inline int bus_space_subregion(bus_space_tag_t t, bus_space_handle_t *nbshp); static __inline int -bus_space_subregion(bus_space_tag_t t, bus_space_handle_t bsh, - bus_size_t offset, bus_size_t size, +bus_space_subregion(bus_space_tag_t t __unused, bus_space_handle_t bsh, + bus_size_t offset, bus_size_t size __unused, bus_space_handle_t *nbshp) { @@ -168,7 +169,8 @@ static __inline void bus_space_free(bus_space_tag_t t, bus_space_handle_t bsh, bus_size_t size); static __inline void -bus_space_free(bus_space_tag_t t, bus_space_handle_t bsh, bus_size_t size) +bus_space_free(bus_space_tag_t t __unused, bus_space_handle_t bsh __unused, + bus_size_t size __unused) { } @@ -274,6 +276,7 @@ bus_space_read_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh, else #endif { +#ifdef __GNUC__ __asm __volatile(" \n\ cld \n\ 1: movb (%2),%%al \n\ @@ -282,6 +285,7 @@ bus_space_read_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh, "=D" (addr), "=c" (count) : "r" (bsh + offset), "0" (addr), "1" (count) : "%eax", "memory"); +#endif } #endif } @@ -301,6 +305,7 @@ bus_space_read_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh, else #endif { +#ifdef __GNUC__ __asm __volatile(" \n\ cld \n\ 1: movw (%2),%%ax \n\ @@ -309,6 +314,7 @@ bus_space_read_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh, "=D" (addr), "=c" (count) : "r" (bsh + offset), "0" (addr), "1" (count) : "%eax", "memory"); +#endif } #endif } @@ -328,6 +334,7 @@ bus_space_read_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh, else #endif { +#ifdef __GNUC__ __asm __volatile(" \n\ cld \n\ 1: movl (%2),%%eax \n\ @@ -336,6 +343,7 @@ bus_space_read_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh, "=D" (addr), "=c" (count) : "r" (bsh + offset), "0" (addr), "1" (count) : "%eax", "memory"); +#endif } #endif } @@ -374,7 +382,8 @@ bus_space_read_region_1(bus_space_tag_t tag, bus_space_handle_t bsh, if (tag == I386_BUS_SPACE_IO) #endif { - int _port_ = bsh + offset; \ + int _port_ = bsh + offset; +#ifdef __GNUC__ __asm __volatile(" \n\ cld \n\ 1: inb %w2,%%al \n\ @@ -384,6 +393,7 @@ bus_space_read_region_1(bus_space_tag_t tag, bus_space_handle_t bsh, "=D" (addr), "=c" (count), "=d" (_port_) : "0" (addr), "1" (count), "2" (_port_) : "%eax", "memory", "cc"); +#endif } #endif #if defined(_I386_BUS_MEMIO_H_) @@ -391,7 +401,8 @@ bus_space_read_region_1(bus_space_tag_t tag, bus_space_handle_t bsh, else #endif { - int _port_ = bsh + offset; \ + int _port_ = bsh + offset; +#ifdef __GNUC__ __asm __volatile(" \n\ cld \n\ repne \n\ @@ -399,6 +410,7 @@ bus_space_read_region_1(bus_space_tag_t tag, bus_space_handle_t bsh, "=D" (addr), "=c" (count), "=S" (_port_) : "0" (addr), "1" (count), "2" (_port_) : "memory", "cc"); +#endif } #endif } @@ -412,7 +424,8 @@ bus_space_read_region_2(bus_space_tag_t tag, bus_space_handle_t bsh, if (tag == I386_BUS_SPACE_IO) #endif { - int _port_ = bsh + offset; \ + int _port_ = bsh + offset; +#ifdef __GNUC__ __asm __volatile(" \n\ cld \n\ 1: inw %w2,%%ax \n\ @@ -422,6 +435,7 @@ bus_space_read_region_2(bus_space_tag_t tag, bus_space_handle_t bsh, "=D" (addr), "=c" (count), "=d" (_port_) : "0" (addr), "1" (count), "2" (_port_) : "%eax", "memory", "cc"); +#endif } #endif #if defined(_I386_BUS_MEMIO_H_) @@ -429,7 +443,8 @@ bus_space_read_region_2(bus_space_tag_t tag, bus_space_handle_t bsh, else #endif { - int _port_ = bsh + offset; \ + int _port_ = bsh + offset; +#ifdef __GNUC__ __asm __volatile(" \n\ cld \n\ repne \n\ @@ -437,6 +452,7 @@ bus_space_read_region_2(bus_space_tag_t tag, bus_space_handle_t bsh, "=D" (addr), "=c" (count), "=S" (_port_) : "0" (addr), "1" (count), "2" (_port_) : "memory", "cc"); +#endif } #endif } @@ -450,7 +466,8 @@ bus_space_read_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, if (tag == I386_BUS_SPACE_IO) #endif { - int _port_ = bsh + offset; \ + int _port_ = bsh + offset; +#ifdef __GNUC__ __asm __volatile(" \n\ cld \n\ 1: inl %w2,%%eax \n\ @@ -460,6 +477,7 @@ bus_space_read_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, "=D" (addr), "=c" (count), "=d" (_port_) : "0" (addr), "1" (count), "2" (_port_) : "%eax", "memory", "cc"); +#endif } #endif #if defined(_I386_BUS_MEMIO_H_) @@ -467,7 +485,8 @@ bus_space_read_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, else #endif { - int _port_ = bsh + offset; \ + int _port_ = bsh + offset; +#ifdef __GNUC__ __asm __volatile(" \n\ cld \n\ repne \n\ @@ -475,6 +494,7 @@ bus_space_read_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, "=D" (addr), "=c" (count), "=S" (_port_) : "0" (addr), "1" (count), "2" (_port_) : "memory", "cc"); +#endif } #endif } @@ -595,6 +615,7 @@ bus_space_write_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh, else #endif { +#ifdef __GNUC__ __asm __volatile(" \n\ cld \n\ 1: lodsb \n\ @@ -603,6 +624,7 @@ bus_space_write_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh, "=S" (addr), "=c" (count) : "r" (bsh + offset), "0" (addr), "1" (count) : "%eax", "memory", "cc"); +#endif } #endif } @@ -622,6 +644,7 @@ bus_space_write_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh, else #endif { +#ifdef __GNUC__ __asm __volatile(" \n\ cld \n\ 1: lodsw \n\ @@ -630,6 +653,7 @@ bus_space_write_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh, "=S" (addr), "=c" (count) : "r" (bsh + offset), "0" (addr), "1" (count) : "%eax", "memory", "cc"); +#endif } #endif } @@ -649,6 +673,7 @@ bus_space_write_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh, else #endif { +#ifdef __GNUC__ __asm __volatile(" \n\ cld \n\ 1: lodsl \n\ @@ -657,6 +682,7 @@ bus_space_write_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh, "=S" (addr), "=c" (count) : "r" (bsh + offset), "0" (addr), "1" (count) : "%eax", "memory", "cc"); +#endif } #endif } @@ -696,7 +722,8 @@ bus_space_write_region_1(bus_space_tag_t tag, bus_space_handle_t bsh, if (tag == I386_BUS_SPACE_IO) #endif { - int _port_ = bsh + offset; \ + int _port_ = bsh + offset; +#ifdef __GNUC__ __asm __volatile(" \n\ cld \n\ 1: lodsb \n\ @@ -706,6 +733,7 @@ bus_space_write_region_1(bus_space_tag_t tag, bus_space_handle_t bsh, "=d" (_port_), "=S" (addr), "=c" (count) : "0" (_port_), "1" (addr), "2" (count) : "%eax", "memory", "cc"); +#endif } #endif #if defined(_I386_BUS_MEMIO_H_) @@ -713,7 +741,8 @@ bus_space_write_region_1(bus_space_tag_t tag, bus_space_handle_t bsh, else #endif { - int _port_ = bsh + offset; \ + int _port_ = bsh + offset; +#ifdef __GNUC__ __asm __volatile(" \n\ cld \n\ repne \n\ @@ -721,6 +750,7 @@ bus_space_write_region_1(bus_space_tag_t tag, bus_space_handle_t bsh, "=D" (_port_), "=S" (addr), "=c" (count) : "0" (_port_), "1" (addr), "2" (count) : "memory", "cc"); +#endif } #endif } @@ -734,7 +764,8 @@ bus_space_write_region_2(bus_space_tag_t tag, bus_space_handle_t bsh, if (tag == I386_BUS_SPACE_IO) #endif { - int _port_ = bsh + offset; \ + int _port_ = bsh + offset; +#ifdef __GNUC__ __asm __volatile(" \n\ cld \n\ 1: lodsw \n\ @@ -744,6 +775,7 @@ bus_space_write_region_2(bus_space_tag_t tag, bus_space_handle_t bsh, "=d" (_port_), "=S" (addr), "=c" (count) : "0" (_port_), "1" (addr), "2" (count) : "%eax", "memory", "cc"); +#endif } #endif #if defined(_I386_BUS_MEMIO_H_) @@ -751,7 +783,8 @@ bus_space_write_region_2(bus_space_tag_t tag, bus_space_handle_t bsh, else #endif { - int _port_ = bsh + offset; \ + int _port_ = bsh + offset; +#ifdef __GNUC__ __asm __volatile(" \n\ cld \n\ repne \n\ @@ -759,6 +792,7 @@ bus_space_write_region_2(bus_space_tag_t tag, bus_space_handle_t bsh, "=D" (_port_), "=S" (addr), "=c" (count) : "0" (_port_), "1" (addr), "2" (count) : "memory", "cc"); +#endif } #endif } @@ -772,7 +806,8 @@ bus_space_write_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, if (tag == I386_BUS_SPACE_IO) #endif { - int _port_ = bsh + offset; \ + int _port_ = bsh + offset; +#ifdef __GNUC__ __asm __volatile(" \n\ cld \n\ 1: lodsl \n\ @@ -782,6 +817,7 @@ bus_space_write_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, "=d" (_port_), "=S" (addr), "=c" (count) : "0" (_port_), "1" (addr), "2" (count) : "%eax", "memory", "cc"); +#endif } #endif #if defined(_I386_BUS_MEMIO_H_) @@ -789,7 +825,8 @@ bus_space_write_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, else #endif { - int _port_ = bsh + offset; \ + int _port_ = bsh + offset; +#ifdef __GNUC__ __asm __volatile(" \n\ cld \n\ repne \n\ @@ -797,6 +834,7 @@ bus_space_write_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, "=D" (_port_), "=S" (addr), "=c" (count) : "0" (_port_), "1" (addr), "2" (count) : "memory", "cc"); +#endif } #endif } @@ -1164,13 +1202,15 @@ bus_space_copy_region_4(bus_space_tag_t tag, bus_space_handle_t bsh1, #define BUS_SPACE_BARRIER_WRITE 0x02 /* force write barrier */ static __inline void -bus_space_barrier(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, bus_size_t len, int flags) +bus_space_barrier(bus_space_tag_t tag __unused, bus_space_handle_t bsh __unused, + bus_size_t offset __unused, bus_size_t len __unused, int flags) { +#ifdef __GNUC__ if (flags & BUS_SPACE_BARRIER_READ) __asm __volatile("lock; addl $0,0(%%esp)" : : : "memory"); else __asm __volatile("" : : : "memory"); +#endif } #endif /* _I386_BUS_AT386_H_ */ diff --git a/sys/amd64/include/bus_at386.h b/sys/amd64/include/bus_at386.h index 9e41835..b480e04 100644 --- a/sys/amd64/include/bus_at386.h +++ b/sys/amd64/include/bus_at386.h @@ -128,7 +128,8 @@ static __inline void bus_space_unmap(bus_space_tag_t t, bus_space_handle_t bsh, bus_size_t size); static __inline void -bus_space_unmap(bus_space_tag_t t, bus_space_handle_t bsh, bus_size_t size) +bus_space_unmap(bus_space_tag_t t __unused, bus_space_handle_t bsh __unused, + bus_size_t size __unused) { } @@ -142,8 +143,8 @@ static __inline int bus_space_subregion(bus_space_tag_t t, bus_space_handle_t *nbshp); static __inline int -bus_space_subregion(bus_space_tag_t t, bus_space_handle_t bsh, - bus_size_t offset, bus_size_t size, +bus_space_subregion(bus_space_tag_t t __unused, bus_space_handle_t bsh, + bus_size_t offset, bus_size_t size __unused, bus_space_handle_t *nbshp) { @@ -168,7 +169,8 @@ static __inline void bus_space_free(bus_space_tag_t t, bus_space_handle_t bsh, bus_size_t size); static __inline void -bus_space_free(bus_space_tag_t t, bus_space_handle_t bsh, bus_size_t size) +bus_space_free(bus_space_tag_t t __unused, bus_space_handle_t bsh __unused, + bus_size_t size __unused) { } @@ -274,6 +276,7 @@ bus_space_read_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh, else #endif { +#ifdef __GNUC__ __asm __volatile(" \n\ cld \n\ 1: movb (%2),%%al \n\ @@ -282,6 +285,7 @@ bus_space_read_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh, "=D" (addr), "=c" (count) : "r" (bsh + offset), "0" (addr), "1" (count) : "%eax", "memory"); +#endif } #endif } @@ -301,6 +305,7 @@ bus_space_read_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh, else #endif { +#ifdef __GNUC__ __asm __volatile(" \n\ cld \n\ 1: movw (%2),%%ax \n\ @@ -309,6 +314,7 @@ bus_space_read_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh, "=D" (addr), "=c" (count) : "r" (bsh + offset), "0" (addr), "1" (count) : "%eax", "memory"); +#endif } #endif } @@ -328,6 +334,7 @@ bus_space_read_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh, else #endif { +#ifdef __GNUC__ __asm __volatile(" \n\ cld \n\ 1: movl (%2),%%eax \n\ @@ -336,6 +343,7 @@ bus_space_read_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh, "=D" (addr), "=c" (count) : "r" (bsh + offset), "0" (addr), "1" (count) : "%eax", "memory"); +#endif } #endif } @@ -374,7 +382,8 @@ bus_space_read_region_1(bus_space_tag_t tag, bus_space_handle_t bsh, if (tag == I386_BUS_SPACE_IO) #endif { - int _port_ = bsh + offset; \ + int _port_ = bsh + offset; +#ifdef __GNUC__ __asm __volatile(" \n\ cld \n\ 1: inb %w2,%%al \n\ @@ -384,6 +393,7 @@ bus_space_read_region_1(bus_space_tag_t tag, bus_space_handle_t bsh, "=D" (addr), "=c" (count), "=d" (_port_) : "0" (addr), "1" (count), "2" (_port_) : "%eax", "memory", "cc"); +#endif } #endif #if defined(_I386_BUS_MEMIO_H_) @@ -391,7 +401,8 @@ bus_space_read_region_1(bus_space_tag_t tag, bus_space_handle_t bsh, else #endif { - int _port_ = bsh + offset; \ + int _port_ = bsh + offset; +#ifdef __GNUC__ __asm __volatile(" \n\ cld \n\ repne \n\ @@ -399,6 +410,7 @@ bus_space_read_region_1(bus_space_tag_t tag, bus_space_handle_t bsh, "=D" (addr), "=c" (count), "=S" (_port_) : "0" (addr), "1" (count), "2" (_port_) : "memory", "cc"); +#endif } #endif } @@ -412,7 +424,8 @@ bus_space_read_region_2(bus_space_tag_t tag, bus_space_handle_t bsh, if (tag == I386_BUS_SPACE_IO) #endif { - int _port_ = bsh + offset; \ + int _port_ = bsh + offset; +#ifdef __GNUC__ __asm __volatile(" \n\ cld \n\ 1: inw %w2,%%ax \n\ @@ -422,6 +435,7 @@ bus_space_read_region_2(bus_space_tag_t tag, bus_space_handle_t bsh, "=D" (addr), "=c" (count), "=d" (_port_) : "0" (addr), "1" (count), "2" (_port_) : "%eax", "memory", "cc"); +#endif } #endif #if defined(_I386_BUS_MEMIO_H_) @@ -429,7 +443,8 @@ bus_space_read_region_2(bus_space_tag_t tag, bus_space_handle_t bsh, else #endif { - int _port_ = bsh + offset; \ + int _port_ = bsh + offset; +#ifdef __GNUC__ __asm __volatile(" \n\ cld \n\ repne \n\ @@ -437,6 +452,7 @@ bus_space_read_region_2(bus_space_tag_t tag, bus_space_handle_t bsh, "=D" (addr), "=c" (count), "=S" (_port_) : "0" (addr), "1" (count), "2" (_port_) : "memory", "cc"); +#endif } #endif } @@ -450,7 +466,8 @@ bus_space_read_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, if (tag == I386_BUS_SPACE_IO) #endif { - int _port_ = bsh + offset; \ + int _port_ = bsh + offset; +#ifdef __GNUC__ __asm __volatile(" \n\ cld \n\ 1: inl %w2,%%eax \n\ @@ -460,6 +477,7 @@ bus_space_read_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, "=D" (addr), "=c" (count), "=d" (_port_) : "0" (addr), "1" (count), "2" (_port_) : "%eax", "memory", "cc"); +#endif } #endif #if defined(_I386_BUS_MEMIO_H_) @@ -467,7 +485,8 @@ bus_space_read_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, else #endif { - int _port_ = bsh + offset; \ + int _port_ = bsh + offset; +#ifdef __GNUC__ __asm __volatile(" \n\ cld \n\ repne \n\ @@ -475,6 +494,7 @@ bus_space_read_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, "=D" (addr), "=c" (count), "=S" (_port_) : "0" (addr), "1" (count), "2" (_port_) : "memory", "cc"); +#endif } #endif } @@ -595,6 +615,7 @@ bus_space_write_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh, else #endif { +#ifdef __GNUC__ __asm __volatile(" \n\ cld \n\ 1: lodsb \n\ @@ -603,6 +624,7 @@ bus_space_write_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh, "=S" (addr), "=c" (count) : "r" (bsh + offset), "0" (addr), "1" (count) : "%eax", "memory", "cc"); +#endif } #endif } @@ -622,6 +644,7 @@ bus_space_write_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh, else #endif { +#ifdef __GNUC__ __asm __volatile(" \n\ cld \n\ 1: lodsw \n\ @@ -630,6 +653,7 @@ bus_space_write_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh, "=S" (addr), "=c" (count) : "r" (bsh + offset), "0" (addr), "1" (count) : "%eax", "memory", "cc"); +#endif } #endif } @@ -649,6 +673,7 @@ bus_space_write_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh, else #endif { +#ifdef __GNUC__ __asm __volatile(" \n\ cld \n\ 1: lodsl \n\ @@ -657,6 +682,7 @@ bus_space_write_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh, "=S" (addr), "=c" (count) : "r" (bsh + offset), "0" (addr), "1" (count) : "%eax", "memory", "cc"); +#endif } #endif } @@ -696,7 +722,8 @@ bus_space_write_region_1(bus_space_tag_t tag, bus_space_handle_t bsh, if (tag == I386_BUS_SPACE_IO) #endif { - int _port_ = bsh + offset; \ + int _port_ = bsh + offset; +#ifdef __GNUC__ __asm __volatile(" \n\ cld \n\ 1: lodsb \n\ @@ -706,6 +733,7 @@ bus_space_write_region_1(bus_space_tag_t tag, bus_space_handle_t bsh, "=d" (_port_), "=S" (addr), "=c" (count) : "0" (_port_), "1" (addr), "2" (count) : "%eax", "memory", "cc"); +#endif } #endif #if defined(_I386_BUS_MEMIO_H_) @@ -713,7 +741,8 @@ bus_space_write_region_1(bus_space_tag_t tag, bus_space_handle_t bsh, else #endif { - int _port_ = bsh + offset; \ + int _port_ = bsh + offset; +#ifdef __GNUC__ __asm __volatile(" \n\ cld \n\ repne \n\ @@ -721,6 +750,7 @@ bus_space_write_region_1(bus_space_tag_t tag, bus_space_handle_t bsh, "=D" (_port_), "=S" (addr), "=c" (count) : "0" (_port_), "1" (addr), "2" (count) : "memory", "cc"); +#endif } #endif } @@ -734,7 +764,8 @@ bus_space_write_region_2(bus_space_tag_t tag, bus_space_handle_t bsh, if (tag == I386_BUS_SPACE_IO) #endif { - int _port_ = bsh + offset; \ + int _port_ = bsh + offset; +#ifdef __GNUC__ __asm __volatile(" \n\ cld \n\ 1: lodsw \n\ @@ -744,6 +775,7 @@ bus_space_write_region_2(bus_space_tag_t tag, bus_space_handle_t bsh, "=d" (_port_), "=S" (addr), "=c" (count) : "0" (_port_), "1" (addr), "2" (count) : "%eax", "memory", "cc"); +#endif } #endif #if defined(_I386_BUS_MEMIO_H_) @@ -751,7 +783,8 @@ bus_space_write_region_2(bus_space_tag_t tag, bus_space_handle_t bsh, else #endif { - int _port_ = bsh + offset; \ + int _port_ = bsh + offset; +#ifdef __GNUC__ __asm __volatile(" \n\ cld \n\ repne \n\ @@ -759,6 +792,7 @@ bus_space_write_region_2(bus_space_tag_t tag, bus_space_handle_t bsh, "=D" (_port_), "=S" (addr), "=c" (count) : "0" (_port_), "1" (addr), "2" (count) : "memory", "cc"); +#endif } #endif } @@ -772,7 +806,8 @@ bus_space_write_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, if (tag == I386_BUS_SPACE_IO) #endif { - int _port_ = bsh + offset; \ + int _port_ = bsh + offset; +#ifdef __GNUC__ __asm __volatile(" \n\ cld \n\ 1: lodsl \n\ @@ -782,6 +817,7 @@ bus_space_write_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, "=d" (_port_), "=S" (addr), "=c" (count) : "0" (_port_), "1" (addr), "2" (count) : "%eax", "memory", "cc"); +#endif } #endif #if defined(_I386_BUS_MEMIO_H_) @@ -789,7 +825,8 @@ bus_space_write_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, else #endif { - int _port_ = bsh + offset; \ + int _port_ = bsh + offset; +#ifdef __GNUC__ __asm __volatile(" \n\ cld \n\ repne \n\ @@ -797,6 +834,7 @@ bus_space_write_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, "=D" (_port_), "=S" (addr), "=c" (count) : "0" (_port_), "1" (addr), "2" (count) : "memory", "cc"); +#endif } #endif } @@ -1164,13 +1202,15 @@ bus_space_copy_region_4(bus_space_tag_t tag, bus_space_handle_t bsh1, #define BUS_SPACE_BARRIER_WRITE 0x02 /* force write barrier */ static __inline void -bus_space_barrier(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, bus_size_t len, int flags) +bus_space_barrier(bus_space_tag_t tag __unused, bus_space_handle_t bsh __unused, + bus_size_t offset __unused, bus_size_t len __unused, int flags) { +#ifdef __GNUC__ if (flags & BUS_SPACE_BARRIER_READ) __asm __volatile("lock; addl $0,0(%%esp)" : : : "memory"); else __asm __volatile("" : : : "memory"); +#endif } #endif /* _I386_BUS_AT386_H_ */ |
