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
|
|
|
/*
|
|
|
|
|
* 86Box A hypervisor and IBM PC system emulator that specializes in
|
|
|
|
|
* running old operating systems and software designed for IBM
|
|
|
|
|
* PC systems and compatibles from 1981 through fairly recent
|
|
|
|
|
* system designs based on the PCI bus.
|
|
|
|
|
*
|
|
|
|
|
* This file is part of the 86Box distribution.
|
|
|
|
|
*
|
|
|
|
|
* AMD SYSCALL and SYSRET CPU Instructions.
|
|
|
|
|
*
|
2020-03-25 00:46:02 +02:00
|
|
|
*
|
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
|
|
|
*
|
|
|
|
|
* Author: Miran Grca, <mgrca8@gmail.com>
|
|
|
|
|
* Copyright 2016-2018 Miran Grca.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
/* 0 = Limit 0-15
|
|
|
|
|
1 = Base 0-15
|
|
|
|
|
2 = Base 16-23 (bits 0-7), Access rights
|
|
|
|
|
8-11 Type
|
|
|
|
|
12 S
|
|
|
|
|
13, 14 DPL
|
|
|
|
|
15 P
|
|
|
|
|
3 = Limit 16-19 (bits 0-3), Base 24-31 (bits 8-15), granularity, etc.
|
|
|
|
|
4 A
|
|
|
|
|
6 DB
|
|
|
|
|
7 G */
|
|
|
|
|
|
|
|
|
|
#define AMD_SYSCALL_EIP (star & 0xFFFFFFFF)
|
|
|
|
|
#define AMD_SYSCALL_SB ((star >> 32) & 0xFFFF)
|
|
|
|
|
#define AMD_SYSRET_SB ((star >> 48) & 0xFFFF)
|
|
|
|
|
|
|
|
|
|
/* 0F 05 */
|
|
|
|
|
static int opSYSCALL(uint32_t fetchdat)
|
|
|
|
|
{
|
|
|
|
|
uint16_t syscall_cs_seg_data[4] = {0, 0, 0, 0};
|
|
|
|
|
uint16_t syscall_ss_seg_data[4] = {0, 0, 0, 0};
|
|
|
|
|
|
|
|
|
|
if (!(cr0 & 1)) return internal_illegal("SYSCALL: CPU not in protected mode");
|
|
|
|
|
if (!AMD_SYSCALL_SB) return internal_illegal("SYSCALL: AMD SYSCALL SB MSR is zero");
|
|
|
|
|
|
|
|
|
|
/* Set VM, IF, RF to 0. */
|
|
|
|
|
/* cpu_state.eflags &= ~0x00030200;
|
|
|
|
|
cpu_state.flags &= ~0x0200; */
|
|
|
|
|
|
|
|
|
|
/* Let's do this by the AMD spec. */
|
|
|
|
|
ECX = cpu_state.pc;
|
|
|
|
|
|
|
|
|
|
cpu_state.eflags &= ~0x0002;
|
|
|
|
|
cpu_state.flags &= ~0x0200;
|
|
|
|
|
|
|
|
|
|
/* CS */
|
|
|
|
|
cpu_state.seg_cs.seg = AMD_SYSCALL_SB & ~7;
|
|
|
|
|
if (AMD_SYSCALL_SB & 4)
|
|
|
|
|
{
|
|
|
|
|
if (cpu_state.seg_cs.seg >= ldt.limit)
|
|
|
|
|
{
|
|
|
|
|
x386_dynarec_log("Bigger than LDT limit %04X %04X CS\n",AMD_SYSCALL_SB,ldt.limit);
|
|
|
|
|
x86gpf(NULL, AMD_SYSCALL_SB & ~3);
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
cpu_state.seg_cs.seg +=ldt.base;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (cpu_state.seg_cs.seg >= gdt.limit)
|
|
|
|
|
{
|
|
|
|
|
x386_dynarec_log("Bigger than GDT limit %04X %04X CS\n",AMD_SYSCALL_SB,gdt.limit);
|
|
|
|
|
x86gpf(NULL, AMD_SYSCALL_SB & ~3);
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
cpu_state.seg_cs.seg += gdt.base;
|
|
|
|
|
}
|
|
|
|
|
cpl_override = 1;
|
|
|
|
|
|
|
|
|
|
syscall_cs_seg_data[0] = 0xFFFF;
|
|
|
|
|
syscall_cs_seg_data[1] = 0;
|
|
|
|
|
syscall_cs_seg_data[2] = 0x9B00;
|
|
|
|
|
syscall_cs_seg_data[3] = 0xC0;
|
|
|
|
|
|
|
|
|
|
cpl_override = 0;
|
|
|
|
|
|
|
|
|
|
use32 = 0x300;
|
|
|
|
|
CS = (AMD_SYSCALL_SB & ~3) | 0;
|
|
|
|
|
|
|
|
|
|
do_seg_load(&cpu_state.seg_cs, syscall_cs_seg_data);
|
|
|
|
|
use32 = 0x300;
|
|
|
|
|
|
|
|
|
|
CS = (CS & 0xFFFC) | 0;
|
|
|
|
|
|
|
|
|
|
cpu_state.seg_cs.limit = 0xFFFFFFFF;
|
|
|
|
|
cpu_state.seg_cs.limit_high = 0xFFFFFFFF;
|
|
|
|
|
|
|
|
|
|
/* SS */
|
|
|
|
|
syscall_ss_seg_data[0] = 0xFFFF;
|
|
|
|
|
syscall_ss_seg_data[1] = 0;
|
|
|
|
|
syscall_ss_seg_data[2] = 0x9300;
|
|
|
|
|
syscall_ss_seg_data[3] = 0xC0;
|
|
|
|
|
do_seg_load(&cpu_state.seg_ss, syscall_ss_seg_data);
|
|
|
|
|
cpu_state.seg_ss.seg = (AMD_SYSCALL_SB + 8) & 0xFFFC;
|
|
|
|
|
stack32 = 1;
|
|
|
|
|
|
|
|
|
|
cpu_state.seg_ss.limit = 0xFFFFFFFF;
|
|
|
|
|
cpu_state.seg_ss.limit_high = 0xFFFFFFFF;
|
|
|
|
|
|
|
|
|
|
cpu_state.seg_ss.checked = 0;
|
|
|
|
|
|
|
|
|
|
cpu_state.pc = AMD_SYSCALL_EIP;
|
|
|
|
|
|
|
|
|
|
CLOCK_CYCLES(20);
|
|
|
|
|
|
|
|
|
|
CPU_BLOCK_END();
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* 0F 07 */
|
|
|
|
|
static int opSYSRET(uint32_t fetchdat)
|
|
|
|
|
{
|
|
|
|
|
uint16_t sysret_cs_seg_data[4] = {0, 0, 0, 0};
|
|
|
|
|
uint16_t sysret_ss_seg_data[4] = {0, 0, 0, 0};
|
|
|
|
|
|
|
|
|
|
if (!AMD_SYSRET_SB) return internal_illegal("SYSRET: CS MSR is zero");
|
|
|
|
|
if (!(cr0 & 1)) return internal_illegal("SYSRET: CPU not in protected mode");
|
|
|
|
|
|
|
|
|
|
cpu_state.pc = ECX;
|
|
|
|
|
|
|
|
|
|
cpu_state.eflags |= (1 << 1);
|
|
|
|
|
|
|
|
|
|
/* CS */
|
|
|
|
|
cpu_state.seg_cs.seg = AMD_SYSRET_SB & ~7;
|
|
|
|
|
if (AMD_SYSRET_SB & 4)
|
|
|
|
|
{
|
|
|
|
|
if (cpu_state.seg_cs.seg >= ldt.limit)
|
|
|
|
|
{
|
|
|
|
|
x386_dynarec_log("Bigger than LDT limit %04X %04X CS\n",AMD_SYSRET_SB,ldt.limit);
|
|
|
|
|
x86gpf(NULL, AMD_SYSRET_SB & ~3);
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
cpu_state.seg_cs.seg +=ldt.base;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (cpu_state.seg_cs.seg >= gdt.limit)
|
|
|
|
|
{
|
|
|
|
|
x386_dynarec_log("Bigger than GDT limit %04X %04X CS\n",AMD_SYSRET_SB,gdt.limit);
|
|
|
|
|
x86gpf(NULL, AMD_SYSRET_SB & ~3);
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
cpu_state.seg_cs.seg += gdt.base;
|
|
|
|
|
}
|
|
|
|
|
cpl_override = 1;
|
|
|
|
|
|
|
|
|
|
sysret_cs_seg_data[0] = 0xFFFF;
|
|
|
|
|
sysret_cs_seg_data[1] = 0;
|
|
|
|
|
sysret_cs_seg_data[2] = 0xFB00;
|
|
|
|
|
sysret_cs_seg_data[3] = 0xC0;
|
|
|
|
|
|
|
|
|
|
cpl_override = 0;
|
|
|
|
|
|
|
|
|
|
use32 = 0x300;
|
|
|
|
|
CS = (AMD_SYSRET_SB & ~3) | 3;
|
|
|
|
|
|
|
|
|
|
do_seg_load(&cpu_state.seg_cs, sysret_cs_seg_data);
|
|
|
|
|
flushmmucache_cr3();
|
|
|
|
|
use32 = 0x300;
|
|
|
|
|
|
|
|
|
|
CS = (CS & 0xFFFC) | 3;
|
|
|
|
|
|
|
|
|
|
cpu_state.seg_cs.limit = 0xFFFFFFFF;
|
|
|
|
|
cpu_state.seg_cs.limit_high = 0xFFFFFFFF;
|
|
|
|
|
|
|
|
|
|
/* SS */
|
|
|
|
|
sysret_ss_seg_data[0] = 0xFFFF;
|
|
|
|
|
sysret_ss_seg_data[1] = 0;
|
|
|
|
|
sysret_ss_seg_data[2] = 0xF300;
|
|
|
|
|
sysret_ss_seg_data[3] = 0xC0;
|
|
|
|
|
do_seg_load(&cpu_state.seg_ss, sysret_ss_seg_data);
|
|
|
|
|
cpu_state.seg_ss.seg = ((AMD_SYSRET_SB + 8) & 0xFFFC) | 3;
|
|
|
|
|
stack32 = 1;
|
|
|
|
|
|
|
|
|
|
cpu_state.seg_ss.limit = 0xFFFFFFFF;
|
|
|
|
|
cpu_state.seg_ss.limit_high = 0xFFFFFFFF;
|
|
|
|
|
|
|
|
|
|
cpu_state.seg_ss.checked = 0;
|
|
|
|
|
|
|
|
|
|
CLOCK_CYCLES(20);
|
|
|
|
|
|
|
|
|
|
CPU_BLOCK_END();
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|