andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xfree86: Remove unused unaligned int64 helpers

Browse Source 
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Adam Jackson 2014-07-22 10:58:58 -04:00 committed by Keith Packard
parent da2b267186
commit 956a8d5c92
1 changed files with 1 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
hw/xfree86/common/compiler.h
View File

@ -141,10 +141,8 @@ extern _X_EXPORT void xf86WriteMmio32LeNB (void *, unsigned long, unsigned int);
#endif /* __arm__ */
#if defined(__powerpc__) && !defined(__OpenBSD__)
extern unsigned long ldq_u(unsigned long *);
extern unsigned long ldl_u(unsigned int *);
extern unsigned long ldw_u(unsigned short *);
extern void stq_u(unsigned long, unsigned long *);
extern void stl_u(unsigned long, unsigned int *);
extern void stw_u(unsigned long, unsigned short *);
extern void mem_barrier(void);
@ -240,15 +238,6 @@ extern unsigned short ldw_brx(volatile unsigned char *, int);
#include <string.h> /* needed for memmove */
static __inline__ uint64_t
ldq_u(uint64_t * p)
{
uint64_t ret;
memmove(&ret, p, sizeof(*p));
return ret;
}
static __inline__ uint32_t
ldl_u(uint32_t * p)
{
@ -267,14 +256,6 @@ ldw_u(uint16_t * p)
return ret;
}
static __inline__ void
stq_u(uint64_t val, uint64_t * p)
{
uint64_t tmp = val;
memmove(p, &tmp, sizeof(*p));
}
static __inline__ void
stl_u(uint32_t val, uint32_t * p)
{
@ -956,7 +937,7 @@ xf_outl(unsigned short port, unsigned int val)
/*
* Assume all port access are aligned. We need to revise this implementation
* if there is unaligned port access. For ldq_u, ldl_u, ldw_u, stq_u, stl_u and
* if there is unaligned port access. For ldl_u, ldw_u, stl_u and
* stw_u, they are assumed unaligned.
*/
@ -1133,19 +1114,6 @@ inl(unsigned PORT_SIZE port)
return xf86ReadMmio32Swap(IOPortBase, port);
}
static __inline__ unsigned long
ldq_u(unsigned long *p)
{
unsigned long addr = (unsigned long) p;
unsigned int ret;
__asm__ __volatile__("lmw.bi %0, [%1], %0, 0;\n\t"
"wsbh %0, %0;\n\t" "rotri %0, %0, 16;\n\t":"=r"(ret)
:"r"(addr));
return ret;
}
static __inline__ unsigned long
ldl_u(unsigned int *p)
{
@ -1159,15 +1127,6 @@ ldl_u(unsigned int *p)
return ret;
}
static __inline__ void
stq_u(unsigned long val, unsigned long *p)
{
unsigned long addr = (unsigned long) p;
__asm__ __volatile__("wsbh %0, %0;\n\t" "rotri %0, %0, 16;\n\t" "smw.bi %0, [%1], %0, 0;\n\t": /* No outputs */
:"r"(val), "r"(addr));
}
static __inline__ void
stl_u(unsigned long val, unsigned int *p)
{
@ -1217,18 +1176,6 @@ inl(unsigned PORT_SIZE port)
return *(volatile unsigned int *) (((unsigned PORT_SIZE) (port)));
}
static __inline__ unsigned long
ldq_u(unsigned long *p)
{
unsigned long addr = (unsigned long) p;
unsigned int ret;
__asm__ __volatile__("lmw.bi %0, [%1], %0, 0;\n\t":"=r"(ret)
:"r"(addr));
return ret;
}
static __inline__ unsigned long
ldl_u(unsigned int *p)
{
@ -1241,15 +1188,6 @@ ldl_u(unsigned int *p)
return ret;
}
static __inline__ void
stq_u(unsigned long val, unsigned long *p)
{
unsigned long addr = (unsigned long) p;
__asm__ __volatile__("smw.bi %0, [%1], %0, 0;\n\t": /* No outputs */
:"r"(val), "r"(addr));
}
static __inline__ void
stl_u(unsigned long val, unsigned int *p)
{