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

OPTi 283 rewrite.

Browse Source
This commit is contained in:
OBattler
2021-06-06 23:58:12 +02:00
parent 493867f476
commit 32dff0b5a1
1 changed files with 195 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

242
src/chipset/opti283.c
View File

@@ -8,12 +8,11 @@
* *
* Implementation of the OPTi 82C283 chipset. * Implementation of the OPTi 82C283 chipset.
* *
* Authors: Tiseno100,
* Miran Grca, <mgrca8@gmail.com>
* *
* * Copyright 2021 Tiseno100.
* Authors: Tiseno100 * Copyright 2021 Miran Grca.
*
* Copyright 2021 Tiseno100
*
*/ */
#include <stdarg.h> #include <stdarg.h>
@@ -31,8 +30,10 @@
#include <86box/mem.h> #include <86box/mem.h>
#include <86box/chipset.h> #include <86box/chipset.h>
#ifdef ENABLE_OPTI283_LOG #ifdef ENABLE_OPTI283_LOG
int opti283_do_log = ENABLE_OPTI283_LOG; int opti283_do_log = ENABLE_OPTI283_LOG;
static void static void
opti283_log(const char *fmt, ...) opti283_log(const char *fmt, ...)
{ {
@@ -49,72 +50,200 @@ opti283_log(const char *fmt, ...)
#define opti283_log(fmt, ...) #define opti283_log(fmt, ...)
#endif #endif
typedef struct typedef struct
{ {
uint8_t index, uint32_t phys, virt;
regs[256]; } mem_remapping_t;
typedef struct
{
uint8_t index, shadow_high,
regs[256];
mem_remapping_t mem_remappings[2];
mem_mapping_t mem_mappings[2];
} opti283_t; } opti283_t;
static void opti283_shadow_recalc(opti283_t *dev)
static uint8_t
opti283_read_remapped_ram(uint32_t addr, void *priv)
{ {
mem_set_mem_state_both(0xf0000, 0x10000, (dev->regs[0x11] & 0x80) ? (MEM_READ_EXTANY | MEM_WRITE_INTERNAL) : (MEM_READ_INTERNAL | ((dev->regs[0x14] & 0x80) ? MEM_WRITE_INTERNAL : MEM_WRITE_DISABLED))); mem_remapping_t *dev = (mem_remapping_t *) priv;
for (uint32_t i = 0; i < 4; i++) return mem_read_ram((addr - dev->virt) + dev->phys, priv);
{ }
if (dev->regs[0x11] & 0x40)
mem_set_mem_state_both(0xe0000 + (i << 14), 0x4000, (dev->regs[0x12] & (1 << (4 + i))) ? (MEM_READ_INTERNAL | ((dev->regs[0x11] & 4) ? MEM_WRITE_DISABLED : MEM_WRITE_INTERNAL)) : (MEM_READ_EXTANY | MEM_WRITE_EXTANY));
mem_set_mem_state_both(0xe0000, 0x10000, MEM_READ_EXTANY | MEM_WRITE_EXTANY);
if (dev->regs[0x11] & 0x20)
mem_set_mem_state_both(0xd0000 + (i << 14), 0x4000, (dev->regs[0x12] & (1 << i)) ? (MEM_READ_INTERNAL | ((dev->regs[0x11] & 2) ? MEM_WRITE_DISABLED : MEM_WRITE_INTERNAL)) : (MEM_READ_EXTANY | MEM_WRITE_EXTANY));
else
mem_set_mem_state_both(0xd0000, 0x10000, MEM_READ_EXTANY | MEM_WRITE_EXTANY);
if (dev->regs[0x11] & 0x10) static uint16_t
mem_set_mem_state_both(0xc0000 + (i << 14), 0x4000, (dev->regs[0x13] & (1 << (4 + i))) ? (MEM_READ_INTERNAL | ((dev->regs[0x11] & 1) ? MEM_WRITE_DISABLED : MEM_WRITE_INTERNAL)) : (MEM_READ_EXTANY | MEM_WRITE_EXTANY)); opti283_read_remapped_ramw(uint32_t addr, void *priv)
else {
mem_set_mem_state_both(0xc0000, 0x10000, MEM_READ_EXTANY | MEM_WRITE_EXTANY); mem_remapping_t *dev = (mem_remapping_t *) priv;
return mem_read_ramw((addr - dev->virt) + dev->phys, priv);
}
static uint32_t
opti283_read_remapped_raml(uint32_t addr, void *priv)
{
mem_remapping_t *dev = (mem_remapping_t *) priv;
return mem_read_raml((addr - dev->virt) + dev->phys, priv);
}
static void
opti283_write_remapped_ram(uint32_t addr, uint8_t val, void *priv)
{
mem_remapping_t *dev = (mem_remapping_t *) priv;
mem_write_ram((addr - dev->virt) + dev->phys, val, priv);
}
static void
opti283_write_remapped_ramw(uint32_t addr, uint16_t val, void *priv)
{
mem_remapping_t *dev = (mem_remapping_t *) priv;
mem_write_ramw((addr - dev->virt) + dev->phys, val, priv);
}
static void
opti283_write_remapped_raml(uint32_t addr, uint32_t val, void *priv)
{
mem_remapping_t *dev = (mem_remapping_t *) priv;
mem_write_raml((addr - dev->virt) + dev->phys, val, priv);
}
static void
opti283_shadow_recalc(opti283_t *dev)
{
uint32_t i, base;
uint32_t rbase;
uint8_t sh_enable, sh_mode;
uint8_t rom, sh_copy;
shadowbios = shadowbios_write = 0;
dev->shadow_high = 0;
if (dev->regs[0x11] & 0x80) {
mem_set_mem_state_both(0xf0000, 0x10000, MEM_READ_EXTANY | MEM_WRITE_INTERNAL);
shadowbios_write = 1;
} else {
shadowbios = 1;
if (dev->regs[0x14] & 0x80) {
mem_set_mem_state_both(0xf0000, 0x01000, MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
shadowbios_write = 1;
} else
mem_set_mem_state_both(0xf0000, 0x01000, MEM_READ_INTERNAL | MEM_WRITE_DISABLED);
mem_set_mem_state_both(0xf1000, 0x0f000, MEM_READ_INTERNAL | MEM_WRITE_DISABLED);
}
sh_copy = dev->regs[0x11] & 0x08;
for (i = 0; i < 12; i++) {
base = 0xc0000 + (i << 14);
if (i >= 4)
sh_enable = dev->regs[0x12] & (1 << (i - 4));
else
sh_enable = dev->regs[0x13] & (1 << (i + 4));
sh_mode = dev->regs[0x11] & (1 << (i >> 2));
rom = dev->regs[0x11] & (1 << ((i >> 2) + 4));
pclog("OPTI 283: %i/%08X: %i, %i, %i\n", i, base, (i >= 4) ? (1 << (i - 4)) : (1 << (i + 4)), (1 << (i >> 2)), (1 << ((i >> 2) + 4)));
if (sh_enable && rom) {
if (base >= 0x000e0000)
shadowbios |= 1;
if (base >= 0x000d0000)
dev->shadow_high |= 1;
if (sh_mode) {
if (base >= 0x000e0000)
shadowbios_write |= 1;
if (sh_copy)
mem_set_mem_state_both(base, 0x4000, MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
else
mem_set_mem_state_both(base, 0x4000, MEM_READ_INTERNAL | MEM_WRITE_EXTERNAL);
} else
mem_set_mem_state_both(base, 0x4000, MEM_READ_INTERNAL | MEM_WRITE_DISABLED);
} else {
if (base >= 0xe0000)
mem_set_mem_state_both(base, 0x4000, MEM_READ_EXTANY | MEM_WRITE_DISABLED);
else
mem_set_mem_state_both(base, 0x4000, MEM_READ_EXTERNAL | MEM_WRITE_DISABLED);
}
}
rbase = ((uint32_t) (dev->regs[0x13] & 0x0f)) << 20;
if (rbase > 0) {
dev->mem_remappings[0].virt = rbase;
mem_mapping_set_addr(&dev->mem_mappings[0], rbase, 0x00020000);
if (!dev->shadow_high) {
rbase += 0x00020000;
dev->mem_remappings[1].virt = rbase;
mem_mapping_set_addr(&dev->mem_mappings[1], rbase , 0x00020000);
} else
mem_mapping_disable(&dev->mem_mappings[1]);
} else {
mem_mapping_disable(&dev->mem_mappings[0]);
mem_mapping_disable(&dev->mem_mappings[1]);
} }
} }
static void static void
opti283_write(uint16_t addr, uint8_t val, void *priv) opti283_write(uint16_t addr, uint8_t val, void *priv)
{ {
opti283_t *dev = (opti283_t *)priv; opti283_t *dev = (opti283_t *)priv;
switch (addr) switch (addr) {
{ case 0x22:
case 0x22: dev->index = val;
dev->index = val; break;
break;
case 0x24:
opti283_log("OPTi 283: dev->regs[%02x] = %02x\n", dev->index, val);
switch (dev->index) case 0x24:
{ opti283_log("OPTi 283: dev->regs[%02x] = %02x\n", dev->index, val);
case 0x10:
dev->regs[dev->index] = val;
break;
case 0x11: switch (dev->index) {
case 0x12: case 0x10:
case 0x13: dev->regs[dev->index] = val;
case 0x14: break;
dev->regs[dev->index] = val;
opti283_shadow_recalc(dev); case 0x14:
break; reset_on_hlt = !!(val & 0x40);
} /* FALLTHROUGH */
break; case 0x11: case 0x12:
case 0x13:
dev->regs[dev->index] = val;
opti283_shadow_recalc(dev);
break;
}
break;
} }
} }
static uint8_t static uint8_t
opti283_read(uint16_t addr, void *priv) opti283_read(uint16_t addr, void *priv)
{ {
opti283_t *dev = (opti283_t *)priv; opti283_t *dev = (opti283_t *)priv;
return (addr == 0x24) ? dev->regs[dev->index] : 0xff; uint8_t ret = 0xff;
if (addr == 0x24)
ret = dev->regs[dev->index];
return ret;
} }
static void static void
opti283_close(void *priv) opti283_close(void *priv)
{ {
@@ -123,22 +252,40 @@ opti283_close(void *priv)
free(dev); free(dev);
} }
static void * static void *
opti283_init(const device_t *info) opti283_init(const device_t *info)
{ {
opti283_t *dev = (opti283_t *)malloc(sizeof(opti283_t)); opti283_t *dev = (opti283_t *)malloc(sizeof(opti283_t));
memset(dev, 0, sizeof(opti283_t)); memset(dev, 0x00, sizeof(opti283_t));
io_sethandler(0x0022, 0x0001, opti283_read, NULL, NULL, opti283_write, NULL, NULL, dev); io_sethandler(0x0022, 0x0001, opti283_read, NULL, NULL, opti283_write, NULL, NULL, dev);
io_sethandler(0x0024, 0x0001, opti283_read, NULL, NULL, opti283_write, NULL, NULL, dev); io_sethandler(0x0024, 0x0001, opti283_read, NULL, NULL, opti283_write, NULL, NULL, dev);
dev->regs[0x10] = 0x3f; dev->regs[0x10] = 0x3f;
dev->regs[0x11] = 0xf0; dev->regs[0x11] = 0xf0;
dev->mem_remappings[0].phys = 0x000a0000;
dev->mem_remappings[1].phys = 0x000d0000;
mem_mapping_add(&dev->mem_mappings[0], 0, 0x00020000,
opti283_read_remapped_ram, opti283_read_remapped_ramw, opti283_read_remapped_raml,
opti283_write_remapped_ram, opti283_write_remapped_ramw, opti283_write_remapped_raml,
&ram[dev->mem_remappings[0].phys], MEM_MAPPING_INTERNAL, &dev->mem_remappings[0]);
mem_mapping_disable(&dev->mem_mappings[0]);
mem_mapping_add(&dev->mem_mappings[1], 0, 0x00020000,
opti283_read_remapped_ram, opti283_read_remapped_ramw, opti283_read_remapped_raml,
opti283_write_remapped_ram, opti283_write_remapped_ramw, opti283_write_remapped_raml,
&ram[dev->mem_remappings[1].phys], MEM_MAPPING_INTERNAL, &dev->mem_remappings[1]);
mem_mapping_disable(&dev->mem_mappings[1]);
opti283_shadow_recalc(dev); opti283_shadow_recalc(dev);
return dev; return dev;
} }
const device_t opti283_device = { const device_t opti283_device = {
"OPTi 82C283", "OPTi 82C283",
0, 0,
@@ -146,7 +293,8 @@ const device_t opti283_device = {
opti283_init, opti283_init,
opti283_close, opti283_close,
NULL, NULL,
{NULL}, { NULL },
NULL, NULL,
NULL, NULL,
NULL}; NULL
};