Added the IBM 5161 ISA expansion for PC and XT;
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.
2019-09-20 14:02:30 +02:00
|
|
|
static int opARPL_a16(uint32_t fetchdat)
|
|
|
|
|
{
|
|
|
|
|
uint16_t temp_seg;
|
|
|
|
|
|
|
|
|
|
NOTRM
|
|
|
|
|
fetch_ea_16(fetchdat);
|
|
|
|
|
if (cpu_mod != 3)
|
|
|
|
|
SEG_CHECK_WRITE(cpu_state.ea_seg);
|
|
|
|
|
temp_seg = geteaw(); if (cpu_state.abrt) return 1;
|
|
|
|
|
|
|
|
|
|
flags_rebuild();
|
|
|
|
|
if ((temp_seg & 3) < (cpu_state.regs[cpu_reg].w & 3))
|
|
|
|
|
{
|
|
|
|
|
temp_seg = (temp_seg & 0xfffc) | (cpu_state.regs[cpu_reg].w & 3);
|
|
|
|
|
seteaw(temp_seg); if (cpu_state.abrt) return 1;
|
|
|
|
|
cpu_state.flags |= Z_FLAG;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
cpu_state.flags &= ~Z_FLAG;
|
|
|
|
|
|
|
|
|
|
CLOCK_CYCLES(is486 ? 9 : 20);
|
|
|
|
|
PREFETCH_RUN(is486 ? 9 : 20, 2, rmdat, 1,0,1,0, 0);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
static int opARPL_a32(uint32_t fetchdat)
|
|
|
|
|
{
|
|
|
|
|
uint16_t temp_seg;
|
|
|
|
|
|
|
|
|
|
NOTRM
|
|
|
|
|
fetch_ea_32(fetchdat);
|
|
|
|
|
if (cpu_mod != 3)
|
|
|
|
|
SEG_CHECK_WRITE(cpu_state.ea_seg);
|
|
|
|
|
temp_seg = geteaw(); if (cpu_state.abrt) return 1;
|
|
|
|
|
|
|
|
|
|
flags_rebuild();
|
|
|
|
|
if ((temp_seg & 3) < (cpu_state.regs[cpu_reg].w & 3))
|
|
|
|
|
{
|
|
|
|
|
temp_seg = (temp_seg & 0xfffc) | (cpu_state.regs[cpu_reg].w & 3);
|
|
|
|
|
seteaw(temp_seg); if (cpu_state.abrt) return 1;
|
|
|
|
|
cpu_state.flags |= Z_FLAG;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
cpu_state.flags &= ~Z_FLAG;
|
|
|
|
|
|
|
|
|
|
CLOCK_CYCLES(is486 ? 9 : 20);
|
|
|
|
|
PREFETCH_RUN(is486 ? 9 : 20, 2, rmdat, 1,0,1,0, 1);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#define opLAR(name, fetch_ea, is32, ea32) \
|
|
|
|
|
static int opLAR_ ## name(uint32_t fetchdat) \
|
|
|
|
|
{ \
|
|
|
|
|
int valid; \
|
|
|
|
|
uint16_t sel, desc = 0; \
|
|
|
|
|
\
|
|
|
|
|
NOTRM \
|
|
|
|
|
fetch_ea(fetchdat); \
|
|
|
|
|
if (cpu_mod != 3) \
|
|
|
|
|
SEG_CHECK_READ(cpu_state.ea_seg); \
|
|
|
|
|
\
|
|
|
|
|
sel = geteaw(); if (cpu_state.abrt) return 1; \
|
|
|
|
|
\
|
|
|
|
|
flags_rebuild(); \
|
|
|
|
|
if (!(sel & 0xfffc)) { cpu_state.flags &= ~Z_FLAG; return 0; } /*Null selector*/ \
|
|
|
|
|
valid = (sel & ~7) < ((sel & 4) ? ldt.limit : gdt.limit); \
|
|
|
|
|
if (valid) \
|
|
|
|
|
{ \
|
|
|
|
|
cpl_override = 1; \
|
|
|
|
|
desc = readmemw(0, ((sel & 4) ? ldt.base : gdt.base) + (sel & ~7) + 4); \
|
|
|
|
|
cpl_override = 0; if (cpu_state.abrt) return 1; \
|
|
|
|
|
} \
|
|
|
|
|
cpu_state.flags &= ~Z_FLAG; \
|
|
|
|
|
if ((desc & 0x1f00) == 0x000) valid = 0; \
|
|
|
|
|
if ((desc & 0x1f00) == 0x800) valid = 0; \
|
|
|
|
|
if ((desc & 0x1f00) == 0xa00) valid = 0; \
|
|
|
|
|
if ((desc & 0x1f00) == 0xd00) valid = 0; \
|
|
|
|
|
if ((desc & 0x1c00) < 0x1c00) /*Exclude conforming code segments*/ \
|
|
|
|
|
{ \
|
|
|
|
|
int dpl = (desc >> 13) & 3; \
|
|
|
|
|
if (dpl < CPL || dpl < (sel & 3)) valid = 0; \
|
|
|
|
|
} \
|
|
|
|
|
if (valid) \
|
|
|
|
|
{ \
|
|
|
|
|
cpu_state.flags |= Z_FLAG; \
|
|
|
|
|
cpl_override = 1; \
|
|
|
|
|
if (is32) \
|
|
|
|
|
cpu_state.regs[cpu_reg].l = readmeml(0, ((sel & 4) ? ldt.base : gdt.base) + (sel & ~7) + 4) & 0xffff00; \
|
|
|
|
|
else \
|
|
|
|
|
cpu_state.regs[cpu_reg].w = readmemw(0, ((sel & 4) ? ldt.base : gdt.base) + (sel & ~7) + 4) & 0xff00; \
|
|
|
|
|
cpl_override = 0; \
|
|
|
|
|
} \
|
|
|
|
|
CLOCK_CYCLES(11); \
|
|
|
|
|
PREFETCH_RUN(11, 2, rmdat, 2,0,0,0, ea32); \
|
|
|
|
|
return cpu_state.abrt; \
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
opLAR(w_a16, fetch_ea_16, 0, 0)
|
|
|
|
|
opLAR(w_a32, fetch_ea_32, 0, 1)
|
|
|
|
|
opLAR(l_a16, fetch_ea_16, 1, 0)
|
|
|
|
|
opLAR(l_a32, fetch_ea_32, 1, 1)
|
|
|
|
|
|
|
|
|
|
#define opLSL(name, fetch_ea, is32, ea32) \
|
|
|
|
|
static int opLSL_ ## name(uint32_t fetchdat) \
|
|
|
|
|
{ \
|
|
|
|
|
int valid; \
|
|
|
|
|
uint16_t sel, desc = 0; \
|
|
|
|
|
\
|
|
|
|
|
NOTRM \
|
|
|
|
|
fetch_ea(fetchdat); \
|
|
|
|
|
if (cpu_mod != 3) \
|
|
|
|
|
SEG_CHECK_READ(cpu_state.ea_seg); \
|
|
|
|
|
\
|
|
|
|
|
sel = geteaw(); if (cpu_state.abrt) return 1; \
|
|
|
|
|
flags_rebuild(); \
|
|
|
|
|
cpu_state.flags &= ~Z_FLAG; \
|
|
|
|
|
if (!(sel & 0xfffc)) return 0; /*Null selector*/ \
|
|
|
|
|
valid = (sel & ~7) < ((sel & 4) ? ldt.limit : gdt.limit); \
|
|
|
|
|
if (valid) \
|
|
|
|
|
{ \
|
|
|
|
|
cpl_override = 1; \
|
|
|
|
|
desc = readmemw(0, ((sel & 4) ? ldt.base : gdt.base) + (sel & ~7) + 4); \
|
|
|
|
|
cpl_override = 0; if (cpu_state.abrt) return 1; \
|
|
|
|
|
} \
|
|
|
|
|
if ((desc & 0x1400) == 0x400) valid = 0; /*Interrupt or trap or call gate*/ \
|
|
|
|
|
if ((desc & 0x1f00) == 0x000) valid = 0; /*Invalid*/ \
|
|
|
|
|
if ((desc & 0x1f00) == 0xa00) valid = 0; /*Invalid*/ \
|
|
|
|
|
if ((desc & 0x1c00) != 0x1c00) /*Exclude conforming code segments*/ \
|
|
|
|
|
{ \
|
|
|
|
|
int rpl = (desc >> 13) & 3; \
|
|
|
|
|
if (rpl < CPL || rpl < (sel & 3)) valid = 0; \
|
|
|
|
|
} \
|
|
|
|
|
if (valid) \
|
|
|
|
|
{ \
|
|
|
|
|
cpu_state.flags |= Z_FLAG; \
|
|
|
|
|
cpl_override = 1; \
|
|
|
|
|
if (is32) \
|
|
|
|
|
{ \
|
|
|
|
|
cpu_state.regs[cpu_reg].l = readmemw(0, ((sel & 4) ? ldt.base : gdt.base) + (sel & ~7)); \
|
|
|
|
|
cpu_state.regs[cpu_reg].l |= (readmemb(0, ((sel & 4) ? ldt.base : gdt.base) + (sel & ~7) + 6) & 0xF) << 16; \
|
|
|
|
|
if (readmemb(0, ((sel & 4) ? ldt.base : gdt.base) + (sel & ~7) + 6) & 0x80) \
|
|
|
|
|
{ \
|
|
|
|
|
cpu_state.regs[cpu_reg].l <<= 12; \
|
|
|
|
|
cpu_state.regs[cpu_reg].l |= 0xFFF; \
|
|
|
|
|
} \
|
|
|
|
|
} \
|
|
|
|
|
else \
|
|
|
|
|
cpu_state.regs[cpu_reg].w = readmemw(0, ((sel & 4) ? ldt.base : gdt.base) + (sel & ~7)); \
|
|
|
|
|
cpl_override = 0; \
|
|
|
|
|
} \
|
|
|
|
|
CLOCK_CYCLES(10); \
|
|
|
|
|
PREFETCH_RUN(10, 2, rmdat, 4,0,0,0, ea32); \
|
|
|
|
|
return cpu_state.abrt; \
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
opLSL(w_a16, fetch_ea_16, 0, 0)
|
|
|
|
|
opLSL(w_a32, fetch_ea_32, 0, 1)
|
|
|
|
|
opLSL(l_a16, fetch_ea_16, 1, 0)
|
|
|
|
|
opLSL(l_a32, fetch_ea_32, 1, 1)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static int op0F00_common(uint32_t fetchdat, int ea32)
|
|
|
|
|
{
|
|
|
|
|
int dpl, valid, granularity;
|
|
|
|
|
uint32_t addr, base, limit;
|
|
|
|
|
uint16_t desc, sel;
|
|
|
|
|
uint8_t access;
|
|
|
|
|
|
|
|
|
|
switch (rmdat & 0x38)
|
|
|
|
|
{
|
|
|
|
|
case 0x00: /*SLDT*/
|
|
|
|
|
if (cpu_mod != 3)
|
|
|
|
|
SEG_CHECK_WRITE(cpu_state.ea_seg);
|
|
|
|
|
seteaw(ldt.seg);
|
|
|
|
|
CLOCK_CYCLES(4);
|
|
|
|
|
PREFETCH_RUN(4, 2, rmdat, 0,0,(cpu_mod == 3) ? 0:1,0, ea32);
|
|
|
|
|
break;
|
|
|
|
|
case 0x08: /*STR*/
|
|
|
|
|
if (cpu_mod != 3)
|
|
|
|
|
SEG_CHECK_WRITE(cpu_state.ea_seg);
|
|
|
|
|
seteaw(tr.seg);
|
|
|
|
|
CLOCK_CYCLES(4);
|
|
|
|
|
PREFETCH_RUN(4, 2, rmdat, 0,0,(cpu_mod == 3) ? 0:1,0, ea32);
|
|
|
|
|
break;
|
|
|
|
|
case 0x10: /*LLDT*/
|
|
|
|
|
if ((CPL || cpu_state.eflags&VM_FLAG) && (cr0&1))
|
|
|
|
|
{
|
|
|
|
|
x86gpf(NULL,0);
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
if (cpu_mod != 3)
|
|
|
|
|
SEG_CHECK_READ(cpu_state.ea_seg);
|
|
|
|
|
sel = geteaw(); if (cpu_state.abrt) return 1;
|
|
|
|
|
addr = (sel & ~7) + gdt.base;
|
|
|
|
|
limit = readmemw(0, addr) + ((readmemb(0, addr + 6) & 0xf) << 16);
|
|
|
|
|
base = (readmemw(0, addr + 2)) | (readmemb(0, addr + 4) << 16) | (readmemb(0, addr + 7) << 24);
|
|
|
|
|
access = readmemb(0, addr + 5);
|
|
|
|
|
granularity = readmemb(0, addr + 6) & 0x80;
|
|
|
|
|
if (cpu_state.abrt) return 1;
|
|
|
|
|
ldt.limit = limit;
|
|
|
|
|
ldt.access = access;
|
|
|
|
|
if (granularity)
|
|
|
|
|
{
|
|
|
|
|
ldt.limit <<= 12;
|
|
|
|
|
ldt.limit |= 0xfff;
|
|
|
|
|
}
|
|
|
|
|
ldt.base = base;
|
|
|
|
|
ldt.seg = sel;
|
|
|
|
|
CLOCK_CYCLES(20);
|
|
|
|
|
PREFETCH_RUN(20, 2, rmdat, (cpu_mod == 3) ? 0:1,2,0,0, ea32);
|
|
|
|
|
break;
|
|
|
|
|
case 0x18: /*LTR*/
|
|
|
|
|
if ((CPL || cpu_state.eflags&VM_FLAG) && (cr0&1))
|
|
|
|
|
{
|
|
|
|
|
x86gpf(NULL,0);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
if (cpu_mod != 3)
|
|
|
|
|
SEG_CHECK_READ(cpu_state.ea_seg);
|
|
|
|
|
sel = geteaw(); if (cpu_state.abrt) return 1;
|
|
|
|
|
addr = (sel & ~7) + gdt.base;
|
|
|
|
|
limit = readmemw(0, addr) + ((readmemb(0, addr + 6) & 0xf) << 16);
|
|
|
|
|
base = (readmemw(0, addr + 2)) | (readmemb(0, addr + 4) << 16) | (readmemb(0, addr + 7) << 24);
|
|
|
|
|
access = readmemb(0, addr + 5);
|
|
|
|
|
granularity = readmemb(0, addr + 6) & 0x80;
|
|
|
|
|
if (cpu_state.abrt) return 1;
|
|
|
|
|
access |= 2;
|
|
|
|
|
writememb(0, addr + 5, access);
|
|
|
|
|
if (cpu_state.abrt) return 1;
|
|
|
|
|
tr.seg = sel;
|
|
|
|
|
tr.limit = limit;
|
|
|
|
|
tr.access = access;
|
|
|
|
|
if (granularity)
|
|
|
|
|
{
|
|
|
|
|
tr.limit <<= 12;
|
|
|
|
|
tr.limit |= 0xFFF;
|
|
|
|
|
}
|
|
|
|
|
tr.base = base;
|
|
|
|
|
CLOCK_CYCLES(20);
|
|
|
|
|
PREFETCH_RUN(20, 2, rmdat, (cpu_mod == 3) ? 0:1,2,0,0, ea32);
|
|
|
|
|
break;
|
|
|
|
|
case 0x20: /*VERR*/
|
|
|
|
|
if (cpu_mod != 3)
|
|
|
|
|
SEG_CHECK_READ(cpu_state.ea_seg);
|
|
|
|
|
sel = geteaw(); if (cpu_state.abrt) return 1;
|
|
|
|
|
flags_rebuild();
|
|
|
|
|
cpu_state.flags &= ~Z_FLAG;
|
|
|
|
|
if (!(sel & 0xfffc)) return 0; /*Null selector*/
|
|
|
|
|
cpl_override = 1;
|
|
|
|
|
valid = (sel & ~7) < ((sel & 4) ? ldt.limit : gdt.limit);
|
|
|
|
|
desc = readmemw(0, ((sel & 4) ? ldt.base : gdt.base) + (sel & ~7) + 4);
|
|
|
|
|
cpl_override = 0; if (cpu_state.abrt) return 1;
|
|
|
|
|
if (!(desc & 0x1000)) valid = 0;
|
|
|
|
|
if ((desc & 0xC00) != 0xC00) /*Exclude conforming code segments*/
|
|
|
|
|
{
|
|
|
|
|
dpl = (desc >> 13) & 3; /*Check permissions*/
|
|
|
|
|
if (dpl < CPL || dpl < (sel & 3)) valid = 0;
|
|
|
|
|
}
|
|
|
|
|
if ((desc & 0x0800) && !(desc & 0x0200)) valid = 0; /*Non-readable code*/
|
|
|
|
|
if (valid) cpu_state.flags |= Z_FLAG;
|
|
|
|
|
CLOCK_CYCLES(20);
|
|
|
|
|
PREFETCH_RUN(20, 2, rmdat, (cpu_mod == 3) ? 1:2,0,0,0, ea32);
|
|
|
|
|
break;
|
|
|
|
|
case 0x28: /*VERW*/
|
|
|
|
|
if (cpu_mod != 3)
|
|
|
|
|
SEG_CHECK_READ(cpu_state.ea_seg);
|
|
|
|
|
sel = geteaw(); if (cpu_state.abrt) return 1;
|
|
|
|
|
flags_rebuild();
|
|
|
|
|
cpu_state.flags &= ~Z_FLAG;
|
|
|
|
|
if (!(sel & 0xfffc)) return 0; /*Null selector*/
|
|
|
|
|
cpl_override = 1;
|
|
|
|
|
valid = (sel & ~7) < ((sel & 4) ? ldt.limit : gdt.limit);
|
|
|
|
|
desc = readmemw(0, ((sel & 4) ? ldt.base : gdt.base) + (sel & ~7) + 4);
|
|
|
|
|
cpl_override = 0; if (cpu_state.abrt) return 1;
|
|
|
|
|
if (!(desc & 0x1000)) valid = 0;
|
|
|
|
|
dpl = (desc >> 13) & 3; /*Check permissions*/
|
|
|
|
|
if (dpl < CPL || dpl < (sel & 3)) valid = 0;
|
|
|
|
|
if (desc & 0x0800) valid = 0; /*Code*/
|
|
|
|
|
if (!(desc & 0x0200)) valid = 0; /*Read-only data*/
|
|
|
|
|
if (valid) cpu_state.flags |= Z_FLAG;
|
|
|
|
|
CLOCK_CYCLES(20);
|
|
|
|
|
PREFETCH_RUN(20, 2, rmdat, (cpu_mod == 3) ? 1:2,0,0,0, ea32);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
cpu_state.pc -= 3;
|
|
|
|
|
x86illegal();
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
return cpu_state.abrt;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int op0F00_a16(uint32_t fetchdat)
|
|
|
|
|
{
|
|
|
|
|
NOTRM
|
|
|
|
|
|
|
|
|
|
fetch_ea_16(fetchdat);
|
|
|
|
|
|
|
|
|
|
return op0F00_common(fetchdat, 0);
|
|
|
|
|
}
|
|
|
|
|
static int op0F00_a32(uint32_t fetchdat)
|
|
|
|
|
{
|
|
|
|
|
NOTRM
|
|
|
|
|
|
|
|
|
|
fetch_ea_32(fetchdat);
|
|
|
|
|
|
|
|
|
|
return op0F00_common(fetchdat, 1);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int op0F01_common(uint32_t fetchdat, int is32, int is286, int ea32)
|
|
|
|
|
{
|
|
|
|
|
uint32_t base;
|
|
|
|
|
uint16_t limit, tempw;
|
|
|
|
|
switch (rmdat & 0x38)
|
|
|
|
|
{
|
|
|
|
|
case 0x00: /*SGDT*/
|
|
|
|
|
if (cpu_mod != 3)
|
|
|
|
|
SEG_CHECK_WRITE(cpu_state.ea_seg);
|
|
|
|
|
seteaw(gdt.limit);
|
|
|
|
|
base = gdt.base; //is32 ? gdt.base : (gdt.base & 0xffffff);
|
|
|
|
|
if (is286)
|
|
|
|
|
base |= 0xff000000;
|
|
|
|
|
writememl(easeg, cpu_state.eaaddr + 2, base);
|
|
|
|
|
CLOCK_CYCLES(7);
|
|
|
|
|
PREFETCH_RUN(7, 2, rmdat, 0,0,1,1, ea32);
|
|
|
|
|
break;
|
|
|
|
|
case 0x08: /*SIDT*/
|
|
|
|
|
if (cpu_mod != 3)
|
|
|
|
|
SEG_CHECK_WRITE(cpu_state.ea_seg);
|
|
|
|
|
seteaw(idt.limit);
|
|
|
|
|
base = idt.base;
|
|
|
|
|
if (is286)
|
|
|
|
|
base |= 0xff000000;
|
|
|
|
|
writememl(easeg, cpu_state.eaaddr + 2, base);
|
|
|
|
|
CLOCK_CYCLES(7);
|
|
|
|
|
PREFETCH_RUN(7, 2, rmdat, 0,0,1,1, ea32);
|
|
|
|
|
break;
|
|
|
|
|
case 0x10: /*LGDT*/
|
|
|
|
|
if ((CPL || cpu_state.eflags&VM_FLAG) && (cr0&1))
|
|
|
|
|
{
|
|
|
|
|
x86gpf(NULL,0);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
if (cpu_mod != 3)
|
|
|
|
|
SEG_CHECK_READ(cpu_state.ea_seg);
|
|
|
|
|
limit = geteaw();
|
|
|
|
|
base = readmeml(0, easeg + cpu_state.eaaddr + 2); if (cpu_state.abrt) return 1;
|
|
|
|
|
gdt.limit = limit;
|
|
|
|
|
gdt.base = base;
|
|
|
|
|
if (!is32) gdt.base &= 0xffffff;
|
|
|
|
|
CLOCK_CYCLES(11);
|
|
|
|
|
PREFETCH_RUN(11, 2, rmdat, 1,1,0,0, ea32);
|
|
|
|
|
break;
|
|
|
|
|
case 0x18: /*LIDT*/
|
|
|
|
|
if ((CPL || cpu_state.eflags&VM_FLAG) && (cr0&1))
|
|
|
|
|
{
|
|
|
|
|
x86gpf(NULL,0);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
if (cpu_mod != 3)
|
|
|
|
|
SEG_CHECK_READ(cpu_state.ea_seg);
|
|
|
|
|
limit = geteaw();
|
|
|
|
|
base = readmeml(0, easeg + cpu_state.eaaddr + 2); if (cpu_state.abrt) return 1;
|
|
|
|
|
idt.limit = limit;
|
|
|
|
|
idt.base = base;
|
|
|
|
|
if (!is32) idt.base &= 0xffffff;
|
|
|
|
|
CLOCK_CYCLES(11);
|
|
|
|
|
PREFETCH_RUN(11, 2, rmdat, 1,1,0,0, ea32);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 0x20: /*SMSW*/
|
|
|
|
|
if (cpu_mod != 3)
|
|
|
|
|
SEG_CHECK_WRITE(cpu_state.ea_seg);
|
2020-03-25 18:02:25 -06:00
|
|
|
if (is486 || isibm486) seteaw(msw);
|
Added the IBM 5161 ISA expansion for PC and XT;
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.
2019-09-20 14:02:30 +02:00
|
|
|
else if (is386) seteaw(msw | 0xFF00);
|
|
|
|
|
else seteaw(msw | 0xFFF0);
|
|
|
|
|
CLOCK_CYCLES(2);
|
|
|
|
|
PREFETCH_RUN(2, 2, rmdat, 0,0,(cpu_mod == 3) ? 0:1,0, ea32);
|
|
|
|
|
break;
|
|
|
|
|
case 0x30: /*LMSW*/
|
|
|
|
|
if ((CPL || cpu_state.eflags&VM_FLAG) && (msw&1))
|
|
|
|
|
{
|
|
|
|
|
x86gpf(NULL, 0);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
if (cpu_mod != 3)
|
|
|
|
|
SEG_CHECK_READ(cpu_state.ea_seg);
|
|
|
|
|
tempw = geteaw(); if (cpu_state.abrt) return 1;
|
|
|
|
|
if (msw & 1) tempw |= 1;
|
|
|
|
|
if (is386)
|
|
|
|
|
{
|
|
|
|
|
tempw &= ~0x10;
|
|
|
|
|
tempw |= (msw & 0x10);
|
|
|
|
|
}
|
|
|
|
|
else tempw &= 0xF;
|
|
|
|
|
msw = tempw;
|
|
|
|
|
if (msw & 1)
|
|
|
|
|
cpu_cur_status |= CPU_STATUS_PMODE;
|
|
|
|
|
else
|
|
|
|
|
cpu_cur_status &= ~CPU_STATUS_PMODE;
|
|
|
|
|
PREFETCH_RUN(2, 2, rmdat, 0,0,(cpu_mod == 3) ? 0:1,0, ea32);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 0x38: /*INVLPG*/
|
2020-03-25 18:02:25 -06:00
|
|
|
if (is486 || isibm486)
|
Added the IBM 5161 ISA expansion for PC and XT;
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.
2019-09-20 14:02:30 +02:00
|
|
|
{
|
|
|
|
|
if ((CPL || cpu_state.eflags&VM_FLAG) && (cr0&1))
|
|
|
|
|
{
|
|
|
|
|
x86gpf(NULL, 0);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
SEG_CHECK_READ(cpu_state.ea_seg);
|
|
|
|
|
mmu_invalidate(ds + cpu_state.eaaddr);
|
|
|
|
|
CLOCK_CYCLES(12);
|
|
|
|
|
PREFETCH_RUN(12, 2, rmdat, 0,0,0,0, ea32);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
cpu_state.pc -= 3;
|
|
|
|
|
x86illegal();
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
return cpu_state.abrt;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int op0F01_w_a16(uint32_t fetchdat)
|
|
|
|
|
{
|
|
|
|
|
fetch_ea_16(fetchdat);
|
|
|
|
|
|
|
|
|
|
return op0F01_common(fetchdat, 0, 0, 0);
|
|
|
|
|
}
|
|
|
|
|
static int op0F01_w_a32(uint32_t fetchdat)
|
|
|
|
|
{
|
|
|
|
|
fetch_ea_32(fetchdat);
|
|
|
|
|
|
|
|
|
|
return op0F01_common(fetchdat, 0, 0, 1);
|
|
|
|
|
}
|
|
|
|
|
static int op0F01_l_a16(uint32_t fetchdat)
|
|
|
|
|
{
|
|
|
|
|
fetch_ea_16(fetchdat);
|
|
|
|
|
|
|
|
|
|
return op0F01_common(fetchdat, 1, 0, 0);
|
|
|
|
|
}
|
|
|
|
|
static int op0F01_l_a32(uint32_t fetchdat)
|
|
|
|
|
{
|
|
|
|
|
fetch_ea_32(fetchdat);
|
|
|
|
|
|
|
|
|
|
return op0F01_common(fetchdat, 1, 0, 1);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int op0F01_286(uint32_t fetchdat)
|
|
|
|
|
{
|
|
|
|
|
fetch_ea_16(fetchdat);
|
|
|
|
|
|
|
|
|
|
return op0F01_common(fetchdat, 0, 1, 0);
|
|
|
|
|
}
|