frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add M32R architecture support (bug #10020) 

Still needs autotools support, so this won't actually _build_: it's just
a starting point.
This commit is contained in:
Kazuhiro Inaoka 2008-04-30 11:58:32 +03:00 committed by Daniel Stone
parent b71b51c982
commit ce36ae526d
6 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1363,7 +1363,7 @@ do { \
# define write_mem_barrier() /* NOP */ # define write_mem_barrier() /* NOP */
# if !defined(__SUNPRO_C) # if !defined(__SUNPRO_C)
# if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) # if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__)
# ifdef GCCUSESGAS # ifdef GCCUSESGAS
/* /*
@ -1472,7 +1472,7 @@ inl(unsigned short port)
# endif /* GCCUSESGAS */ # endif /* GCCUSESGAS */
# else /* !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__)*/ # else /* !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__m32r__) */
static __inline__ void static __inline__ void
outb(unsigned short port, unsigned char val) outb(unsigned short port, unsigned char val)

4
hw/xfree86/common/xf86Bus.c
View File

@ -2773,7 +2773,7 @@ xf86FindPrimaryDevice()
} }
} }
#if !defined(__sparc) && !defined(__sparc__) && !defined(__powerpc__) && !defined(__mips__) && !defined(__arm__) #if !defined(__sparc) && !defined(__sparc__) && !defined(__powerpc__) && !defined(__mips__) && !defined(__arm__) && !defined(__m32r__)
#include "vgaHW.h" #include "vgaHW.h"
#include "compiler.h" #include "compiler.h"
#endif #endif
@ -2785,7 +2785,7 @@ static void
CheckGenericGA() CheckGenericGA()
{ {
/* This needs to be changed for multiple domains */ /* This needs to be changed for multiple domains */
#if !defined(__sparc__) && !defined(__sparc) && !defined(__powerpc__) && !defined(__mips__) && !defined(__ia64__) && !defined(__arm__) && !defined(__s390__) #if !defined(__sparc__) && !defined(__sparc) && !defined(__powerpc__) && !defined(__mips__) && !defined(__ia64__) && !defined(__arm__) && !defined(__s390__) && !defined(__m32r__)
IOADDRESS GenericIOBase = VGAHW_GET_IOBASE(); IOADDRESS GenericIOBase = VGAHW_GET_IOBASE();
CARD8 CurrentValue, TestValue; CARD8 CurrentValue, TestValue;

6
hw/xfree86/os-support/bus/Pci.h
View File

@ -237,6 +237,12 @@
# if defined(linux) # if defined(linux)
# define ARCH_PCI_INIT linuxPciInit # define ARCH_PCI_INIT linuxPciInit
# endif # endif
#elif defined(__m32r__)
# if defined(linux)
# define ARCH_PCI_INIT linuxPciInit
# define INCLUDE_XF86_MAP_PCI_MEM
# define INCLUDE_XF86_NO_DOMAIN
# endif
#elif defined(__sparc__) || defined(sparc) #elif defined(__sparc__) || defined(sparc)
# if defined(linux) # if defined(linux)
# define ARCH_PCI_INIT linuxPciInit # define ARCH_PCI_INIT linuxPciInit

1
hw/xfree86/os-support/linux/lnxResource.c
View File

@ -65,6 +65,7 @@ xf86AccResFromOS(resPtr ret)
defined(__sparc__) || \ defined(__sparc__) || \
defined(__mips__) || \ defined(__mips__) || \
defined(__sh__) || \ defined(__sh__) || \
defined(__m32r__) || \
defined(__mc68000__) || \ defined(__mc68000__) || \
defined(__arm__) || \ defined(__arm__) || \
defined(__s390__) || \ defined(__s390__) || \

4
hw/xfree86/os-support/linux/lnx_video.c
View File

@ -558,7 +558,7 @@ xf86EnableIO(void)
#endif #endif
} }
close(fd); close(fd);
#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) #elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__)
if (ioperm(0, 1024, 1) || iopl(3)) { if (ioperm(0, 1024, 1) || iopl(3)) {
if (errno == ENODEV) if (errno == ENODEV)
ErrorF("xf86EnableIOPorts: no I/O ports found\n"); ErrorF("xf86EnableIOPorts: no I/O ports found\n");
@ -585,7 +585,7 @@ xf86DisableIO(void)
#if defined(__powerpc__) #if defined(__powerpc__)
munmap(ioBase, 0x20000); munmap(ioBase, 0x20000);
ioBase = NULL; ioBase = NULL;
#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__) && !defined(__s390__) #elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__) && !defined(__s390__) && !defined(__m32r__)
iopl(0); iopl(0);
ioperm(0, 1024, 0); ioperm(0, 1024, 0);
#endif #endif

20
include/servermd.h
View File

@ -217,6 +217,26 @@ SOFTWARE.
#endif /* SuperH */ #endif /* SuperH */
#if defined(__m32r__)
#if defined(__BIG_ENDIAN__)
# define IMAGE_BYTE_ORDER MSBFirst
# define BITMAP_BIT_ORDER MSBFirst
# define GLYPHPADBYTES 4
# define GETLEFTBITS_ALIGNMENT 1
#else
# define IMAGE_BYTE_ORDER LSBFirst
# define BITMAP_BIT_ORDER LSBFirst
# define GLYPHPADBYTES 4
# define GETLEFTBITS_ALIGNMENT 1
#endif
#define AVOID_MEMORY_READ
#define FAST_CONSTANT_OFFSET_MODE
#define LARGE_INSTRUCTION_CACHE
#define PLENTIFUL_REGISTERS
#endif /* __m32r__ */
#if (defined(sun) && (defined(__sparc) || defined(sparc))) || \ #if (defined(sun) && (defined(__sparc) || defined(sparc))) || \
(defined(__uxp__) && (defined(sparc) || defined(mc68000))) || \ (defined(__uxp__) && (defined(sparc) || defined(mc68000))) || \