Now up to date with current dev version.

Changes since v0.7 :
- Major CPU reorganisation. This has possibly broken some stuff, though I fixed all the regressions I could find
- Lazy flags. This brought 10% speed improvement at one point, but that's probably been lost now
- 430 VX chipset emulation
- IDT Winchip emulation (currently sans MMX). Timing is probably wrong
- Fixed a few FPU bugs
- Timer reorganisation
- Sound reorganisation
- Other general reorganisation
- AdLib Gold emulation
- Windows Sound System emulation
- Pro Audio Spectrum 16 emulation. This currently works with most DOS stuff, but not in Windows
- Major improvements to GUS emulation. Has the downside that it now conflicts with SB emulation, so probably best to not enable both simultaneously
- New graphics cards :
  - ATI-18800 (VGA Edge-16)
  - ATI-28800 (VGA Charger)
  - ATI Mach64GX (Graphics Pro Turbo). Quite a few features missing, but Windows doesn't seem to use half the features of this card
  - Cirrus Logic CL-GD5429. Blitter is a bit broken
  - Oak OTI-067
  - S3 Trio64 (Number Nine 9FX)
  - S3 Virge. Only framebuffer stuff at the minute, Windows won't recognise the card
  - Trident TGUI-9440
  - VGA. Doesn't work yet
- Beginnings of 3DFX emulation, however this is in extremely early stages and doesn't do anything useful
- Fixed DMA bug stopping floppy drives working in Windows 3.x
- Fixed some other stuff probably
- Broke some other stuff probably as well
This commit is contained in:
TomW 2013-05-27 17:46:42 +01:00
commit 9312de19ac
87 changed files with 4528 additions and 9373 deletions

View file

@ -1,16 +1,19 @@
/*Oak OTI067 emulation*/
#include "ibm.h"
#include "io.h"
#include "video.h"
#include "vid_svga.h"
static int oti067_index;
static uint8_t oti067_regs[32];
void oti067_out(uint16_t addr, uint8_t val)
void oti067_out(uint16_t addr, uint8_t val, void *priv)
{
uint8_t old;
if ((addr&0xFFF0) == 0x3B0) addr |= 0x20;
// pclog("oti067_out : %04X %02X %02X %i\n", addr, val, ram[0x489], ins);
if ((((addr&0xFFF0) == 0x3D0 || (addr&0xFFF0) == 0x3B0) && addr < 0x3de) && !(svga_miscout&1)) addr ^= 0x60;
switch (addr)
{
@ -46,28 +49,41 @@ void oti067_out(uint16_t addr, uint8_t val)
}
return;
}
svga_out(addr,val);
svga_out(addr, val, NULL);
}
uint8_t oti067_in(uint16_t addr)
uint8_t oti067_in(uint16_t addr, void *priv)
{
uint8_t temp;
if ((addr&0xFFF0) == 0x3B0) addr |= 0x20;
// if (addr != 0x3da && addr != 0x3ba) pclog("oti067_in : %04X ", addr);
if ((((addr&0xFFF0) == 0x3D0 || (addr&0xFFF0) == 0x3B0) && addr < 0x3de) && !(svga_miscout&1)) addr ^= 0x60;
switch (addr)
{
case 0x3D4:
return crtcreg;
temp = crtcreg;
break;
case 0x3D5:
return crtc[crtcreg];
case 0x3DE: return oti067_index|(2<<5);
temp = crtc[crtcreg];
break;
case 0x3DE:
temp = oti067_index|(2<<5);
break;
case 0x3DF:
if (oti067_index==0x10) return 0x40;
if (oti067_index==0xD) return oti067_regs[oti067_index]|0xC0;
return oti067_regs[oti067_index];
if (oti067_index==0x10) temp = 0x18;
else if (oti067_index==0xD) temp = oti067_regs[oti067_index]|0xC0;
else temp = oti067_regs[oti067_index];
break;
default:
temp = svga_in(addr, NULL);
break;
}
return svga_in(addr);
// if (addr != 0x3da && addr != 0x3ba) pclog("%02X %04X:%04X\n", temp, CS,pc);
return temp;
}
void oti067_recalctimings()
@ -82,6 +98,8 @@ int oti067_init()
svga_recalctimings_ex = oti067_recalctimings;
svga_vram_limit = 1 << 19; /*512kb*/
vrammask = 0x7ffff;
bpp = 8;
svga_miscout = 1;
return svga_init();
}