[PATCH] Revert "Make sys.c use compiler.h unaligned access functions"
Peter Hutterer
peter.hutterer at who-t.net
Thu Sep 10 22:31:49 PDT 2009
On Thu, Sep 10, 2009 at 08:56:18PM +0300, Tiago Vignatti wrote:
> This reverts commit 1b30545c04a51bfa3ff95a26d64962907a62ff15.
>
> Signed-off-by: Tiago Vignatti <tiago.vignatti at nokia.com>
> ---
>
> Matt, this patch breaks my ARM compilation (inside scratchbox) generating an
> error like this:
>
> make[5]: Entering directory `/home/tiago/rebase/xserver/obj-arm-linux-gnueabi/hw/xfree86/x86emu'
> CC sys.o
> ../../../../hw/xfree86/x86emu/sys.c: In function `X86EMU_setupPioFuncs':
> ../../../../hw/xfree86/x86emu/sys.c:374: error: structure has no member named `xf_outb'
> ../../../../hw/xfree86/x86emu/sys.c:375: error: structure has no member named `xf_outw'
> ../../../../hw/xfree86/x86emu/sys.c:376: error: structure has no member named `xf_outl'
> make[5]: *** [sys.lo] Error 1
> make[5]: Leaving directory `/home/tiago/rebase/xserver/obj-arm-linux-gnueabi/hw/xfree86/x86emu'
> make[4]: *** [all-recursive] Error 1
> make[4]: Leaving directory `/home/tiago/rebase/xserver/obj-arm-linux-gnueabi/hw/xfree86'
> make[3]: *** [all] Error 2
> make[3]: Leaving directory `/home/tiago/rebase/xserver/obj-arm-linux-gnueabi/hw/xfree86'
> make[2]: *** [all-recursive] Error 1
> make[2]: Leaving directory `/home/tiago/rebase/xserver/obj-arm-linux-gnueabi/hw'
> make[1]: *** [all-recursive] Error 1
> make[1]: Leaving directory `/home/tiago/rebase/xserver/obj-arm-linux-gnueabi'
> make: *** [build-stamp] Error 2
>
>
> hw/xfree86/x86emu/sys.c | 183 ++++++++++++++++++++++++++++++++++++++++++++++-
> 1 files changed, 182 insertions(+), 1 deletions(-)
>
> diff --git a/hw/xfree86/x86emu/sys.c b/hw/xfree86/x86emu/sys.c
> index 34d29db..e15fb09 100644
> --- a/hw/xfree86/x86emu/sys.c
> +++ b/hw/xfree86/x86emu/sys.c
> @@ -45,7 +45,6 @@
> #include "x86emu/regs.h"
> #include "x86emu/debug.h"
> #include "x86emu/prim_ops.h"
> -#include "../common/compiler.h"
> #ifndef NO_SYS_HEADERS
> #include <string.h>
> #endif
> @@ -54,6 +53,164 @@
> X86EMU_sysEnv _X86EMU_env; /* Global emulator machine state */
> X86EMU_intrFuncs _X86EMU_intrTab[256];
>
> +/*----------------------------- Implementation ----------------------------*/
> +#if defined(__alpha__) || defined(__alpha)
> +/* to cope with broken egcs-1.1.2 :-(((( */
> +
> +#define ALPHA_UALOADS
> +/*
> + * inline functions to do unaligned accesses
> + * from linux/include/asm-alpha/unaligned.h
> + */
> +
> +/*
> + * EGCS 1.1 knows about arbitrary unaligned loads. Define some
> + * packed structures to talk about such things with.
> + */
> +
> +#if defined(__GNUC__)
> +struct __una_u64 { unsigned long x __attribute__((packed)); };
> +struct __una_u32 { unsigned int x __attribute__((packed)); };
> +struct __una_u16 { unsigned short x __attribute__((packed)); };
> +#endif
> +
> +static __inline__ unsigned long ldq_u(unsigned long * r11)
> +{
> +#if defined(__GNUC__)
> + const struct __una_u64 *ptr = (const struct __una_u64 *) r11;
> + return ptr->x;
> +#else
> + unsigned long r1,r2;
> + __asm__("ldq_u %0,%3\n\t"
> + "ldq_u %1,%4\n\t"
> + "extql %0,%2,%0\n\t"
> + "extqh %1,%2,%1"
> + :"=&r" (r1), "=&r" (r2)
> + :"r" (r11),
> + "m" (*r11),
> + "m" (*(const unsigned long *)(7+(char *) r11)));
> + return r1 | r2;
> +#endif
> +}
> +
> +static __inline__ unsigned long ldl_u(unsigned int * r11)
> +{
> +#if defined(__GNUC__)
> + const struct __una_u32 *ptr = (const struct __una_u32 *) r11;
> + return ptr->x;
> +#else
> + unsigned long r1,r2;
> + __asm__("ldq_u %0,%3\n\t"
> + "ldq_u %1,%4\n\t"
> + "extll %0,%2,%0\n\t"
> + "extlh %1,%2,%1"
> + :"=&r" (r1), "=&r" (r2)
> + :"r" (r11),
> + "m" (*r11),
> + "m" (*(const unsigned long *)(3+(char *) r11)));
> + return r1 | r2;
> +#endif
> +}
> +
> +static __inline__ unsigned long ldw_u(unsigned short * r11)
> +{
> +#if defined(__GNUC__)
> + const struct __una_u16 *ptr = (const struct __una_u16 *) r11;
> + return ptr->x;
> +#else
> + unsigned long r1,r2;
> + __asm__("ldq_u %0,%3\n\t"
> + "ldq_u %1,%4\n\t"
> + "extwl %0,%2,%0\n\t"
> + "extwh %1,%2,%1"
> + :"=&r" (r1), "=&r" (r2)
> + :"r" (r11),
> + "m" (*r11),
> + "m" (*(const unsigned long *)(1+(char *) r11)));
> + return r1 | r2;
> +#endif
> +}
> +
> +/*
> + * Elemental unaligned stores
> + */
> +
> +static __inline__ void stq_u(unsigned long r5, unsigned long * r11)
> +{
> +#if defined(__GNUC__)
> + struct __una_u64 *ptr = (struct __una_u64 *) r11;
> + ptr->x = r5;
> +#else
> + unsigned long r1,r2,r3,r4;
> +
> + __asm__("ldq_u %3,%1\n\t"
> + "ldq_u %2,%0\n\t"
> + "insqh %6,%7,%5\n\t"
> + "insql %6,%7,%4\n\t"
> + "mskqh %3,%7,%3\n\t"
> + "mskql %2,%7,%2\n\t"
> + "bis %3,%5,%3\n\t"
> + "bis %2,%4,%2\n\t"
> + "stq_u %3,%1\n\t"
> + "stq_u %2,%0"
> + :"=m" (*r11),
> + "=m" (*(unsigned long *)(7+(char *) r11)),
> + "=&r" (r1), "=&r" (r2), "=&r" (r3), "=&r" (r4)
> + :"r" (r5), "r" (r11));
> +#endif
> +}
> +
> +static __inline__ void stl_u(unsigned long r5, unsigned int * r11)
> +{
> +#if defined(__GNUC__)
> + struct __una_u32 *ptr = (struct __una_u32 *) r11;
> + ptr->x = r5;
> +#else
> + unsigned long r1,r2,r3,r4;
> +
> + __asm__("ldq_u %3,%1\n\t"
> + "ldq_u %2,%0\n\t"
> + "inslh %6,%7,%5\n\t"
> + "insll %6,%7,%4\n\t"
> + "msklh %3,%7,%3\n\t"
> + "mskll %2,%7,%2\n\t"
> + "bis %3,%5,%3\n\t"
> + "bis %2,%4,%2\n\t"
> + "stq_u %3,%1\n\t"
> + "stq_u %2,%0"
> + :"=m" (*r11),
> + "=m" (*(unsigned long *)(3+(char *) r11)),
> + "=&r" (r1), "=&r" (r2), "=&r" (r3), "=&r" (r4)
> + :"r" (r5), "r" (r11));
> +#endif
> +}
> +
> +static __inline__ void stw_u(unsigned long r5, unsigned short * r11)
> +{
> +#if defined(__GNUC__)
> + struct __una_u16 *ptr = (struct __una_u16 *) r11;
> + ptr->x = r5;
> +#else
> + unsigned long r1,r2,r3,r4;
> +
> + __asm__("ldq_u %3,%1\n\t"
> + "ldq_u %2,%0\n\t"
> + "inswh %6,%7,%5\n\t"
> + "inswl %6,%7,%4\n\t"
> + "mskwh %3,%7,%3\n\t"
> + "mskwl %2,%7,%2\n\t"
> + "bis %3,%5,%3\n\t"
> + "bis %2,%4,%2\n\t"
> + "stq_u %3,%1\n\t"
> + "stq_u %2,%0"
> + :"=m" (*r11),
> + "=m" (*(unsigned long *)(1+(char *) r11)),
> + "=&r" (r1), "=&r" (r2), "=&r" (r3), "=&r" (r4)
> + :"r" (r5), "r" (r11));
> +#endif
> +}
> +#endif
> +
> /****************************************************************************
> PARAMETERS:
> addr - Emulator memory address to read
> @@ -105,7 +262,13 @@ u16 X86API rdw(
> }
> else
> #endif
> +#if defined(ALPHA_UALOADS)
> val = ldw_u((u16*)(M.mem_base + addr));
> +#elif defined(IA64_UALOADS)
> + val = uldw((u16*)(M.mem_base + addr));
> +#else
> + val = *(u16*)(M.mem_base + addr);
> +#endif
> DB( if (DEBUG_MEM_TRACE())
> printk("%#08x 2 -> %#x\n", addr, val);)
> return val;
> @@ -138,7 +301,13 @@ u32 X86API rdl(
> }
> else
> #endif
> +#if defined(ALPHA_UALOADS)
> val = ldl_u((u32*)(M.mem_base + addr));
> +#elif defined(IA64_UALOADS)
> + val = uldl((u32*)(M.mem_base + addr));
> +#else
> + val = *(u32*)(M.mem_base + addr);
> +#endif
> DB( if (DEBUG_MEM_TRACE())
> printk("%#08x 4 -> %#x\n", addr, val);)
> return val;
> @@ -190,7 +359,13 @@ DB( if (DEBUG_MEM_TRACE())
> }
> else
> #endif
> +#if defined(ALPHA_UALOADS)
> stw_u(val,(u16*)(M.mem_base + addr));
> +#elif defined(IA64_UALOADS)
> + ustw(val,(u16*)(M.mem_base + addr));
> +#else
> + *(u16*)(M.mem_base + addr) = val;
> +#endif
> }
>
> /****************************************************************************
> @@ -220,7 +395,13 @@ DB( if (DEBUG_MEM_TRACE())
> }
> else
> #endif
> +#if defined(ALPHA_UALOADS)
> stl_u(val,(u32*)(M.mem_base + addr));
> +#elif defined(IA64_UALOADS)
> + ustl(val,(u32*)(M.mem_base + addr));
> +#else
> + *(u32*)(M.mem_base + addr) = val;
> +#endif
> }
>
> /****************************************************************************
> --
> 1.5.6.3
pushed, thanks.
Cheers,
Peter
More information about the xorg-devel
mailing list