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.
270 lines
10 KiB
C
270 lines
10 KiB
C
static uint32_t ropNOP(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
|
|
{
|
|
return op_pc;
|
|
}
|
|
|
|
static uint32_t ropCLD(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
|
|
{
|
|
CLEAR_BITS((uintptr_t)&cpu_state.flags, D_FLAG);
|
|
return op_pc;
|
|
}
|
|
static uint32_t ropSTD(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
|
|
{
|
|
SET_BITS((uintptr_t)&cpu_state.flags, D_FLAG);
|
|
return op_pc;
|
|
}
|
|
|
|
static uint32_t ropCLI(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
|
|
{
|
|
if (!IOPLp && (cr4 & (CR4_VME | CR4_PVI)))
|
|
return 0;
|
|
CLEAR_BITS((uintptr_t)&cpu_state.flags, I_FLAG);
|
|
return op_pc;
|
|
}
|
|
static uint32_t ropSTI(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
|
|
{
|
|
if (!IOPLp && (cr4 & (CR4_VME | CR4_PVI)))
|
|
return 0;
|
|
SET_BITS((uintptr_t)&cpu_state.flags, I_FLAG);
|
|
return op_pc;
|
|
}
|
|
|
|
static uint32_t ropFE(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
|
|
{
|
|
x86seg *target_seg = NULL;
|
|
int host_reg;
|
|
|
|
if ((fetchdat & 0x30) != 0x00)
|
|
return 0;
|
|
|
|
CALL_FUNC((uintptr_t)flags_rebuild_c);
|
|
|
|
if ((fetchdat & 0xc0) == 0xc0)
|
|
host_reg = LOAD_REG_B(fetchdat & 7);
|
|
else
|
|
{
|
|
target_seg = FETCH_EA(op_ea_seg, fetchdat, op_ssegs, &op_pc, op_32);
|
|
STORE_IMM_ADDR_L((uintptr_t)&cpu_state.oldpc, op_old_pc);
|
|
|
|
SAVE_EA();
|
|
MEM_CHECK_WRITE(target_seg);
|
|
host_reg = MEM_LOAD_ADDR_EA_B_NO_ABRT(target_seg);
|
|
}
|
|
|
|
switch (fetchdat & 0x38)
|
|
{
|
|
case 0x00: /*INC*/
|
|
STORE_HOST_REG_ADDR_BL((uintptr_t)&cpu_state.flags_op1, host_reg);
|
|
ADD_HOST_REG_IMM_B(host_reg, 1);
|
|
STORE_IMM_ADDR_L((uintptr_t)&cpu_state.flags_op2, 1);
|
|
STORE_IMM_ADDR_L((uintptr_t)&cpu_state.flags_op, FLAGS_INC8);
|
|
STORE_HOST_REG_ADDR_BL((uintptr_t)&cpu_state.flags_res, host_reg);
|
|
break;
|
|
case 0x08: /*DEC*/
|
|
STORE_HOST_REG_ADDR_BL((uintptr_t)&cpu_state.flags_op1, host_reg);
|
|
SUB_HOST_REG_IMM_B(host_reg, 1);
|
|
STORE_IMM_ADDR_L((uintptr_t)&cpu_state.flags_op2, 1);
|
|
STORE_IMM_ADDR_L((uintptr_t)&cpu_state.flags_op, FLAGS_DEC8);
|
|
STORE_HOST_REG_ADDR_BL((uintptr_t)&cpu_state.flags_res, host_reg);
|
|
break;
|
|
}
|
|
|
|
if ((fetchdat & 0xc0) == 0xc0)
|
|
STORE_REG_B_RELEASE(host_reg);
|
|
else
|
|
{
|
|
LOAD_EA();
|
|
MEM_STORE_ADDR_EA_B_NO_ABRT(target_seg, host_reg);
|
|
}
|
|
codegen_flags_changed = 1;
|
|
|
|
return op_pc + 1;
|
|
}
|
|
static uint32_t codegen_temp;
|
|
static uint32_t ropFF_16(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
|
|
{
|
|
x86seg *target_seg = NULL;
|
|
int host_reg;
|
|
|
|
if ((fetchdat & 0x30) != 0x00 && (fetchdat & 0x08))
|
|
return 0;
|
|
|
|
if ((fetchdat & 0x30) == 0x00)
|
|
CALL_FUNC((uintptr_t)flags_rebuild_c);
|
|
|
|
if ((fetchdat & 0xc0) == 0xc0)
|
|
host_reg = LOAD_REG_W(fetchdat & 7);
|
|
else
|
|
{
|
|
target_seg = FETCH_EA(op_ea_seg, fetchdat, op_ssegs, &op_pc, op_32);
|
|
STORE_IMM_ADDR_L((uintptr_t)&cpu_state.oldpc, op_old_pc);
|
|
|
|
if ((fetchdat & 0x30) != 0x00)
|
|
{
|
|
MEM_LOAD_ADDR_EA_W(target_seg);
|
|
host_reg = 0;
|
|
}
|
|
else
|
|
{
|
|
SAVE_EA();
|
|
MEM_CHECK_WRITE_W(target_seg);
|
|
host_reg = MEM_LOAD_ADDR_EA_W_NO_ABRT(target_seg);
|
|
}
|
|
}
|
|
|
|
switch (fetchdat & 0x38)
|
|
{
|
|
case 0x00: /*INC*/
|
|
STORE_HOST_REG_ADDR_WL((uintptr_t)&cpu_state.flags_op1, host_reg);
|
|
ADD_HOST_REG_IMM_W(host_reg, 1);
|
|
STORE_IMM_ADDR_L((uintptr_t)&cpu_state.flags_op2, 1);
|
|
STORE_IMM_ADDR_L((uintptr_t)&cpu_state.flags_op, FLAGS_INC16);
|
|
STORE_HOST_REG_ADDR_WL((uintptr_t)&cpu_state.flags_res, host_reg);
|
|
if ((fetchdat & 0xc0) == 0xc0)
|
|
STORE_REG_W_RELEASE(host_reg);
|
|
else
|
|
{
|
|
LOAD_EA();
|
|
MEM_STORE_ADDR_EA_W_NO_ABRT(target_seg, host_reg);
|
|
}
|
|
codegen_flags_changed = 1;
|
|
return op_pc + 1;
|
|
case 0x08: /*DEC*/
|
|
STORE_HOST_REG_ADDR_WL((uintptr_t)&cpu_state.flags_op1, host_reg);
|
|
SUB_HOST_REG_IMM_W(host_reg, 1);
|
|
STORE_IMM_ADDR_L((uintptr_t)&cpu_state.flags_op2, 1);
|
|
STORE_IMM_ADDR_L((uintptr_t)&cpu_state.flags_op, FLAGS_DEC16);
|
|
STORE_HOST_REG_ADDR_WL((uintptr_t)&cpu_state.flags_res, host_reg);
|
|
if ((fetchdat & 0xc0) == 0xc0)
|
|
STORE_REG_W_RELEASE(host_reg);
|
|
else
|
|
{
|
|
LOAD_EA();
|
|
MEM_STORE_ADDR_EA_W_NO_ABRT(target_seg, host_reg);
|
|
}
|
|
codegen_flags_changed = 1;
|
|
return op_pc + 1;
|
|
|
|
case 0x10: /*CALL*/
|
|
STORE_HOST_REG_ADDR_W((uintptr_t)&codegen_temp, host_reg);
|
|
RELEASE_REG(host_reg);
|
|
|
|
STORE_IMM_ADDR_L((uintptr_t)&cpu_state.oldpc, op_old_pc);
|
|
LOAD_STACK_TO_EA(-2);
|
|
host_reg = LOAD_REG_IMM(op_pc + 1);
|
|
MEM_STORE_ADDR_EA_W(&cpu_state.seg_ss, host_reg);
|
|
SP_MODIFY(-2);
|
|
|
|
host_reg = LOAD_VAR_W((uintptr_t)&codegen_temp);
|
|
STORE_HOST_REG_ADDR_W((uintptr_t)&cpu_state.pc, host_reg);
|
|
return -1;
|
|
|
|
case 0x20: /*JMP*/
|
|
STORE_HOST_REG_ADDR((uintptr_t)&cpu_state.pc, host_reg);
|
|
return -1;
|
|
|
|
case 0x30: /*PUSH*/
|
|
if (!host_reg)
|
|
host_reg = LOAD_HOST_REG(host_reg);
|
|
STORE_IMM_ADDR_L((uintptr_t)&cpu_state.oldpc, op_old_pc);
|
|
LOAD_STACK_TO_EA(-2);
|
|
MEM_STORE_ADDR_EA_W(&cpu_state.seg_ss, host_reg);
|
|
SP_MODIFY(-2);
|
|
return op_pc + 1;
|
|
}
|
|
return 0;
|
|
}
|
|
static uint32_t ropFF_32(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
|
|
{
|
|
x86seg *target_seg = NULL;
|
|
int host_reg;
|
|
|
|
if ((fetchdat & 0x30) != 0x00 && (fetchdat & 0x08))
|
|
return 0;
|
|
|
|
if ((fetchdat & 0x30) == 0x00)
|
|
CALL_FUNC((uintptr_t)flags_rebuild_c);
|
|
|
|
if ((fetchdat & 0xc0) == 0xc0)
|
|
host_reg = LOAD_REG_L(fetchdat & 7);
|
|
else
|
|
{
|
|
target_seg = FETCH_EA(op_ea_seg, fetchdat, op_ssegs, &op_pc, op_32);
|
|
STORE_IMM_ADDR_L((uintptr_t)&cpu_state.oldpc, op_old_pc);
|
|
|
|
if ((fetchdat & 0x30) != 0x00)
|
|
{
|
|
MEM_LOAD_ADDR_EA_L(target_seg);
|
|
host_reg = 0;
|
|
}
|
|
else
|
|
{
|
|
SAVE_EA();
|
|
MEM_CHECK_WRITE_L(target_seg);
|
|
host_reg = MEM_LOAD_ADDR_EA_L_NO_ABRT(target_seg);
|
|
}
|
|
}
|
|
|
|
switch (fetchdat & 0x38)
|
|
{
|
|
case 0x00: /*INC*/
|
|
STORE_HOST_REG_ADDR((uintptr_t)&cpu_state.flags_op1, host_reg);
|
|
ADD_HOST_REG_IMM(host_reg, 1);
|
|
STORE_IMM_ADDR_L((uintptr_t)&cpu_state.flags_op2, 1);
|
|
STORE_IMM_ADDR_L((uintptr_t)&cpu_state.flags_op, FLAGS_INC32);
|
|
STORE_HOST_REG_ADDR((uintptr_t)&cpu_state.flags_res, host_reg);
|
|
if ((fetchdat & 0xc0) == 0xc0)
|
|
STORE_REG_L_RELEASE(host_reg);
|
|
else
|
|
{
|
|
LOAD_EA();
|
|
MEM_STORE_ADDR_EA_L_NO_ABRT(target_seg, host_reg);
|
|
}
|
|
codegen_flags_changed = 1;
|
|
return op_pc + 1;
|
|
case 0x08: /*DEC*/
|
|
STORE_HOST_REG_ADDR((uintptr_t)&cpu_state.flags_op1, host_reg);
|
|
SUB_HOST_REG_IMM(host_reg, 1);
|
|
STORE_IMM_ADDR_L((uintptr_t)&cpu_state.flags_op2, 1);
|
|
STORE_IMM_ADDR_L((uintptr_t)&cpu_state.flags_op, FLAGS_DEC32);
|
|
STORE_HOST_REG_ADDR((uintptr_t)&cpu_state.flags_res, host_reg);
|
|
if ((fetchdat & 0xc0) == 0xc0)
|
|
STORE_REG_L_RELEASE(host_reg);
|
|
else
|
|
{
|
|
LOAD_EA();
|
|
MEM_STORE_ADDR_EA_L_NO_ABRT(target_seg, host_reg);
|
|
}
|
|
codegen_flags_changed = 1;
|
|
return op_pc + 1;
|
|
|
|
case 0x10: /*CALL*/
|
|
STORE_HOST_REG_ADDR((uintptr_t)&codegen_temp, host_reg);
|
|
RELEASE_REG(host_reg);
|
|
|
|
STORE_IMM_ADDR_L((uintptr_t)&cpu_state.oldpc, op_old_pc);
|
|
LOAD_STACK_TO_EA(-4);
|
|
host_reg = LOAD_REG_IMM(op_pc + 1);
|
|
MEM_STORE_ADDR_EA_L(&cpu_state.seg_ss, host_reg);
|
|
SP_MODIFY(-4);
|
|
|
|
host_reg = LOAD_VAR_L((uintptr_t)&codegen_temp);
|
|
STORE_HOST_REG_ADDR((uintptr_t)&cpu_state.pc, host_reg);
|
|
return -1;
|
|
|
|
case 0x20: /*JMP*/
|
|
STORE_HOST_REG_ADDR((uintptr_t)&cpu_state.pc, host_reg);
|
|
return -1;
|
|
|
|
case 0x30: /*PUSH*/
|
|
if (!host_reg)
|
|
host_reg = LOAD_HOST_REG(host_reg);
|
|
STORE_IMM_ADDR_L((uintptr_t)&cpu_state.oldpc, op_old_pc);
|
|
LOAD_STACK_TO_EA(-4);
|
|
MEM_STORE_ADDR_EA_L(&cpu_state.seg_ss, host_reg);
|
|
SP_MODIFY(-4);
|
|
return op_pc + 1;
|
|
}
|
|
return 0;
|
|
}
|