diff options
Diffstat (limited to 'src/lrmi/backend-x86emu.c')
-rw-r--r-- | src/lrmi/backend-x86emu.c | 76 |
1 files changed, 1 insertions, 75 deletions
diff --git a/src/lrmi/backend-x86emu.c b/src/lrmi/backend-x86emu.c index d17d6ae..f65dc40 100644 --- a/src/lrmi/backend-x86emu.c +++ b/src/lrmi/backend-x86emu.c @@ -3,54 +3,12 @@ #include <string.h> #include <pciaccess.h> -#include "x86emu.h" -#include "libx86.h" #include "common.h" +#include "common_helper.h" xf86Int10InfoPtr Int10Current = NULL; -#define M _X86EMU_env - -#define X86_EAX _X86EMU_env.x86.R_EAX -#define X86_EBX _X86EMU_env.x86.R_EBX -#define X86_ECX _X86EMU_env.x86.R_ECX -#define X86_EDX _X86EMU_env.x86.R_EDX -#define X86_ESI _X86EMU_env.x86.R_ESI -#define X86_EDI _X86EMU_env.x86.R_EDI -#define X86_EBP _X86EMU_env.x86.R_EBP -#define X86_EIP _X86EMU_env.x86.R_EIP -#define X86_ESP _X86EMU_env.x86.R_ESP -#define X86_EFLAGS _X86EMU_env.x86.R_EFLG - -#define X86_FLAGS _X86EMU_env.x86.R_FLG -#define X86_AX _X86EMU_env.x86.R_AX -#define X86_BX _X86EMU_env.x86.R_BX -#define X86_CX _X86EMU_env.x86.R_CX -#define X86_DX _X86EMU_env.x86.R_DX -#define X86_SI _X86EMU_env.x86.R_SI -#define X86_DI _X86EMU_env.x86.R_DI -#define X86_BP _X86EMU_env.x86.R_BP -#define X86_IP _X86EMU_env.x86.R_IP -#define X86_SP _X86EMU_env.x86.R_SP -#define X86_CS _X86EMU_env.x86.R_CS -#define X86_DS _X86EMU_env.x86.R_DS -#define X86_ES _X86EMU_env.x86.R_ES -#define X86_SS _X86EMU_env.x86.R_SS -#define X86_FS _X86EMU_env.x86.R_FS -#define X86_GS _X86EMU_env.x86.R_GS - -#define X86_AL _X86EMU_env.x86.R_AL -#define X86_BL _X86EMU_env.x86.R_BL -#define X86_CL _X86EMU_env.x86.R_CL -#define X86_DL _X86EMU_env.x86.R_DL - -#define X86_AH _X86EMU_env.x86.R_AH -#define X86_BH _X86EMU_env.x86.R_BH -#define X86_CH _X86EMU_env.x86.R_CH -#define X86_DH _X86EMU_env.x86.R_DH - - #define CARD8 unsigned char #define CARD16 unsigned short #define CARD32 unsigned long @@ -287,19 +245,6 @@ pushw(xf86Int10InfoPtr pInt, CARD16 val) MEM_WW(pInt, ((CARD32) X86_SS << 4) + X86_SP, val); } -static int -run_bios_int(int num, xf86Int10InfoPtr pInt) -{ - CARD32 eflags; - eflags = X86_EFLAGS; - pushw(pInt, eflags); - pushw(pInt, X86_CS); - pushw(pInt, X86_IP); - X86_CS = MEM_RW(pInt, (num << 2) + 2); - X86_IP = MEM_RW(pInt, num << 2); - return 1; -} - static void x86emu_do_int(int num) { @@ -308,25 +253,6 @@ x86emu_do_int(int num) run_bios_int(num, Int10Current); } -static int -intE6_handler(xf86Int10InfoPtr pInt) -{ - struct pci_device * pvp; - pvp = pInt->dev; - - int a = pvp->bus; - - if (pvp) - X86_AX = (pvp->bus << 8) | (pvp->dev << 3) | (pvp->func & 0x7); - - pushw(pInt, X86_CS); - pushw(pInt, X86_IP); - X86_CS = pInt->BIOSseg; - X86_EIP = 0x0003; - X86_ES = 0; /* standard pc es */ - return 1; -} - static void pre_int(xf86Int10InfoPtr pInt) { |