The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=f08613087a9756886a1f219b67b0e79a1efd5e8c
commit f08613087a9756886a1f219b67b0e79a1efd5e8c Author: John Baldwin <[email protected]> AuthorDate: 2022-04-12 17:06:09 +0000 Commit: John Baldwin <[email protected]> CommitDate: 2022-04-12 17:06:09 +0000 Remove checks for __CC_SUPPORTS__INLINE assuming it is always true. All supported compilers (modern versions of GCC and clang) support this. PR: 263102 (exp-run) Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D34802 --- sys/amd64/include/cpufunc.h | 69 ------------------------------------------ sys/dev/ce/machdep.h | 6 +--- sys/dev/cp/machdep.h | 6 +--- sys/i386/include/cpufunc.h | 74 --------------------------------------------- 4 files changed, 2 insertions(+), 153 deletions(-) diff --git a/sys/amd64/include/cpufunc.h b/sys/amd64/include/cpufunc.h index f639c9c7119e..d078805d7ced 100644 --- a/sys/amd64/include/cpufunc.h +++ b/sys/amd64/include/cpufunc.h @@ -57,8 +57,6 @@ struct region_descriptor; #define writel(va, d) (*(volatile uint32_t *) (va) = (d)) #define writeq(va, d) (*(volatile uint64_t *) (va) = (d)) -#if defined(__CC_SUPPORTS___INLINE) - static __inline void breakpoint(void) { @@ -964,73 +962,6 @@ sgx_eremove(void *epc) return (sgx_encls(SGX_EREMOVE, 0, (uint64_t)epc, 0)); } -#else /* !__CC_SUPPORTS___INLINE */ - -int breakpoint(void); -u_int bsfl(u_int mask); -u_int bsrl(u_int mask); -void clflush(u_long addr); -void clts(void); -void cpuid_count(u_int ax, u_int cx, u_int *p); -void disable_intr(void); -void do_cpuid(u_int ax, u_int *p); -void enable_intr(void); -void halt(void); -void ia32_pause(void); -u_char inb(u_int port); -u_int inl(u_int port); -void insb(u_int port, void *addr, size_t count); -void insl(u_int port, void *addr, size_t count); -void insw(u_int port, void *addr, size_t count); -register_t intr_disable(void); -void intr_restore(register_t rf); -void invd(void); -void invlpg(u_int addr); -void invltlb(void); -u_short inw(u_int port); -void lidt(struct region_descriptor *addr); -void lldt(u_short sel); -void load_cr0(u_long cr0); -void load_cr3(u_long cr3); -void load_cr4(u_long cr4); -void load_dr0(uint64_t dr0); -void load_dr1(uint64_t dr1); -void load_dr2(uint64_t dr2); -void load_dr3(uint64_t dr3); -void load_dr6(uint64_t dr6); -void load_dr7(uint64_t dr7); -void load_fs(u_short sel); -void load_gs(u_short sel); -void ltr(u_short sel); -void outb(u_int port, u_char data); -void outl(u_int port, u_int data); -void outsb(u_int port, const void *addr, size_t count); -void outsl(u_int port, const void *addr, size_t count); -void outsw(u_int port, const void *addr, size_t count); -void outw(u_int port, u_short data); -u_long rcr0(void); -u_long rcr2(void); -u_long rcr3(void); -u_long rcr4(void); -uint64_t rdmsr(u_int msr); -uint32_t rdmsr32(u_int msr); -uint64_t rdpmc(u_int pmc); -uint64_t rdr0(void); -uint64_t rdr1(void); -uint64_t rdr2(void); -uint64_t rdr3(void); -uint64_t rdr6(void); -uint64_t rdr7(void); -uint64_t rdtsc(void); -u_long read_rflags(void); -u_int rfs(void); -u_int rgs(void); -void wbinvd(void); -void write_rflags(u_int rf); -void wrmsr(u_int msr, uint64_t newval); - -#endif /* __CC_SUPPORTS___INLINE */ - void reset_dbregs(void); #ifdef _KERNEL diff --git a/sys/dev/ce/machdep.h b/sys/dev/ce/machdep.h index f715122ae490..2f8dbfa816d7 100644 --- a/sys/dev/ce/machdep.h +++ b/sys/dev/ce/machdep.h @@ -81,11 +81,7 @@ #endif #ifndef inline -# ifdef __CC_SUPPORTS___INLINE__ -# define inline __inline__ -# else -# define inline /**/ -# endif +# define inline __inline__ #endif #ifndef ulong64 diff --git a/sys/dev/cp/machdep.h b/sys/dev/cp/machdep.h index f715122ae490..2f8dbfa816d7 100644 --- a/sys/dev/cp/machdep.h +++ b/sys/dev/cp/machdep.h @@ -81,11 +81,7 @@ #endif #ifndef inline -# ifdef __CC_SUPPORTS___INLINE__ -# define inline __inline__ -# else -# define inline /**/ -# endif +# define inline __inline__ #endif #ifndef ulong64 diff --git a/sys/i386/include/cpufunc.h b/sys/i386/include/cpufunc.h index 59ee9331cf9f..59eb3cc982b3 100644 --- a/sys/i386/include/cpufunc.h +++ b/sys/i386/include/cpufunc.h @@ -54,8 +54,6 @@ struct region_descriptor; #define writew(va, d) (*(volatile uint16_t *) (va) = (d)) #define writel(va, d) (*(volatile uint32_t *) (va) = (d)) -#if defined(__CC_SUPPORTS___INLINE) - static __inline void breakpoint(void) { @@ -774,78 +772,6 @@ wrpkru(uint32_t mask) __asm __volatile("wrpkru" : : "a" (mask), "c" (0), "d" (0)); } -#else /* !__CC_SUPPORTS___INLINE */ - -int breakpoint(void); -u_int bsfl(u_int mask); -u_int bsrl(u_int mask); -void clflush(u_long addr); -void clts(void); -void cpuid_count(u_int ax, u_int cx, u_int *p); -void disable_intr(void); -void do_cpuid(u_int ax, u_int *p); -void enable_intr(void); -void halt(void); -void ia32_pause(void); -u_char inb(u_int port); -u_int inl(u_int port); -void insb(u_int port, void *addr, size_t count); -void insl(u_int port, void *addr, size_t count); -void insw(u_int port, void *addr, size_t count); -register_t intr_disable(void); -void intr_restore(register_t ef); -void invd(void); -void invlpg(u_int addr); -void invltlb(void); -u_short inw(u_int port); -void lidt(struct region_descriptor *addr); -void lldt(u_short sel); -void load_cr0(u_int cr0); -void load_cr3(u_int cr3); -void load_cr4(u_int cr4); -void load_dr0(u_int dr0); -void load_dr1(u_int dr1); -void load_dr2(u_int dr2); -void load_dr3(u_int dr3); -void load_dr6(u_int dr6); -void load_dr7(u_int dr7); -void load_fs(u_short sel); -void load_gs(u_short sel); -void ltr(u_short sel); -void outb(u_int port, u_char data); -void outl(u_int port, u_int data); -void outsb(u_int port, const void *addr, size_t count); -void outsl(u_int port, const void *addr, size_t count); -void outsw(u_int port, const void *addr, size_t count); -void outw(u_int port, u_short data); -u_int rcr0(void); -u_int rcr2(void); -u_int rcr3(void); -u_int rcr4(void); -uint64_t rdmsr(u_int msr); -uint64_t rdpmc(u_int pmc); -u_int rdr0(void); -u_int rdr1(void); -u_int rdr2(void); -u_int rdr3(void); -u_int rdr6(void); -u_int rdr7(void); -uint64_t rdtsc(void); -u_char read_cyrix_reg(u_char reg); -u_int read_eflags(void); -u_int rfs(void); -uint64_t rgdt(void); -u_int rgs(void); -uint64_t ridt(void); -u_short rldt(void); -u_short rtr(void); -void wbinvd(void); -void write_cyrix_reg(u_char reg, u_char data); -void write_eflags(u_int ef); -void wrmsr(u_int msr, uint64_t newval); - -#endif /* __CC_SUPPORTS___INLINE */ - void reset_dbregs(void); #ifdef _KERNEL
