Cleaned up the parallel port emulation, added IRQ support, and made enabling/disabling per port; Added the Award 430NX and the Intel Classic/PCI (Alfredo, 420TX); Finished the 586MC1; Added 8087 emulation; Moved Cyrix 6x86'es to the Dev branch; Sanitized/cleaned up memregs.c/h and intel.c/h; Split the chipsets from machines and sanitized Port 92 emulation; Added support for the 15bpp mode to the Compaq ATI 28800; Moved the MR 386DX and 486 machines to the Dev branch; Ported the new dynamic recompiler from PCem, but it remains in Dev branch until after v2.00; Ported the new timer code from PCem; Cleaned up the CPU table of unused stuff and better optimized its structure; Ported the Open-XT and Open-AT from VARCem, the Open-AT is in the Dev branch; Ported the XT MFM controller rewrite and adding of more controllers (incl. two RLL ones), from VARCem; Added the AHA-1540A and the BusTek BT-542B; Moved the Sumo SCSI-AT to the Dev branch; Minor IDE, FDC, and floppy drive code clean-ups; Made NCR 5380/53C400-based cards' BIOS address configurable; Got rid of the legacy romset variable; Unified (video) buffer and buffer32 into one and make the unified buffer 32-bit; Added the Amstead PPC512 per PCem patch by John Elliott; Switched memory mapping granularity from 16k to 4k (less than 1k not possible due to internal pages); Rewrote the CL-GD 54xx blitter, fixes Win-OS/2 on the 54x6 among other thing; Added the Image Manager 1024 and Professional Graphics Controller per PCem patch by John Elliott and work done on VARCem; Added Headland HT-216, GC-205 and Video 7 VGA 1024i emulation based on PCem commit; Implemented the fuction keys for the Toshiba T1000/T1200/T3100 enhancement; Amstrad MegaPC does now works correctly with non-internal graphics card; The SLiRP code no longer casts a packed struct type to a non-packed struct type; The Xi8088 and PB410a no longer hang on 86Box when PS/2 mouse is not present; The S3 Virge on BeOS is no longer broken (was broken by build #1591); OS/2 2.0 build 6.167 now sees key presses again; Xi8088 now work on CGA again; 86F images converted from either the old or new variants of the HxC MFM format now work correctly; Hardware interrupts with a vector of 0xFF are now handled correctly; OPTi 495SX boards no longer incorrectly have 64 MB maximum RAM when 32 MB is correct; Fixed VNC keyboard input bugs; Fixed AT RTC periodic interrupt - Chicago 58s / 73f / 73g / 81 MIDI play no longer hangs with the build's own VTD driver; Fixed mouse polling with internal mice - Amstrad and Olivetti mice now work correctly; Triones ATAPI DMA driver now correctly reads a file at the end of a CD image with a sectors number not divisible by 4; Compaq Portable now works with all graphics cards; Fixed various MDSI Genius bugs; Added segment limit checks and improved page fault checks for several CPU instructions - Memphis 15xx WINSETUP and Chicago 58s WINDISK.CPL no longer issue a GPF, and some S3 drivers that used to have glitches, now work correctly; Further improved the 808x emulation, also fixes the noticably choppy sound when using 808x CPU's, also fixes #355; OS/2 installer no logner locks up on splash screen on PS/2 Model 70 and 80, fixes #400. Fixed several Amstead bugs, GEM no longer crashes on the Amstrad 1640, fixes #391. Ported John Elliott's Amstrad fixes and improvement from PCem, and fixed the default language so it's correctly Engliish, fixes #278, fixes #389. Fixed a minor IDE timing bug, fixes #388. Fixed Toshiba T1000 RAM issues, fixes #379. Fixed EGA/(S)VGA overscan border handling, fixes #378; Got rid of the now long useless IDE channel 2 auto-removal, fixes #370; Fixed the BIOS files used by the AMSTRAD PC1512, fixes #366; Ported the Unicode CD image file name fix from VARCem, fixes #365; Fixed high density floppy disks on the Xi8088, fixes #359; Fixed some bugs in the Hercules emulation, fixes #346, fixes #358; Fixed the SCSI hard disk mode sense pages, fixes #356; Removed the AMI Unknown 386SX because of impossibility to identify the chipset, closes #349; Fixed bugs in the serial mouse emulation, fixes #344; Compiled 86Box binaries now include all the required .DLL's, fixes #341; Made some combo boxes in the Settings dialog slightly wider, fixes #276.
293 lines
9.8 KiB
C
293 lines
9.8 KiB
C
#include <stdint.h>
|
|
#include "../86box.h"
|
|
#include "cpu.h"
|
|
#include "../mem.h"
|
|
|
|
#include "x86.h"
|
|
#include "386_common.h"
|
|
#include "codegen.h"
|
|
#include "codegen_ir.h"
|
|
#include "codegen_ops.h"
|
|
#include "codegen_ops_helpers.h"
|
|
#include "codegen_ops_mov.h"
|
|
|
|
uint32_t ropJMP_r8(codeblock_t *block, ir_data_t *ir, uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc)
|
|
{
|
|
uint32_t offset = (int32_t)(int8_t)fastreadb(cs + op_pc);
|
|
uint32_t dest_addr = op_pc+1+offset;
|
|
|
|
if (!(op_32 & 0x100))
|
|
dest_addr &= 0xffff;
|
|
|
|
if (offset < 0)
|
|
codegen_can_unroll(block, ir, op_pc+1, dest_addr);
|
|
codegen_mark_code_present(block, cs+op_pc, 1);
|
|
return dest_addr;
|
|
}
|
|
uint32_t ropJMP_r16(codeblock_t *block, ir_data_t *ir, uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc)
|
|
{
|
|
uint32_t offset = (int32_t)(int16_t)fastreadw(cs + op_pc);
|
|
uint32_t dest_addr = op_pc+2+offset;
|
|
|
|
dest_addr &= 0xffff;
|
|
|
|
if (offset < 0)
|
|
codegen_can_unroll(block, ir, op_pc+1, dest_addr);
|
|
codegen_mark_code_present(block, cs+op_pc, 2);
|
|
return dest_addr;
|
|
}
|
|
uint32_t ropJMP_r32(codeblock_t *block, ir_data_t *ir, uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc)
|
|
{
|
|
uint32_t offset = fastreadl(cs + op_pc);
|
|
uint32_t dest_addr = op_pc+4+offset;
|
|
|
|
if (offset < 0)
|
|
codegen_can_unroll(block, ir, op_pc+1, dest_addr);
|
|
codegen_mark_code_present(block, cs+op_pc, 4);
|
|
return dest_addr;
|
|
}
|
|
|
|
uint32_t ropJMP_far_16(codeblock_t *block, ir_data_t *ir, uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc)
|
|
{
|
|
uint16_t new_pc = fastreadw(cs + op_pc);
|
|
uint16_t new_cs = fastreadw(cs + op_pc + 2);
|
|
|
|
uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);
|
|
uop_MOV_IMM(ir, IREG_pc, new_pc);
|
|
uop_LOAD_FUNC_ARG_IMM(ir, 0, new_cs);
|
|
uop_LOAD_FUNC_ARG_IMM(ir, 1, op_pc + 4);
|
|
uop_CALL_FUNC(ir, loadcsjmp);
|
|
|
|
codegen_mark_code_present(block, cs+op_pc, 4);
|
|
return -1;
|
|
}
|
|
uint32_t ropJMP_far_32(codeblock_t *block, ir_data_t *ir, uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc)
|
|
{
|
|
uint32_t new_pc = fastreadl(cs + op_pc);
|
|
uint16_t new_cs = fastreadw(cs + op_pc + 4);
|
|
|
|
uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);
|
|
uop_MOV_IMM(ir, IREG_pc, new_pc);
|
|
uop_LOAD_FUNC_ARG_IMM(ir, 0, new_cs);
|
|
uop_LOAD_FUNC_ARG_IMM(ir, 1, op_pc + 4);
|
|
uop_CALL_FUNC(ir, loadcsjmp);
|
|
|
|
codegen_mark_code_present(block, cs+op_pc, 6);
|
|
return -1;
|
|
}
|
|
|
|
uint32_t ropCALL_r16(codeblock_t *block, ir_data_t *ir, uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc)
|
|
{
|
|
uint32_t offset = (int32_t)(int16_t)fastreadw(cs + op_pc);
|
|
uint16_t ret_addr = op_pc + 2;
|
|
uint16_t dest_addr = ret_addr + offset;
|
|
int sp_reg;
|
|
|
|
dest_addr &= 0xffff;
|
|
|
|
uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);
|
|
sp_reg = LOAD_SP_WITH_OFFSET(ir, -2);
|
|
uop_MEM_STORE_IMM_16(ir, IREG_SS_base, sp_reg, ret_addr);
|
|
SUB_SP(ir, 2);
|
|
uop_MOV_IMM(ir, IREG_pc, dest_addr);
|
|
|
|
codegen_mark_code_present(block, cs+op_pc, 2);
|
|
return -1;
|
|
}
|
|
uint32_t ropCALL_r32(codeblock_t *block, ir_data_t *ir, uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc)
|
|
{
|
|
uint32_t offset = fastreadl(cs + op_pc);
|
|
uint32_t ret_addr = op_pc + 4;
|
|
uint32_t dest_addr = ret_addr + offset;
|
|
int sp_reg;
|
|
|
|
uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);
|
|
sp_reg = LOAD_SP_WITH_OFFSET(ir, -4);
|
|
uop_MEM_STORE_IMM_32(ir, IREG_SS_base, sp_reg, ret_addr);
|
|
SUB_SP(ir, 4);
|
|
uop_MOV_IMM(ir, IREG_pc, dest_addr);
|
|
|
|
codegen_mark_code_present(block, cs+op_pc, 4);
|
|
return -1;
|
|
}
|
|
|
|
uint32_t ropRET_16(codeblock_t *block, ir_data_t *ir, uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc)
|
|
{
|
|
uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);
|
|
|
|
if (stack32)
|
|
uop_MEM_LOAD_REG(ir, IREG_temp0_W, IREG_SS_base, IREG_ESP);
|
|
else
|
|
{
|
|
uop_MOVZX(ir, IREG_eaaddr, IREG_SP);
|
|
uop_MEM_LOAD_REG(ir, IREG_temp0_W, IREG_SS_base, IREG_eaaddr);
|
|
}
|
|
ADD_SP(ir, 2);
|
|
uop_MOVZX(ir, IREG_pc, IREG_temp0_W);
|
|
|
|
return -1;
|
|
}
|
|
uint32_t ropRET_32(codeblock_t *block, ir_data_t *ir, uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc)
|
|
{
|
|
uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);
|
|
|
|
if (stack32)
|
|
uop_MEM_LOAD_REG(ir, IREG_pc, IREG_SS_base, IREG_ESP);
|
|
else
|
|
{
|
|
uop_MOVZX(ir, IREG_eaaddr, IREG_SP);
|
|
uop_MEM_LOAD_REG(ir, IREG_pc, IREG_SS_base, IREG_eaaddr);
|
|
}
|
|
ADD_SP(ir, 4);
|
|
|
|
return -1;
|
|
}
|
|
|
|
uint32_t ropRET_imm_16(codeblock_t *block, ir_data_t *ir, uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc)
|
|
{
|
|
uint16_t offset = fastreadw(cs + op_pc);
|
|
|
|
uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);
|
|
|
|
if (stack32)
|
|
uop_MEM_LOAD_REG(ir, IREG_temp0_W, IREG_SS_base, IREG_ESP);
|
|
else
|
|
{
|
|
uop_MOVZX(ir, IREG_eaaddr, IREG_SP);
|
|
uop_MEM_LOAD_REG(ir, IREG_temp0_W, IREG_SS_base, IREG_eaaddr);
|
|
}
|
|
ADD_SP(ir, 2+offset);
|
|
uop_MOVZX(ir, IREG_pc, IREG_temp0_W);
|
|
|
|
codegen_mark_code_present(block, cs+op_pc, 2);
|
|
return -1;
|
|
}
|
|
uint32_t ropRET_imm_32(codeblock_t *block, ir_data_t *ir, uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc)
|
|
{
|
|
uint16_t offset = fastreadw(cs + op_pc);
|
|
|
|
uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);
|
|
|
|
if (stack32)
|
|
uop_MEM_LOAD_REG(ir, IREG_pc, IREG_SS_base, IREG_ESP);
|
|
else
|
|
{
|
|
uop_MOVZX(ir, IREG_eaaddr, IREG_SP);
|
|
uop_MEM_LOAD_REG(ir, IREG_pc, IREG_SS_base, IREG_eaaddr);
|
|
}
|
|
ADD_SP(ir, 4+offset);
|
|
|
|
codegen_mark_code_present(block, cs+op_pc, 2);
|
|
return -1;
|
|
}
|
|
|
|
uint32_t ropRETF_16(codeblock_t *block, ir_data_t *ir, uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc)
|
|
{
|
|
if ((msw&1) && !(cpu_state.eflags&VM_FLAG))
|
|
return 0;
|
|
|
|
uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);
|
|
|
|
if (stack32)
|
|
{
|
|
uop_MEM_LOAD_REG(ir, IREG_temp0_W, IREG_SS_base, IREG_ESP);
|
|
uop_MEM_LOAD_REG_OFFSET(ir, IREG_temp1_W, IREG_SS_base, IREG_ESP, 2);
|
|
}
|
|
else
|
|
{
|
|
uop_MOVZX(ir, IREG_eaaddr, IREG_SP);
|
|
uop_MEM_LOAD_REG(ir, IREG_temp0_W, IREG_SS_base, IREG_eaaddr);
|
|
uop_MEM_LOAD_REG_OFFSET(ir, IREG_temp1_W, IREG_SS_base, IREG_eaaddr, 2);
|
|
}
|
|
uop_MOVZX(ir, IREG_pc, IREG_temp0_W);
|
|
uop_LOAD_FUNC_ARG_REG(ir, 0, IREG_temp1_W);
|
|
uop_CALL_FUNC(ir, loadcs);
|
|
ADD_SP(ir, 4);
|
|
|
|
return -1;
|
|
}
|
|
uint32_t ropRETF_32(codeblock_t *block, ir_data_t *ir, uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc)
|
|
{
|
|
if ((msw&1) && !(cpu_state.eflags&VM_FLAG))
|
|
return 0;
|
|
|
|
uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);
|
|
|
|
if (stack32)
|
|
{
|
|
uop_MEM_LOAD_REG(ir, IREG_temp0, IREG_SS_base, IREG_ESP);
|
|
uop_MEM_LOAD_REG_OFFSET(ir, IREG_temp1_W, IREG_SS_base, IREG_ESP, 4);
|
|
}
|
|
else
|
|
{
|
|
uop_MOVZX(ir, IREG_eaaddr, IREG_SP);
|
|
uop_MEM_LOAD_REG(ir, IREG_temp0, IREG_SS_base, IREG_eaaddr);
|
|
uop_MEM_LOAD_REG_OFFSET(ir, IREG_temp1_W, IREG_SS_base, IREG_eaaddr, 4);
|
|
}
|
|
uop_MOV(ir, IREG_pc, IREG_temp0);
|
|
uop_LOAD_FUNC_ARG_REG(ir, 0, IREG_temp1_W);
|
|
uop_CALL_FUNC(ir, loadcs);
|
|
ADD_SP(ir, 8);
|
|
|
|
return -1;
|
|
}
|
|
|
|
uint32_t ropRETF_imm_16(codeblock_t *block, ir_data_t *ir, uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc)
|
|
{
|
|
uint16_t offset;
|
|
|
|
if ((msw&1) && !(cpu_state.eflags&VM_FLAG))
|
|
return 0;
|
|
|
|
offset = fastreadw(cs + op_pc);
|
|
uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);
|
|
|
|
if (stack32)
|
|
{
|
|
uop_MEM_LOAD_REG(ir, IREG_temp0_W, IREG_SS_base, IREG_ESP);
|
|
uop_MEM_LOAD_REG_OFFSET(ir, IREG_temp1_W, IREG_SS_base, IREG_ESP, 2);
|
|
}
|
|
else
|
|
{
|
|
uop_MOVZX(ir, IREG_eaaddr, IREG_SP);
|
|
uop_MEM_LOAD_REG(ir, IREG_temp0_W, IREG_SS_base, IREG_eaaddr);
|
|
uop_MEM_LOAD_REG_OFFSET(ir, IREG_temp1_W, IREG_SS_base, IREG_eaaddr, 2);
|
|
}
|
|
uop_MOVZX(ir, IREG_pc, IREG_temp0_W);
|
|
uop_LOAD_FUNC_ARG_REG(ir, 0, IREG_temp1_W);
|
|
uop_CALL_FUNC(ir, loadcs);
|
|
ADD_SP(ir, 4+offset);
|
|
|
|
codegen_mark_code_present(block, cs+op_pc, 2);
|
|
return -1;
|
|
}
|
|
uint32_t ropRETF_imm_32(codeblock_t *block, ir_data_t *ir, uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc)
|
|
{
|
|
uint16_t offset;
|
|
|
|
if ((msw&1) && !(cpu_state.eflags&VM_FLAG))
|
|
return 0;
|
|
|
|
offset = fastreadw(cs + op_pc);
|
|
uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);
|
|
|
|
if (stack32)
|
|
{
|
|
uop_MEM_LOAD_REG(ir, IREG_temp0, IREG_SS_base, IREG_ESP);
|
|
uop_MEM_LOAD_REG_OFFSET(ir, IREG_temp1_W, IREG_SS_base, IREG_ESP, 4);
|
|
}
|
|
else
|
|
{
|
|
uop_MOVZX(ir, IREG_eaaddr, IREG_SP);
|
|
uop_MEM_LOAD_REG(ir, IREG_temp0, IREG_SS_base, IREG_eaaddr);
|
|
uop_MEM_LOAD_REG_OFFSET(ir, IREG_temp1_W, IREG_SS_base, IREG_eaaddr, 4);
|
|
}
|
|
uop_MOV(ir, IREG_pc, IREG_temp0);
|
|
uop_LOAD_FUNC_ARG_REG(ir, 0, IREG_temp1_W);
|
|
uop_CALL_FUNC(ir, loadcs);
|
|
ADD_SP(ir, 8+offset);
|
|
|
|
codegen_mark_code_present(block, cs+op_pc, 2);
|
|
return -1;
|
|
}
|