diff options
| -rw-r--r-- | hw/xfree86/common/compiler.h | 83 |
1 files changed, 1 insertions, 82 deletions
diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h index fb6668ba0..a330fadf4 100644 --- a/hw/xfree86/common/compiler.h +++ b/hw/xfree86/common/compiler.h @@ -1514,88 +1514,7 @@ inl(unsigned short port) # endif /* ix86 */ -# elif defined(__powerpc__) /* && !__GNUC__ */ -/* - * NON-GCC PowerPC - Presumed to be PowerMAX OS for now - */ -# ifndef PowerMAX_OS -# error - Non-gcc PowerPC and !PowerMAXOS ??? -# endif - -# define PPCIO_DEBUG 0 -# define PPCIO_INLINE 1 -# define USE_ABS_MACRO 1 -/* - * Use compiler intrinsics to access certain PPC machine instructions - */ -# define eieio() __inst_eieio() -# define stw_brx(val,base,ndx) __inst_sthbrx(val,base,ndx) -# define stl_brx(val,base,ndx) __inst_stwbrx(val,base,ndx) -# define ldw_brx(base,ndx) __inst_lhbrx(base,ndx) -# define ldl_brx(base,ndx) __inst_lwbrx(base,ndx) - -# define ldq_u(p) (*((unsigned long long *)(p))) -# define ldl_u(p) (*((unsigned long *)(p))) -# define ldw_u(p) (*((unsigned short *)(p))) -# define stq_u(v,p) (*(unsigned long long *)(p)) = (v) -# define stl_u(v,p) (*(unsigned long *)(p)) = (v) -# define stw_u(v,p) (*(unsigned short *)(p)) = (v) -# define mem_barrier() eieio() -# define write_mem_barrier() eieio() - -extern volatile unsigned char *ioBase; - -# if !defined(abs) && defined(USE_ABS_MACRO) -# define abs(x) ((x) >= 0 ? (x) : -(x)) -# endif - -# undef inb -# undef inw -# undef inl -# undef outb -# undef outw -# undef outl - -# if PPCIO_DEBUG - -extern void debug_outb(unsigned int a, unsigned char b, int line, char *file); -extern void debug_outw(unsigned int a, unsigned short w, int line, char *file); -extern void debug_outl(unsigned int a, unsigned int l, int line, char *file); -extern unsigned char debug_inb(unsigned int a, int line, char *file); -extern unsigned short debug_inw(unsigned int a, int line, char *file); -extern unsigned int debug_inl(unsigned int a, int line, char *file); - -# define outb(a,b) debug_outb(a,b, __LINE__, __FILE__) -# define outw(a,w) debug_outw(a,w, __LINE__, __FILE__) -# define outl(a,l) debug_outl(a,l, __LINE__, __FILE__) -# define inb(a) debug_inb(a, __LINE__, __FILE__) -# define inw(a) debug_inw(a, __LINE__, __FILE__) -# define inl(a) debug_inl(a, __LINE__, __FILE__) - -# else /* !PPCIO_DEBUG */ - -extern unsigned char inb(unsigned int a); -extern unsigned short inw(unsigned int a); -extern unsigned int inl(unsigned int a); - -# if PPCIO_INLINE - -# define outb(a,b) \ - (*((volatile unsigned char *)(ioBase + (a))) = (b), eieio()) -# define outw(a,w) (stw_brx((w),ioBase,(a)), eieio()) -# define outl(a,l) (stl_brx((l),ioBase,(a)), eieio()) - -# else /* !PPCIO_INLINE */ - -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 int l); - -# endif /* PPCIO_INLINE */ - -# endif /* !PPCIO_DEBUG */ - -# else /* !GNUC && !PPC */ +# else /* !GNUC */ # if !defined(QNX4) # if defined(__STDC__) && (__STDC__ == 1) # ifndef asm |