552a87ea3d
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.
285 lines
7.9 KiB
C
285 lines
7.9 KiB
C
static int opCMC(uint32_t fetchdat)
|
|
{
|
|
flags_rebuild();
|
|
cpu_state.flags ^= C_FLAG;
|
|
CLOCK_CYCLES(2);
|
|
PREFETCH_RUN(2, 1, -1, 0,0,0,0, 0);
|
|
return 0;
|
|
}
|
|
|
|
|
|
static int opCLC(uint32_t fetchdat)
|
|
{
|
|
flags_rebuild();
|
|
cpu_state.flags &= ~C_FLAG;
|
|
CLOCK_CYCLES(2);
|
|
PREFETCH_RUN(2, 1, -1, 0,0,0,0, 0);
|
|
return 0;
|
|
}
|
|
static int opCLD(uint32_t fetchdat)
|
|
{
|
|
cpu_state.flags &= ~D_FLAG;
|
|
CLOCK_CYCLES(2);
|
|
PREFETCH_RUN(2, 1, -1, 0,0,0,0, 0);
|
|
return 0;
|
|
}
|
|
static int opCLI(uint32_t fetchdat)
|
|
{
|
|
if (!IOPLp)
|
|
{
|
|
if ((!(cpu_state.eflags & VM_FLAG) && (cr4 & CR4_PVI)) ||
|
|
((cpu_state.eflags & VM_FLAG) && (cr4 & CR4_VME)))
|
|
{
|
|
cpu_state.eflags &= ~VIF_FLAG;
|
|
}
|
|
else
|
|
{
|
|
x86gpf(NULL,0);
|
|
return 1;
|
|
}
|
|
}
|
|
else
|
|
cpu_state.flags &= ~I_FLAG;
|
|
|
|
CLOCK_CYCLES(3);
|
|
PREFETCH_RUN(3, 1, -1, 0,0,0,0, 0);
|
|
return 0;
|
|
}
|
|
|
|
static int opSTC(uint32_t fetchdat)
|
|
{
|
|
flags_rebuild();
|
|
cpu_state.flags |= C_FLAG;
|
|
CLOCK_CYCLES(2);
|
|
PREFETCH_RUN(2, 1, -1, 0,0,0,0, 0);
|
|
return 0;
|
|
}
|
|
static int opSTD(uint32_t fetchdat)
|
|
{
|
|
cpu_state.flags |= D_FLAG;
|
|
CLOCK_CYCLES(2);
|
|
PREFETCH_RUN(2, 1, -1, 0,0,0,0, 0);
|
|
return 0;
|
|
}
|
|
static int opSTI(uint32_t fetchdat)
|
|
{
|
|
if (!IOPLp)
|
|
{
|
|
if ((!(cpu_state.eflags & VM_FLAG) && (cr4 & CR4_PVI)) ||
|
|
((cpu_state.eflags & VM_FLAG) && (cr4 & CR4_VME)))
|
|
{
|
|
if (cpu_state.eflags & VIP_FLAG)
|
|
{
|
|
x86gpf(NULL,0);
|
|
return 1;
|
|
}
|
|
else
|
|
cpu_state.eflags |= VIF_FLAG;
|
|
}
|
|
else
|
|
{
|
|
x86gpf(NULL,0);
|
|
return 1;
|
|
}
|
|
}
|
|
else
|
|
cpu_state.flags |= I_FLAG;
|
|
|
|
CPU_BLOCK_END();
|
|
|
|
CLOCK_CYCLES(2);
|
|
PREFETCH_RUN(2, 1, -1, 0,0,0,0, 0);
|
|
return 0;
|
|
}
|
|
|
|
static int opSAHF(uint32_t fetchdat)
|
|
{
|
|
flags_rebuild();
|
|
cpu_state.flags = (cpu_state.flags & 0xff00) | (AH & 0xd5) | 2;
|
|
CLOCK_CYCLES(3);
|
|
PREFETCH_RUN(3, 1, -1, 0,0,0,0, 0);
|
|
|
|
#if 0
|
|
codegen_flags_changed = 0;
|
|
#endif
|
|
|
|
return 0;
|
|
}
|
|
static int opLAHF(uint32_t fetchdat)
|
|
{
|
|
flags_rebuild();
|
|
AH = cpu_state.flags & 0xff;
|
|
CLOCK_CYCLES(3);
|
|
PREFETCH_RUN(3, 1, -1, 0,0,0,0, 0);
|
|
return 0;
|
|
}
|
|
|
|
static int opPUSHF(uint32_t fetchdat)
|
|
{
|
|
if ((cpu_state.eflags & VM_FLAG) && (IOPL < 3))
|
|
{
|
|
if (cr4 & CR4_VME)
|
|
{
|
|
uint16_t temp;
|
|
|
|
flags_rebuild();
|
|
temp = (cpu_state.flags & ~I_FLAG) | 0x3000;
|
|
if (cpu_state.eflags & VIF_FLAG)
|
|
temp |= I_FLAG;
|
|
PUSH_W(temp);
|
|
}
|
|
else
|
|
{
|
|
x86gpf(NULL,0);
|
|
return 1;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
flags_rebuild();
|
|
PUSH_W(cpu_state.flags);
|
|
}
|
|
CLOCK_CYCLES(4);
|
|
PREFETCH_RUN(4, 1, -1, 0,0,1,0, 0);
|
|
return cpu_state.abrt;
|
|
}
|
|
static int opPUSHFD(uint32_t fetchdat)
|
|
{
|
|
uint16_t tempw;
|
|
if ((cpu_state.eflags & VM_FLAG) && (IOPL < 3))
|
|
{
|
|
x86gpf(NULL, 0);
|
|
return 1;
|
|
}
|
|
if (cpu_CR4_mask & CR4_VME) tempw = cpu_state.eflags & 0x3c;
|
|
else if (CPUID) tempw = cpu_state.eflags & 0x24;
|
|
else tempw = cpu_state.eflags & 4;
|
|
flags_rebuild();
|
|
PUSH_L(cpu_state.flags | (tempw << 16));
|
|
CLOCK_CYCLES(4);
|
|
PREFETCH_RUN(4, 1, -1, 0,0,0,1, 0);
|
|
return cpu_state.abrt;
|
|
}
|
|
|
|
static int opPOPF_286(uint32_t fetchdat)
|
|
{
|
|
uint16_t tempw;
|
|
|
|
if ((cpu_state.eflags & VM_FLAG) && (IOPL < 3))
|
|
{
|
|
x86gpf(NULL, 0);
|
|
return 1;
|
|
}
|
|
|
|
tempw = POP_W(); if (cpu_state.abrt) return 1;
|
|
|
|
if (!(msw & 1)) cpu_state.flags = (cpu_state.flags & 0x7000) | (tempw & 0x0fd5) | 2;
|
|
else if (!(CPL)) cpu_state.flags = (tempw & 0x7fd5) | 2;
|
|
else if (IOPLp) cpu_state.flags = (cpu_state.flags & 0x3000) | (tempw & 0x4fd5) | 2;
|
|
else cpu_state.flags = (cpu_state.flags & 0x3200) | (tempw & 0x4dd5) | 2;
|
|
flags_extract();
|
|
|
|
CLOCK_CYCLES(5);
|
|
PREFETCH_RUN(5, 1, -1, 1,0,0,0, 0);
|
|
|
|
#if 0
|
|
codegen_flags_changed = 0;
|
|
#endif
|
|
|
|
return 0;
|
|
}
|
|
static int opPOPF(uint32_t fetchdat)
|
|
{
|
|
uint16_t tempw;
|
|
|
|
if ((cpu_state.eflags & VM_FLAG) && (IOPL < 3))
|
|
{
|
|
if (cr4 & CR4_VME)
|
|
{
|
|
uint32_t old_esp = ESP;
|
|
|
|
tempw = POP_W();
|
|
if (cpu_state.abrt)
|
|
{
|
|
|
|
ESP = old_esp;
|
|
return 1;
|
|
}
|
|
|
|
if ((tempw & T_FLAG) || ((tempw & I_FLAG) && (cpu_state.eflags & VIP_FLAG)))
|
|
{
|
|
ESP = old_esp;
|
|
x86gpf(NULL, 0);
|
|
return 1;
|
|
}
|
|
if (tempw & I_FLAG)
|
|
cpu_state.eflags |= VIF_FLAG;
|
|
else
|
|
cpu_state.eflags &= ~VIF_FLAG;
|
|
cpu_state.flags = (cpu_state.flags & 0x3200) | (tempw & 0x4dd5) | 2;
|
|
}
|
|
else
|
|
{
|
|
x86gpf(NULL, 0);
|
|
return 1;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
tempw = POP_W();
|
|
if (cpu_state.abrt)
|
|
return 1;
|
|
|
|
if (!(CPL) || !(msw & 1))
|
|
cpu_state.flags = (tempw & 0x7fd5) | 2;
|
|
else if (IOPLp)
|
|
cpu_state.flags = (cpu_state.flags & 0x3000) | (tempw & 0x4fd5) | 2;
|
|
else
|
|
cpu_state.flags = (cpu_state.flags & 0x3200) | (tempw & 0x4dd5) | 2;
|
|
}
|
|
flags_extract();
|
|
|
|
CLOCK_CYCLES(5);
|
|
PREFETCH_RUN(5, 1, -1, 1,0,0,0, 0);
|
|
|
|
#if 0
|
|
codegen_flags_changed = 0;
|
|
#endif
|
|
|
|
return 0;
|
|
}
|
|
static int opPOPFD(uint32_t fetchdat)
|
|
{
|
|
uint32_t templ;
|
|
|
|
if ((cpu_state.eflags & VM_FLAG) && (IOPL < 3))
|
|
{
|
|
x86gpf(NULL, 0);
|
|
return 1;
|
|
}
|
|
|
|
templ = POP_L(); if (cpu_state.abrt) return 1;
|
|
|
|
if (!(CPL) || !(msw & 1)) cpu_state.flags = (templ & 0x7fd5) | 2;
|
|
else if (IOPLp) cpu_state.flags = (cpu_state.flags & 0x3000) | (templ & 0x4fd5) | 2;
|
|
else cpu_state.flags = (cpu_state.flags & 0x3200) | (templ & 0x4dd5) | 2;
|
|
|
|
templ &= is486 ? 0x3c0000 : 0;
|
|
templ |= ((cpu_state.eflags&3) << 16);
|
|
if (cpu_CR4_mask & CR4_VME) cpu_state.eflags = (templ >> 16) & 0x3f;
|
|
else if (CPUID) cpu_state.eflags = (templ >> 16) & 0x27;
|
|
else if (is486) cpu_state.eflags = (templ >> 16) & 7;
|
|
else cpu_state.eflags = (templ >> 16) & 3;
|
|
|
|
flags_extract();
|
|
|
|
CLOCK_CYCLES(5);
|
|
PREFETCH_RUN(5, 1, -1, 0,1,0,0, 0);
|
|
|
|
#if 0
|
|
codegen_flags_changed = 0;
|
|
#endif
|
|
|
|
return 0;
|
|
}
|