rpms/xorg-x11-server/devel int10-debug.patch,NONE,1.1

[fedora-cvs-commits at redhat.com]

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11354

Added Files:
	int10-debug.patch 
Log Message:
Add an int10 debugging patch so that I don't lose it.  Not applied by default.


int10-debug.patch:
 int10/Makefile.am   |    2 +-
 int10/helper_exec.c |   17 +++++++++++++++++
 int10/xf86x86emu.c  |    9 +++++++++
 x86emu/Makefile.am  |    2 +-
 x86emu/debug.c      |    2 ++
 5 files changed, 30 insertions(+), 2 deletions(-)

--- NEW FILE int10-debug.patch ---
--- ./hw/xfree86/int10/xf86x86emu.c.jx	2007-03-03 18:31:18.000000000 -0500
+++ ./hw/xfree86/int10/xf86x86emu.c	2007-03-03 20:12:11.000000000 -0500
@@ -32,14 +32,23 @@
 xf86ExecX86int10(xf86Int10InfoPtr pInt)
 {
     int sig = setup_int(pInt);
+    int thing = 0;
 
     if (sig < 0)
 	return;
 
+    if (pInt->ax == 0x4f02) {
+	M.x86.debug = DEBUG_IO_TRACE_F; /* | DEBUG_MEM_TRACE_F; */
+	thing = 1;
+    }
+
     if (int_handler(pInt)) {
 	X86EMU_exec();
     }
 
+    if (thing)
+	M.x86.debug = 0;
+
     finish_int(pInt, sig);
 }
 
--- ./hw/xfree86/int10/helper_exec.c.jx	2007-03-03 18:31:18.000000000 -0500
+++ ./hw/xfree86/int10/helper_exec.c	2007-03-03 23:47:19.000000000 -0500
@@ -14,6 +14,8 @@
  * on PIO.
  */
 
+#define PRINT_PORT
+
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
@@ -27,6 +29,7 @@
 #define _INT10_PRIVATE
 #include "int10Defines.h"
 #include "xf86int10.h"
+#include "x86emu/x86emui.h"
 
 static int pciCfg1in(CARD16 addr, CARD32 *val);
 static int pciCfg1out(CARD16 addr, CARD32 val);
@@ -210,6 +213,7 @@
     register int inc = d_f ? -1 : 1;
     CARD32 dst = base;
 #ifdef PRINT_PORT
+    if (DEBUG_IO_TRACE())
     ErrorF(" rep_insb(%#x) %d bytes at %p %s\n",
 	     port, count, base, d_f ? "up" : "down");
 #endif
@@ -227,6 +231,7 @@
     register int inc = d_f ? -2 : 2;
     CARD32 dst = base;
 #ifdef PRINT_PORT
+    if (DEBUG_IO_TRACE())
     ErrorF(" rep_insw(%#x) %d bytes at %p %s\n",
 	     port, count, base, d_f ? "up" : "down");
 #endif
@@ -244,6 +249,7 @@
     register int inc = d_f ? -4 : 4;
     CARD32 dst = base;
 #ifdef PRINT_PORT
+    if (DEBUG_IO_TRACE())
     ErrorF(" rep_insl(%#x) %d bytes at %p %s\n",
 	     port, count, base, d_f ? "up" : "down");
 #endif
@@ -261,6 +267,7 @@
     register int inc = d_f ? -1 : 1;
     CARD32 dst = base;
 #ifdef PRINT_PORT
+    if (DEBUG_IO_TRACE())
     ErrorF(" rep_outb(%#x) %d bytes at %p %s\n",
 	     port, count, base, d_f ? "up" : "down");
 #endif
@@ -278,6 +285,7 @@
     register int inc = d_f ? -2 : 2;
     CARD32 dst = base;
 #ifdef PRINT_PORT
+    if (DEBUG_IO_TRACE())
     ErrorF(" rep_outw(%#x) %d bytes at %p %s\n",
 	     port, count, base, d_f ? "up" : "down");
 #endif
@@ -295,6 +303,7 @@
     register int inc = d_f ? -4 : 4;
     CARD32 dst = base;
 #ifdef PRINT_PORT
+    if (DEBUG_IO_TRACE())
     ErrorF(" rep_outl(%#x) %d bytes at %p %s\n",
 	     port, count, base, d_f ? "up" : "down");
 #endif
