mirror of
https://github.com/86Box/86Box.git
synced 2026-02-24 10:28:19 -07:00
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.
359 lines
11 KiB
C
359 lines
11 KiB
C
#define cond_O ( VF_SET())
|
|
#define cond_NO (!VF_SET())
|
|
#define cond_B ( CF_SET())
|
|
#define cond_NB (!CF_SET())
|
|
#define cond_E ( ZF_SET())
|
|
#define cond_NE (!ZF_SET())
|
|
#define cond_BE ( CF_SET() || ZF_SET())
|
|
#define cond_NBE (!CF_SET() && !ZF_SET())
|
|
#define cond_S ( NF_SET())
|
|
#define cond_NS (!NF_SET())
|
|
#define cond_P ( PF_SET())
|
|
#define cond_NP (!PF_SET())
|
|
#define cond_L (((NF_SET()) ? 1 : 0) != ((VF_SET()) ? 1 : 0))
|
|
#define cond_NL (((NF_SET()) ? 1 : 0) == ((VF_SET()) ? 1 : 0))
|
|
#define cond_LE (((NF_SET()) ? 1 : 0) != ((VF_SET()) ? 1 : 0) || (ZF_SET()))
|
|
#define cond_NLE (((NF_SET()) ? 1 : 0) == ((VF_SET()) ? 1 : 0) && (!ZF_SET()))
|
|
|
|
#define opJ(condition) \
|
|
static int opJ ## condition(uint32_t fetchdat) \
|
|
{ \
|
|
int8_t offset = (int8_t)getbytef(); \
|
|
CLOCK_CYCLES(timing_bnt); \
|
|
if (cond_ ## condition) \
|
|
{ \
|
|
cpu_state.pc += offset; \
|
|
CLOCK_CYCLES_ALWAYS(timing_bt); \
|
|
CPU_BLOCK_END(); \
|
|
PREFETCH_RUN(timing_bt+timing_bnt, 2, -1, 0,0,0,0, 0); \
|
|
PREFETCH_FLUSH(); \
|
|
return 1; \
|
|
} \
|
|
PREFETCH_RUN(timing_bnt, 2, -1, 0,0,0,0, 0); \
|
|
return 0; \
|
|
} \
|
|
\
|
|
static int opJ ## condition ## _w(uint32_t fetchdat) \
|
|
{ \
|
|
int16_t offset = (int16_t)getwordf(); \
|
|
CLOCK_CYCLES(timing_bnt); \
|
|
if (cond_ ## condition) \
|
|
{ \
|
|
cpu_state.pc += offset; \
|
|
CLOCK_CYCLES_ALWAYS(timing_bt); \
|
|
CPU_BLOCK_END(); \
|
|
PREFETCH_RUN(timing_bt+timing_bnt, 3, -1, 0,0,0,0, 0); \
|
|
PREFETCH_FLUSH(); \
|
|
return 1; \
|
|
} \
|
|
PREFETCH_RUN(timing_bnt, 3, -1, 0,0,0,0, 0); \
|
|
return 0; \
|
|
} \
|
|
\
|
|
static int opJ ## condition ## _l(uint32_t fetchdat) \
|
|
{ \
|
|
uint32_t offset = getlong(); if (cpu_state.abrt) return 1; \
|
|
CLOCK_CYCLES(timing_bnt); \
|
|
if (cond_ ## condition) \
|
|
{ \
|
|
cpu_state.pc += offset; \
|
|
CLOCK_CYCLES_ALWAYS(timing_bt); \
|
|
CPU_BLOCK_END(); \
|
|
PREFETCH_RUN(timing_bt+timing_bnt, 5, -1, 0,0,0,0, 0); \
|
|
PREFETCH_FLUSH(); \
|
|
return 1; \
|
|
} \
|
|
PREFETCH_RUN(timing_bnt, 5, -1, 0,0,0,0, 0); \
|
|
return 0; \
|
|
} \
|
|
|
|
opJ(O)
|
|
opJ(NO)
|
|
opJ(B)
|
|
opJ(NB)
|
|
opJ(E)
|
|
opJ(NE)
|
|
opJ(BE)
|
|
opJ(NBE)
|
|
opJ(S)
|
|
opJ(NS)
|
|
opJ(P)
|
|
opJ(NP)
|
|
opJ(L)
|
|
opJ(NL)
|
|
opJ(LE)
|
|
opJ(NLE)
|
|
|
|
|
|
|
|
static int opLOOPNE_w(uint32_t fetchdat)
|
|
{
|
|
int8_t offset = (int8_t)getbytef();
|
|
CX--;
|
|
CLOCK_CYCLES((is486) ? 7 : 11);
|
|
PREFETCH_RUN(11, 2, -1, 0,0,0,0, 0);
|
|
if (CX && !ZF_SET())
|
|
{
|
|
cpu_state.pc += offset;
|
|
CPU_BLOCK_END();
|
|
PREFETCH_FLUSH();
|
|
return 1;
|
|
}
|
|
return 0;
|
|
}
|
|
static int opLOOPNE_l(uint32_t fetchdat)
|
|
{
|
|
int8_t offset = (int8_t)getbytef();
|
|
ECX--;
|
|
CLOCK_CYCLES((is486) ? 7 : 11);
|
|
PREFETCH_RUN(11, 2, -1, 0,0,0,0, 0);
|
|
if (ECX && !ZF_SET())
|
|
{
|
|
cpu_state.pc += offset;
|
|
CPU_BLOCK_END();
|
|
PREFETCH_FLUSH();
|
|
return 1;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static int opLOOPE_w(uint32_t fetchdat)
|
|
{
|
|
int8_t offset = (int8_t)getbytef();
|
|
CX--;
|
|
CLOCK_CYCLES((is486) ? 7 : 11);
|
|
PREFETCH_RUN(11, 2, -1, 0,0,0,0, 0);
|
|
if (CX && ZF_SET())
|
|
{
|
|
cpu_state.pc += offset;
|
|
CPU_BLOCK_END();
|
|
PREFETCH_FLUSH();
|
|
return 1;
|
|
}
|
|
return 0;
|
|
}
|
|
static int opLOOPE_l(uint32_t fetchdat)
|
|
{
|
|
int8_t offset = (int8_t)getbytef();
|
|
ECX--;
|
|
CLOCK_CYCLES((is486) ? 7 : 11);
|
|
PREFETCH_RUN(11, 2, -1, 0,0,0,0, 0);
|
|
if (ECX && ZF_SET())
|
|
{
|
|
cpu_state.pc += offset;
|
|
CPU_BLOCK_END();
|
|
PREFETCH_FLUSH();
|
|
return 1;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static int opLOOP_w(uint32_t fetchdat)
|
|
{
|
|
int8_t offset = (int8_t)getbytef();
|
|
CX--;
|
|
CLOCK_CYCLES((is486) ? 7 : 11);
|
|
PREFETCH_RUN(11, 2, -1, 0,0,0,0, 0);
|
|
if (CX)
|
|
{
|
|
cpu_state.pc += offset;
|
|
CPU_BLOCK_END();
|
|
PREFETCH_FLUSH();
|
|
return 1;
|
|
}
|
|
return 0;
|
|
}
|
|
static int opLOOP_l(uint32_t fetchdat)
|
|
{
|
|
int8_t offset = (int8_t)getbytef();
|
|
ECX--;
|
|
CLOCK_CYCLES((is486) ? 7 : 11);
|
|
PREFETCH_RUN(11, 2, -1, 0,0,0,0, 0);
|
|
if (ECX)
|
|
{
|
|
cpu_state.pc += offset;
|
|
CPU_BLOCK_END();
|
|
PREFETCH_FLUSH();
|
|
return 1;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static int opJCXZ(uint32_t fetchdat)
|
|
{
|
|
int8_t offset = (int8_t)getbytef();
|
|
CLOCK_CYCLES(5);
|
|
if (!CX)
|
|
{
|
|
cpu_state.pc += offset;
|
|
CLOCK_CYCLES(4);
|
|
CPU_BLOCK_END();
|
|
PREFETCH_RUN(9, 2, -1, 0,0,0,0, 0);
|
|
PREFETCH_FLUSH();
|
|
return 1;
|
|
}
|
|
PREFETCH_RUN(5, 2, -1, 0,0,0,0, 0);
|
|
return 0;
|
|
}
|
|
static int opJECXZ(uint32_t fetchdat)
|
|
{
|
|
int8_t offset = (int8_t)getbytef();
|
|
CLOCK_CYCLES(5);
|
|
if (!ECX)
|
|
{
|
|
cpu_state.pc += offset;
|
|
CLOCK_CYCLES(4);
|
|
CPU_BLOCK_END();
|
|
PREFETCH_RUN(9, 2, -1, 0,0,0,0, 0);
|
|
PREFETCH_FLUSH();
|
|
return 1;
|
|
}
|
|
PREFETCH_RUN(5, 2, -1, 0,0,0,0, 0);
|
|
return 0;
|
|
}
|
|
|
|
|
|
static int opJMP_r8(uint32_t fetchdat)
|
|
{
|
|
int8_t offset = (int8_t)getbytef();
|
|
cpu_state.pc += offset;
|
|
CPU_BLOCK_END();
|
|
CLOCK_CYCLES((is486) ? 3 : 7);
|
|
PREFETCH_RUN(7, 2, -1, 0,0,0,0, 0);
|
|
PREFETCH_FLUSH();
|
|
return 0;
|
|
}
|
|
static int opJMP_r16(uint32_t fetchdat)
|
|
{
|
|
int16_t offset = (int16_t)getwordf();
|
|
cpu_state.pc += offset;
|
|
CPU_BLOCK_END();
|
|
CLOCK_CYCLES((is486) ? 3 : 7);
|
|
PREFETCH_RUN(7, 3, -1, 0,0,0,0, 0);
|
|
PREFETCH_FLUSH();
|
|
return 0;
|
|
}
|
|
static int opJMP_r32(uint32_t fetchdat)
|
|
{
|
|
int32_t offset = (int32_t)getlong(); if (cpu_state.abrt) return 1;
|
|
cpu_state.pc += offset;
|
|
CPU_BLOCK_END();
|
|
CLOCK_CYCLES((is486) ? 3 : 7);
|
|
PREFETCH_RUN(7, 5, -1, 0,0,0,0, 0);
|
|
PREFETCH_FLUSH();
|
|
return 0;
|
|
}
|
|
|
|
static int opJMP_far_a16(uint32_t fetchdat)
|
|
{
|
|
uint16_t addr, seg;
|
|
uint32_t old_pc;
|
|
addr = getwordf();
|
|
seg = getword(); if (cpu_state.abrt) return 1;
|
|
old_pc = cpu_state.pc;
|
|
cpu_state.pc = addr;
|
|
loadcsjmp(seg, old_pc);
|
|
CPU_BLOCK_END();
|
|
PREFETCH_RUN(11, 5, -1, 0,0,0,0, 0);
|
|
PREFETCH_FLUSH();
|
|
return 0;
|
|
}
|
|
static int opJMP_far_a32(uint32_t fetchdat)
|
|
{
|
|
uint16_t seg;
|
|
uint32_t addr, old_pc;
|
|
addr = getlong();
|
|
seg = getword(); if (cpu_state.abrt) return 1;
|
|
old_pc = cpu_state.pc;
|
|
cpu_state.pc = addr;
|
|
loadcsjmp(seg, old_pc);
|
|
CPU_BLOCK_END();
|
|
PREFETCH_RUN(11, 7, -1, 0,0,0,0, 0);
|
|
PREFETCH_FLUSH();
|
|
return 0;
|
|
}
|
|
|
|
static int opCALL_r16(uint32_t fetchdat)
|
|
{
|
|
int16_t addr = (int16_t)getwordf();
|
|
PUSH_W(cpu_state.pc);
|
|
cpu_state.pc += addr;
|
|
CPU_BLOCK_END();
|
|
CLOCK_CYCLES((is486) ? 3 : 7);
|
|
PREFETCH_RUN(7, 3, -1, 0,0,1,0, 0);
|
|
PREFETCH_FLUSH();
|
|
return 0;
|
|
}
|
|
static int opCALL_r32(uint32_t fetchdat)
|
|
{
|
|
int32_t addr = getlong(); if (cpu_state.abrt) return 1;
|
|
PUSH_L(cpu_state.pc);
|
|
cpu_state.pc += addr;
|
|
CPU_BLOCK_END();
|
|
CLOCK_CYCLES((is486) ? 3 : 7);
|
|
PREFETCH_RUN(7, 5, -1, 0,0,0,1, 0);
|
|
PREFETCH_FLUSH();
|
|
return 0;
|
|
}
|
|
|
|
static int opRET_w(uint32_t fetchdat)
|
|
{
|
|
uint16_t ret;
|
|
|
|
ret = POP_W(); if (cpu_state.abrt) return 1;
|
|
cpu_state.pc = ret;
|
|
CPU_BLOCK_END();
|
|
|
|
CLOCK_CYCLES((is486) ? 5 : 10);
|
|
PREFETCH_RUN(10, 1, -1, 1,0,0,0, 0);
|
|
PREFETCH_FLUSH();
|
|
return 0;
|
|
}
|
|
static int opRET_l(uint32_t fetchdat)
|
|
{
|
|
uint32_t ret;
|
|
|
|
ret = POP_L(); if (cpu_state.abrt) return 1;
|
|
cpu_state.pc = ret;
|
|
CPU_BLOCK_END();
|
|
|
|
CLOCK_CYCLES((is486) ? 5 : 10);
|
|
PREFETCH_RUN(10, 1, -1, 0,1,0,0, 0);
|
|
PREFETCH_FLUSH();
|
|
return 0;
|
|
}
|
|
|
|
static int opRET_w_imm(uint32_t fetchdat)
|
|
{
|
|
uint16_t ret;
|
|
uint16_t offset = getwordf();
|
|
|
|
ret = POP_W(); if (cpu_state.abrt) return 1;
|
|
if (stack32) ESP += offset;
|
|
else SP += offset;
|
|
cpu_state.pc = ret;
|
|
CPU_BLOCK_END();
|
|
|
|
CLOCK_CYCLES((is486) ? 5 : 10);
|
|
PREFETCH_RUN(10, 5, -1, 1,0,0,0, 0);
|
|
PREFETCH_FLUSH();
|
|
return 0;
|
|
}
|
|
static int opRET_l_imm(uint32_t fetchdat)
|
|
{
|
|
uint32_t ret;
|
|
uint16_t offset = getwordf();
|
|
|
|
ret = POP_L(); if (cpu_state.abrt) return 1;
|
|
if (stack32) ESP += offset;
|
|
else SP += offset;
|
|
cpu_state.pc = ret;
|
|
CPU_BLOCK_END();
|
|
|
|
CLOCK_CYCLES((is486) ? 5 : 10);
|
|
PREFETCH_RUN(10, 5, -1, 0,1,0,0, 0);
|
|
PREFETCH_FLUSH();
|
|
return 0;
|
|
}
|
|
|