claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Restore the debug register operation on 486+

Browse Source 
But put it behind a compile-time option due to performance hits
Also add the DE flag to CPUID on supported CPUs
This commit is contained in:
Alexander Babikov
2024-01-15 06:22:38 +05:00
parent d182f4c553
commit a07ffdecab
12 changed files with 531 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
src/io.c
View File

@@ -279,6 +279,58 @@ io_handler_interleaved(int set, uint16_t base, int size,
io_handler_common(set, base, size, inb, inw, inl, outb, outw, outl, priv, 2);
}
#ifdef USE_DEBUG_REGS_486
extern int trap;
/* Set trap for I/O address breakpoints. */
void
io_debug_check_addr(uint16_t addr)
{
int i = 0;
int set_trap = 0;
if (!(dr[7] & 0xFF))
return;
if (!(cr4 & 0x8))
return; /* No I/O debug trap. */
for (i = 0; i < 4; i++) {
uint16_t dr_addr = dr[i] & 0xFFFF;
int breakpoint_enabled = !!(dr[7] & (0x3 << (2 * i)));
int len_type_pair = ((dr[7] >> 16) & (0xF << (4 * i))) >> (4 * i);
if (!breakpoint_enabled)
continue;
if ((len_type_pair & 3) != 2)
continue;
switch ((len_type_pair >> 2) & 3)
{
case 0x00:
if (dr_addr == addr) {
set_trap = 1;
dr[6] |= (1 << i);
}
break;
case 0x01:
if ((dr_addr & ~1) == addr || ((dr_addr & ~1) + 1) == (addr + 1)) {
set_trap = 1;
dr[6] |= (1 << i);
}
break;
case 0x03:
dr_addr &= ~3;
if (addr >= dr_addr && addr < (dr_addr + 4)) {
set_trap = 1;
dr[6] |= (1 << i);
}
break;
}
}
if (set_trap)
trap |= 4;
}
#endif
uint8_t
inb(uint16_t port)
{
@@ -290,6 +342,10 @@ inb(uint16_t port)
int qfound = 0;
#endif
#ifdef USE_DEBUG_REGS_486
io_debug_check_addr(port);
#endif
if ((pci_flags & FLAG_CONFIG_IO_ON) && (port >= pci_base) && (port < (pci_base + pci_size))) {
ret = pci_read(port, NULL);
found = 1;
@@ -350,6 +406,10 @@ outb(uint16_t port, uint8_t val)
int qfound = 0;
#endif
#ifdef USE_DEBUG_REGS_486
io_debug_check_addr(port);
#endif
if ((pci_flags & FLAG_CONFIG_IO_ON) && (port >= pci_base) && (port < (pci_base + pci_size))) {
pci_write(port, val, NULL);
found = 1;
@@ -402,6 +462,10 @@ inw(uint16_t port)
#endif
uint8_t ret8[2];
#ifdef USE_DEBUG_REGS_486
io_debug_check_addr(port);
#endif
if ((pci_flags & FLAG_CONFIG_IO_ON) && (port >= pci_base) && (port < (pci_base + pci_size))) {
ret = pci_readw(port, NULL);
found = 2;
@@ -474,6 +538,10 @@ outw(uint16_t port, uint16_t val)
int qfound = 0;
#endif
#ifdef USE_DEBUG_REGS_486
io_debug_check_addr(port);
#endif
if ((pci_flags & FLAG_CONFIG_IO_ON) && (port >= pci_base) && (port < (pci_base + pci_size))) {
pci_writew(port, val, NULL);
found = 2;
@@ -542,6 +610,10 @@ inl(uint16_t port)
int qfound = 0;
#endif
#ifdef USE_DEBUG_REGS_486
io_debug_check_addr(port);
#endif
if ((pci_flags & FLAG_CONFIG_IO_ON) && (port >= pci_base) && (port < (pci_base + pci_size))) {
ret = pci_readl(port, NULL);
found = 4;
@@ -646,6 +718,10 @@ outl(uint16_t port, uint32_t val)
#endif
int i = 0;
#ifdef USE_DEBUG_REGS_486
io_debug_check_addr(port);
#endif
if ((pci_flags & FLAG_CONFIG_IO_ON) && (port >= pci_base) && (port < (pci_base + pci_size))) {
pci_writel(port, val, NULL);
found = 4;