aboutsummaryrefslogtreecommitdiff
path: root/sys/x86
diff options
context:
space:
mode:
authorJohn Baldwin <jhb@FreeBSD.org>2022-04-12 17:05:45 +0000
committerJohn Baldwin <jhb@FreeBSD.org>2022-04-12 17:05:45 +0000
commit56f5947a7102554729e0400f08b0f4d50a2d0827 (patch)
tree29c94b506b2fd875a4414bbf3f374179fb3a34c1 /sys/x86
parent1c1bf5bd7c1e479a7889839b941f53e689aa2569 (diff)
Diffstat (limited to 'sys/x86')
-rw-r--r--sys/x86/include/bus.h42
-rw-r--r--sys/x86/include/x86_ieeefp.h4
-rw-r--r--sys/x86/x86/identcpu.c4
3 files changed, 0 insertions, 50 deletions
diff --git a/sys/x86/include/bus.h b/sys/x86/include/bus.h
index 9522e5db7c78..ccd4ba26e387 100644
--- a/sys/x86/include/bus.h
+++ b/sys/x86/include/bus.h
@@ -103,10 +103,6 @@
#include <machine/cpufunc.h>
#include <machine/bus_dma.h>
-#ifndef __GNUCLIKE_ASM
-#error "no assembler code for your compiler"
-#endif
-
/*
* Values for the x86 bus space tag, not to be used directly by MI code.
*/
@@ -285,7 +281,6 @@ bus_space_read_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh,
if (tag == X86_BUS_SPACE_IO)
insb(bsh + offset, addr, count);
else {
-#ifdef __GNUCLIKE_ASM
__asm __volatile(" \n\
1: movb (%2),%%al \n\
stosb \n\
@@ -293,7 +288,6 @@ 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
}
}
@@ -305,7 +299,6 @@ bus_space_read_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh,
if (tag == X86_BUS_SPACE_IO)
insw(bsh + offset, addr, count);
else {
-#ifdef __GNUCLIKE_ASM
__asm __volatile(" \n\
1: movw (%2),%%ax \n\
stosw \n\
@@ -313,7 +306,6 @@ 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
}
}
@@ -325,7 +317,6 @@ bus_space_read_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh,
if (tag == X86_BUS_SPACE_IO)
insl(bsh + offset, addr, count);
else {
-#ifdef __GNUCLIKE_ASM
__asm __volatile(" \n\
1: movl (%2),%%eax \n\
stosl \n\
@@ -333,7 +324,6 @@ 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
}
}
@@ -368,7 +358,6 @@ bus_space_read_region_1(bus_space_tag_t tag, bus_space_handle_t bsh,
if (tag == X86_BUS_SPACE_IO) {
int _port_ = bsh + offset;
-#ifdef __GNUCLIKE_ASM
__asm __volatile(" \n\
1: inb %w2,%%al \n\
stosb \n\
@@ -377,17 +366,14 @@ 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
} else {
bus_space_handle_t _port_ = bsh + offset;
-#ifdef __GNUCLIKE_ASM
__asm __volatile(" \n\
repne \n\
movsb" :
"=D" (addr), "=c" (count), "=S" (_port_) :
"0" (addr), "1" (count), "2" (_port_) :
"memory", "cc");
-#endif
}
}
@@ -398,7 +384,6 @@ bus_space_read_region_2(bus_space_tag_t tag, bus_space_handle_t bsh,
if (tag == X86_BUS_SPACE_IO) {
int _port_ = bsh + offset;
-#ifdef __GNUCLIKE_ASM
__asm __volatile(" \n\
1: inw %w2,%%ax \n\
stosw \n\
@@ -407,17 +392,14 @@ 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
} else {
bus_space_handle_t _port_ = bsh + offset;
-#ifdef __GNUCLIKE_ASM
__asm __volatile(" \n\
repne \n\
movsw" :
"=D" (addr), "=c" (count), "=S" (_port_) :
"0" (addr), "1" (count), "2" (_port_) :
"memory", "cc");
-#endif
}
}
@@ -428,7 +410,6 @@ bus_space_read_region_4(bus_space_tag_t tag, bus_space_handle_t bsh,
if (tag == X86_BUS_SPACE_IO) {
int _port_ = bsh + offset;
-#ifdef __GNUCLIKE_ASM
__asm __volatile(" \n\
1: inl %w2,%%eax \n\
stosl \n\
@@ -437,17 +418,14 @@ 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
} else {
bus_space_handle_t _port_ = bsh + offset;
-#ifdef __GNUCLIKE_ASM
__asm __volatile(" \n\
repne \n\
movsl" :
"=D" (addr), "=c" (count), "=S" (_port_) :
"0" (addr), "1" (count), "2" (_port_) :
"memory", "cc");
-#endif
}
}
@@ -554,7 +532,6 @@ bus_space_write_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh,
if (tag == X86_BUS_SPACE_IO)
outsb(bsh + offset, addr, count);
else {
-#ifdef __GNUCLIKE_ASM
__asm __volatile(" \n\
1: lodsb \n\
movb %%al,(%2) \n\
@@ -562,7 +539,6 @@ 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
}
}
@@ -574,7 +550,6 @@ bus_space_write_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh,
if (tag == X86_BUS_SPACE_IO)
outsw(bsh + offset, addr, count);
else {
-#ifdef __GNUCLIKE_ASM
__asm __volatile(" \n\
1: lodsw \n\
movw %%ax,(%2) \n\
@@ -582,7 +557,6 @@ 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
}
}
@@ -594,7 +568,6 @@ bus_space_write_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh,
if (tag == X86_BUS_SPACE_IO)
outsl(bsh + offset, addr, count);
else {
-#ifdef __GNUCLIKE_ASM
__asm __volatile(" \n\
1: lodsl \n\
movl %%eax,(%2) \n\
@@ -602,7 +575,6 @@ 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
}
}
@@ -639,7 +611,6 @@ bus_space_write_region_1(bus_space_tag_t tag, bus_space_handle_t bsh,
if (tag == X86_BUS_SPACE_IO) {
int _port_ = bsh + offset;
-#ifdef __GNUCLIKE_ASM
__asm __volatile(" \n\
1: lodsb \n\
outb %%al,%w0 \n\
@@ -648,17 +619,14 @@ 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
} else {
bus_space_handle_t _port_ = bsh + offset;
-#ifdef __GNUCLIKE_ASM
__asm __volatile(" \n\
repne \n\
movsb" :
"=D" (_port_), "=S" (addr), "=c" (count) :
"0" (_port_), "1" (addr), "2" (count) :
"memory", "cc");
-#endif
}
}
@@ -669,7 +637,6 @@ bus_space_write_region_2(bus_space_tag_t tag, bus_space_handle_t bsh,
if (tag == X86_BUS_SPACE_IO) {
int _port_ = bsh + offset;
-#ifdef __GNUCLIKE_ASM
__asm __volatile(" \n\
1: lodsw \n\
outw %%ax,%w0 \n\
@@ -678,17 +645,14 @@ 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
} else {
bus_space_handle_t _port_ = bsh + offset;
-#ifdef __GNUCLIKE_ASM
__asm __volatile(" \n\
repne \n\
movsw" :
"=D" (_port_), "=S" (addr), "=c" (count) :
"0" (_port_), "1" (addr), "2" (count) :
"memory", "cc");
-#endif
}
}
@@ -699,7 +663,6 @@ bus_space_write_region_4(bus_space_tag_t tag, bus_space_handle_t bsh,
if (tag == X86_BUS_SPACE_IO) {
int _port_ = bsh + offset;
-#ifdef __GNUCLIKE_ASM
__asm __volatile(" \n\
1: lodsl \n\
outl %%eax,%w0 \n\
@@ -708,17 +671,14 @@ 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
} else {
bus_space_handle_t _port_ = bsh + offset;
-#ifdef __GNUCLIKE_ASM
__asm __volatile(" \n\
repne \n\
movsl" :
"=D" (_port_), "=S" (addr), "=c" (count) :
"0" (_port_), "1" (addr), "2" (count) :
"memory", "cc");
-#endif
}
}
@@ -1002,7 +962,6 @@ static __inline void
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 __GNUCLIKE_ASM
if (flags & BUS_SPACE_BARRIER_READ)
#ifdef __amd64__
__asm __volatile("lock; addl $0,0(%%rsp)" : : : "memory");
@@ -1011,7 +970,6 @@ bus_space_barrier(bus_space_tag_t tag __unused, bus_space_handle_t bsh __unused,
#endif
else
__compiler_membar();
-#endif
}
#ifdef BUS_SPACE_NO_LEGACY
diff --git a/sys/x86/include/x86_ieeefp.h b/sys/x86/include/x86_ieeefp.h
index 6412a7dfac1d..1bbcd7f01a96 100644
--- a/sys/x86/include/x86_ieeefp.h
+++ b/sys/x86/include/x86_ieeefp.h
@@ -108,8 +108,6 @@ typedef enum {
*/
#define FP_STKY_OFF 0 /* sticky flags offset */
-#ifdef __GNUCLIKE_ASM
-
#define __fldcw(addr) __asm __volatile("fldcw %0" : : "m" (*(addr)))
#define __fldenv(addr) __asm __volatile("fldenv %0" : : "m" (*(addr)))
#define __fnclex() __asm __volatile("fnclex")
@@ -147,6 +145,4 @@ __fnldcw(unsigned short _cw, unsigned short _newcw)
__fldcw(&_newcw);
}
-#endif /* __GNUCLIKE_ASM */
-
#endif/* _X86_X86_IEEEFP_H_ */
diff --git a/sys/x86/x86/identcpu.c b/sys/x86/x86/identcpu.c
index cf75d00683f1..4ccbd3da311f 100644
--- a/sys/x86/x86/identcpu.c
+++ b/sys/x86/x86/identcpu.c
@@ -1202,7 +1202,6 @@ static volatile u_int trap_by_rdmsr;
* be advanced.
*/
inthand_t bluetrap6;
-#ifdef __GNUCLIKE_ASM
__asm
(" \n\
.text \n\
@@ -1214,14 +1213,12 @@ __asm
addl $2, (%esp) /* rdmsr is a 2-byte instruction */ \n\
iret \n\
");
-#endif
/*
* Special exception 13 handler.
* Accessing non-existent MSR generates general protection fault.
*/
inthand_t bluetrap13;
-#ifdef __GNUCLIKE_ASM
__asm
(" \n\
.text \n\
@@ -1234,7 +1231,6 @@ __asm
addl $2, (%esp) /* rdmsr is a 2-byte instruction */ \n\
iret \n\
");
-#endif
/*
* Distinguish IBM Blue Lightning CPU from Cyrix CPUs that does not
generated by cgit v1.3 (git 2.53.0) at 2026-09-05 01:58:44 +0000