[Xorg-commit] xc/programs/Xserver/hw/xfree86/os-support/misc PortIO.S,NONE,1.1.1.1.2.1 Imakefile,1.1.4.2,1.1.4.3 SlowBcopy.c,1.1.4.1,1.1.4.2

[Kaleb Keithley]

Committed by: kaleb

Update of /cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/misc
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/programs/Xserver/hw/xfree86/os-support/misc

Modified Files:
      Tag: XORG-CURRENT
	Imakefile SlowBcopy.c 
Added Files:
      Tag: XORG-CURRENT
	PortIO.S 
Log Message:
merge most of XFree86 RC3 (4.3.99.903) from vendor branch.
bug #214


--- NEW FILE: PortIO.S ---
/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/PortIO.S,v 1.1 2004/02/02 03:55:32 dawes Exp $ */

/* Port I/O functions for platforms with no inlining. */

#include "assyntax.h"

	FILE("PortIO.s")

	AS_BEGIN

	GLOBL	GLNAME(outb)
	GLOBL	GLNAME(outw)
	GLOBL	GLNAME(outl)
	GLOBL	GLNAME(inb)
	GLOBL	GLNAME(inw)
	GLOBL	GLNAME(inl)

	SEG_TEXT
	ALIGNTEXT4
GLNAME(outb):
	MOV_L	(REGOFF(4,ESP), EDX)
	MOV_L	(REGOFF(8,ESP), EAX)
	OUT_B
	RET

	ALIGNTEXT4
GLNAME(outw):
	MOV_L	(REGOFF(4,ESP), EDX)
	MOV_L	(REGOFF(8,ESP), EAX)
	OUT_W
	RET

	ALIGNTEXT4
GLNAME(outl):
	MOV_L	(REGOFF(4,ESP), EDX)
	MOV_L	(REGOFF(8,ESP), EAX)
	OUT_L
	RET

	ALIGNTEXT4
GLNAME(inb):
	MOV_L	(REGOFF(4,ESP), EDX)
	IN_B
	RET

	ALIGNTEXT4
GLNAME(inw):
	MOV_L	(REGOFF(4,ESP), EDX)
	IN_L
	RET

	ALIGNTEXT4
GLNAME(inl):
	MOV_L	(REGOFF(4,ESP), EDX)
	IN_L
	RET


Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/misc/Imakefile,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/Imakefile	26 Nov 2003 22:49:02 -0000	1.1.4.2
+++ b/Imakefile	23 Feb 2004 21:37:04 -0000	1.1.4.3
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/Imakefile,v 3.12 2003/10/02 13:30:07 eich Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/Imakefile,v 3.14 2004/02/02 03:55:32 dawes Exp $
 
 
 
@@ -15,11 +15,18 @@
 #else
 XSRCS = BUSmemcpy.c IODelay.c SlowBcopy.c
 XOBJS = BUSmemcpy.o IODelay.o SlowBcopy.o
+#if defined(NetBSDArchitecture)
+BUSmemcpy.o: BUSmemcpy.c
+IODelay.o: IODelay.c
+SlowBcopy.o: SlowBcopy.c
+#endif
 #endif
 
 #if HasGcc || HasGcc2
 ILHACKSRCS = xf86_IlHack.c
 ILHACKOBJS = xf86_IlHack.o
+#elif defined(SunArchitecture) && defined(i386Architecture)
+ILHACKOBJS = PortIO.o
 #endif
 
 SRCS = xf86_Util.c Delay.c $(ILHACKSRCS) $(XSRCS)
@@ -39,5 +46,9 @@
 ObjectFromAsmSource(SlowBcopy,NullParameter)
 #endif
 
+#if defined(SunArchitecture) && defined(i386Architecture)
+ObjectFromAsmSource(PortIO,NullParameter)
+#endif
+
 DependTarget()
 

Index: SlowBcopy.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/misc/SlowBcopy.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/SlowBcopy.c	26 Nov 2003 22:49:02 -0000	1.1.4.1
+++ b/SlowBcopy.c	23 Feb 2004 21:37:04 -0000	1.1.4.2
@@ -4,7 +4,7 @@
   for Alpha Linux
 *******************************************************************************/
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/SlowBcopy.c,v 1.6 2003/04/07 16:23:39 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/SlowBcopy.c,v 1.7 2004/02/11 22:06:21 tsi Exp $ */
  
 /* 
  *   Create a dependency that should be immune from the effect of register
@@ -26,13 +26,13 @@
 void
 xf86SlowBcopy(unsigned char *src, unsigned char *dst, int len)
 {
-#if defined(__ia64__)
-    outb(0x80, 0x00);
-#endif
     while(len--)
     {
 	*dst++ = *src++;
-#if !defined(__sparc__) && !defined(__powerpc__) && !defined(__mips__)
+#if !defined(__sparc__) && \
+    !defined(__powerpc__) && \
+    !defined(__mips__) && \
+    !defined(__ia64__)
 	outb(0x80, 0x00);
 #endif
     }