@@ -315,6 +324,7 @@
 	val = (CARD8)(Int10Current->inb40time >>
 		      ((Int10Current->inb40time & 1) << 3));
 #ifdef PRINT_PORT
+    if (DEBUG_IO_TRACE())
 	ErrorF(" inb(%#x) = %2.2x\n", port, val);
 #endif
 #ifdef __NOT_YET__
@@ -331,6 +341,7 @@
 	if (!pciCfg1inb(port, &val))
 	    val = inb(Int10Current->ioBase + port);
 #ifdef PRINT_PORT
+    if (DEBUG_IO_TRACE())
 	ErrorF(" inb(%#x) = %2.2x\n", port, val);
 #endif
     }
@@ -356,6 +367,7 @@
 	    val = inw(Int10Current->ioBase + port);
     }
 #ifdef PRINT_PORT
+    if (DEBUG_IO_TRACE())
     ErrorF(" inw(%#x) = %4.4x\n", port, val);
 #endif
     return val;
@@ -375,6 +387,7 @@
 	X_GETTIMEOFDAY(&tv);
 	Int10Current->inb40time = (CARD16)(tv.tv_usec | 1);
 #ifdef PRINT_PORT
+    if (DEBUG_IO_TRACE())
 	ErrorF(" outb(%#x, %2.2x)\n", port, val);
 #endif
 #ifdef __NOT_YET__
@@ -388,6 +401,7 @@
 #endif /* __NOT_YET__ */
     } else {
 #ifdef PRINT_PORT
+    if (DEBUG_IO_TRACE())
 	ErrorF(" outb(%#x, %2.2x)\n", port, val);
 #endif
 	if (!pciCfg1outb(port, val))
@@ -399,6 +413,7 @@
 x_outw(CARD16 port, CARD16 val)
 {
 #ifdef PRINT_PORT
+    if (DEBUG_IO_TRACE())
     ErrorF(" outw(%#x, %4.4x)\n", port, val);
 #endif
 
@@ -415,6 +430,7 @@
 	val = inl(Int10Current->ioBase + port);
 
 #ifdef PRINT_PORT
+    if (DEBUG_IO_TRACE())
     ErrorF(" inl(%#x) = %8.8x\n", port, val);
 #endif
     return val;
@@ -424,6 +440,7 @@
 x_outl(CARD16 port, CARD32 val)
 {
 #ifdef PRINT_PORT
+    if (DEBUG_IO_TRACE())
     ErrorF(" outl(%#x, %8.8x)\n", port, val);
 #endif
 
--- ./hw/xfree86/int10/Makefile.am.jx	2007-01-22 22:13:15.000000000 -0500
+++ ./hw/xfree86/int10/Makefile.am	2007-03-03 18:27:47.000000000 -0500
@@ -28,7 +28,7 @@
 
 if INT10_X86EMU
 AM_CFLAGS = $(I386_VIDEO_CFLAGS) -D_X86EMU -DNO_SYS_HEADERS \
-           $(XORG_CFLAGS) $(EXTRA_CFLAGS)
+           $(XORG_CFLAGS) $(EXTRA_CFLAGS) -DDEBUG
 INCLUDES = $(XORG_INCS) -I$(srcdir)/../x86emu
 libint10_la_SOURCES = \
 	$(COMMON_SOURCES) \
--- ./hw/xfree86/x86emu/debug.c.jx	2007-01-22 22:13:15.000000000 -0500
+++ ./hw/xfree86/x86emu/debug.c	2007-03-03 18:33:10.000000000 -0500
@@ -38,6 +38,8 @@
 ****************************************************************************/
 
 #include "x86emu/x86emui.h"
+#include <stdio.h>
+#include <string.h>
 #ifndef NO_SYS_HEADERS
 #include <stdarg.h>
 #include <stdlib.h>
--- ./hw/xfree86/x86emu/Makefile.am.jx	2007-01-22 22:13:15.000000000 -0500
+++ ./hw/xfree86/x86emu/Makefile.am	2007-03-03 18:04:05.000000000 -0500
@@ -11,7 +11,7 @@
 
 INCLUDES = 
 
-AM_CFLAGS = $(XORG_CFLAGS)
+AM_CFLAGS = $(XORG_CFLAGS) -DDEBUG
 
 EXTRA_DIST = validate.c \
              x86emu/debug.h \