diff options
Diffstat (limited to 'xc/programs/Xserver/hw/xfree86/loader/xf86sym.c')
| -rw-r--r-- | xc/programs/Xserver/hw/xfree86/loader/xf86sym.c | 62 |
1 files changed, 9 insertions, 53 deletions
diff --git a/xc/programs/Xserver/hw/xfree86/loader/xf86sym.c b/xc/programs/Xserver/hw/xfree86/loader/xf86sym.c index df0730da8..227ab0777 100644 --- a/xc/programs/Xserver/hw/xfree86/loader/xf86sym.c +++ b/xc/programs/Xserver/hw/xfree86/loader/xf86sym.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/xf86sym.c,v 1.178 2000/12/08 22:31:52 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/xf86sym.c,v 1.184 2001/02/18 16:41:14 dawes Exp $ */ /* * @@ -22,6 +22,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ +#define COMPILER_H_EXTRAS #include <fcntl.h> #include "sym.h" #include "misc.h" @@ -54,10 +55,7 @@ #include "xf86Priv.h" #include "vbe.h" #include "xf86sbusBus.h" -#ifdef __alpha__ -/* MMIO function prototypes */ #include "compiler.h" -#endif #ifdef __FreeBSD__ /* XXX used in drmOpen(). This should change to use a less os-specific @@ -65,23 +63,6 @@ int sysctlbyname(const char*, void *, size_t *, void *, size_t); #endif -/* XXX Should get all of these from elsewhere */ -#if defined(PowerMAX_OS) || (defined(sun) && defined(SVR4)) -# undef inb -# undef inw -# undef inl -# undef outb -# undef outw -# undef outl - -extern void outb(unsigned int a, unsigned char b); -extern void outw(unsigned int a, unsigned short w); -extern void outl(unsigned int a, unsigned long l); -extern unsigned char inb(unsigned int a); -extern unsigned short inw(unsigned int a); -extern unsigned long inl(unsigned int a); -#endif - #if defined(__alpha__) # ifdef linux extern unsigned long _bus_base(void); @@ -120,16 +101,9 @@ extern long __divsf3(long, long); extern long __moddi3(long, long); extern long __udivdi3(long, long); extern long __umoddi3(long, long); -extern void _outb(char val, unsigned short port); -extern void _outw(short val, unsigned short port); -extern void _outl(int val, unsigned short port); -extern unsigned int _inb(unsigned short port); -extern unsigned int _inw(unsigned short port); -extern unsigned int _inl(unsigned short port); #endif #if defined(__powerpc__) && (defined(Lynx) || defined(linux)) -void eieio(); void _restf14(); void _restf17(); void _restf18(); @@ -171,14 +145,6 @@ extern void outl(unsigned short, unsigned int); extern unsigned int inb(unsigned short); extern unsigned int inw(unsigned short); extern unsigned int inl(unsigned short); -extern unsigned long ldq_u(void *); -extern unsigned long ldl_u(void *); -extern unsigned short ldw_u(void *); -extern void stl_u(unsigned long, void *); -extern void stq_u(unsigned long, void *); -extern void stw_u(unsigned short, void *); -extern void mem_barrier(void); -extern void write_mem_barrier(void); extern void stl_brx(unsigned long, volatile unsigned char *, int); extern void stw_brx(unsigned short, volatile unsigned char *, int); extern unsigned long ldl_brx(volatile unsigned char *, int); @@ -191,11 +157,7 @@ extern int testinx2(unsigned short, unsigned char, unsigned char); extern int testinx(unsigned short, unsigned char); #endif -/* XXX This needs to be cleaned up for the new design */ - -#ifdef DPMSExtension extern void DPMSSet(CARD16); -#endif /* XFree86 things */ @@ -617,9 +579,7 @@ LOOKUP xfree86LookupTab[] = { SYMFUNC(xf86XInputSetSendCoreEvents) /* End merged segment */ #endif -#ifdef DPMSExtension SYMFUNC(DPMSSet) -#endif /* xf86Debug.c */ #ifdef BUILDDEBUG SYMFUNC(xf86Break1) @@ -776,22 +736,18 @@ LOOKUP xfree86LookupTab[] = { SYMFUNC(xf86memchr) SYMFUNC(xf86memcmp) SYMFUNC(xf86memcpy) -#if (defined(__powerpc__) && (defined(Lynx) || defined(linux))) || defined(__sparc__) || defined(__ia64__) /* - * Some PPC, SPARC, and IA64 compilers generate calls to memcpy to handle - * structure copies. This causes a problem both here and in shared - * libraries as there is no way to map the name of the call to the - * correct function. + * Some compilers generate calls to memcpy to handle structure copies + * or run-time initializations. */ - SYMFUNC(memcpy) + SYMFUNCALIAS("memcpy",xf86memcpy) + SYMFUNC(xf86memset) /* - * Some PPC, SPARC, and IA64 compilers generate calls to memset to handle - * aggregate initializations. + * Some compilers generate calls to memset to handle aggregate + * initializations. */ - SYMFUNC(memset) -#endif + SYMFUNCALIAS("memset",xf86memset) SYMFUNC(xf86memmove) - SYMFUNC(xf86memset) SYMFUNC(xf86mmap) SYMFUNC(xf86modf) SYMFUNC(xf86munmap) |