From d79952377b609ba75f4c2d2cf1ab19629a0c2976 Mon Sep 17 00:00:00 2001 From: Tiago Vignatti Date: Wed, 23 Dec 2009 15:54:03 +0200 Subject: lrmi: delete unused code and reuse the old API name Signed-off-by: Tiago Vignatti --- include/libx86.h | 22 +++----------- src/lrmi/backend-x86emu.c | 77 ++--------------------------------------------- 2 files changed, 6 insertions(+), 93 deletions(-) diff --git a/include/libx86.h b/include/libx86.h index 3eb21aa..f0a4b02 100644 --- a/include/libx86.h +++ b/include/libx86.h @@ -110,22 +110,14 @@ LRMI_finish_int(xf86Int10InfoPtr pInt); void LRMI_setup(xf86Int10InfoPtr pInt); -void -LRMI_int_handler(xf86Int10InfoPtr pInt); - -void * -LRMI_get_int10_addr(xf86Int10InfoPtr pInt, unsigned long addr); +/* Get the base address of the real memory address space block. */ +void * LRMI_base_addr(xf86Int10InfoPtr pInt, unsigned long addr); void LRMI_set_exit_condition(xf86Int10InfoPtr pInt); -/* - Simulate a 16 bit interrupt - returns 1 if sucessful, 0 for failure -*/ -#define LRMI_int LRMI_MAKENAME(int) -int -LRMI_int(int interrupt, struct LRMI_regs *r); +/* Simulate a 16 bit interrupt */ +void LRMI_int(xf86Int10InfoPtr pInt); /* Allocate real mode memory @@ -142,10 +134,4 @@ LRMI_alloc_real(int size); void LRMI_free_real(void *m); -/* - * Get the base address of the real memory address space block. - */ -size_t -LRMI_base_addr(void); - #endif diff --git a/src/lrmi/backend-x86emu.c b/src/lrmi/backend-x86emu.c index d3de033..f67e737 100644 --- a/src/lrmi/backend-x86emu.c +++ b/src/lrmi/backend-x86emu.c @@ -211,7 +211,7 @@ static int10MemRec genericMem = { }; void * -LRMI_get_int10_addr(xf86Int10InfoPtr pInt, CARD32 addr) +LRMI_base_addr(xf86Int10InfoPtr pInt, CARD32 addr) { return V_ADDR(addr); } @@ -346,7 +346,7 @@ intE6_handler(xf86Int10InfoPtr pInt) } void -LRMI_int_handler(xf86Int10InfoPtr pInt) +LRMI_int(xf86Int10InfoPtr pInt) { int num = pInt->num; int ret = 0; @@ -479,76 +479,3 @@ LRMI_fini(xf86Int10InfoPtr pInt) if (Int10Current == pInt) Int10Current = NULL; } - -#if 0 -int real_call(struct LRMI_regs *registers) { - regs = registers; - - X86_EAX = registers->eax; - X86_EBX = registers->ebx; - X86_ECX = registers->ecx; - X86_EDX = registers->edx; - X86_ESI = registers->esi; - X86_EDI = registers->edi; - X86_EBP = registers->ebp; - X86_EIP = registers->ip; - X86_ES = registers->es; - X86_FS = registers->fs; - X86_GS = registers->gs; - X86_CS = registers->cs; - - if (registers->ss != 0) { - X86_SS = registers->ss; - } else { - X86_SS = (unsigned int) stack >> 4; - } - - if (registers->ds != 0) { - X86_DS = registers->ds; - } - - if (registers->sp != 0) { - X86_ESP = registers->sp; - } else { - X86_ESP = 0xFFF9; - } - - M.x86.debug |= DEBUG_DECODE_F; - - memset (stack, 0, 64*1024); - - X86EMU_exec(); - - registers->eax = X86_EAX; - registers->ebx = X86_EBX; - registers->ecx = X86_ECX; - registers->edx = X86_EDX; - registers->esi = X86_ESI; - registers->edi = X86_EDI; - registers->ebp = X86_EBP; - registers->es = X86_ES; - - return 1; -} - -int LRMI_int(int num, struct LRMI_regs *registers) { - u32 eflags; - eflags = X86_EFLAGS; - eflags = eflags | X86_IF_MASK; - X86_EFLAGS = X86_EFLAGS & ~(X86_VIF_MASK | X86_TF_MASK | X86_IF_MASK | X86_NT_MASK); - - registers->cs = (read_b((num << 2) + 3) << 8) + read_b((num << 2) + 2); - registers->ip = (read_b((num << 2) + 1) << 8) + read_b((num << 2)); - regs = registers; - return real_call(registers); -} - -int LRMI_call(struct LRMI_regs *registers) { - return real_call(registers); -} -size_t -LRMI_base_addr(void) -{ - return (size_t)mmap_addr; -} -#endif -- cgit v1.2.3