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:
parent
3c253c2cf8
commit
9312de19ac
87 changed files with 4528 additions and 9373 deletions
|
|
@ -2,6 +2,7 @@
|
|||
#include "video.h"
|
||||
#include "io.h"
|
||||
#include "mem.h"
|
||||
#include "timer.h"
|
||||
|
||||
static int tandy_array_index;
|
||||
static uint8_t tandy_array[32];
|
||||
|
|
@ -14,7 +15,7 @@ static uint8_t *tandy_vram, *tandy_b8000;
|
|||
void tandy_recalcaddress();
|
||||
void tandy_recalctimings();
|
||||
|
||||
void tandy_out(uint16_t addr, uint8_t val)
|
||||
void tandy_out(uint16_t addr, uint8_t val, void *priv)
|
||||
{
|
||||
uint8_t old;
|
||||
// pclog("Tandy OUT %04X %02X\n",addr,val);
|
||||
|
|
@ -59,7 +60,7 @@ void tandy_out(uint16_t addr, uint8_t val)
|
|||
}
|
||||
}
|
||||
|
||||
uint8_t tandy_in(uint16_t addr)
|
||||
uint8_t tandy_in(uint16_t addr, void *priv)
|
||||
{
|
||||
// if (addr!=0x3DA) pclog("Tandy IN %04X\n",addr);
|
||||
switch (addr)
|
||||
|
|
@ -90,14 +91,14 @@ void tandy_recalcaddress()
|
|||
}
|
||||
}
|
||||
|
||||
void tandy_write(uint32_t addr, uint8_t val)
|
||||
void tandy_write(uint32_t addr, uint8_t val, void *priv)
|
||||
{
|
||||
if (tandy_memctrl==-1) return;
|
||||
// pclog("Tandy VRAM write %05X %02X %04X:%04X %04X:%04X\n",addr,val,CS,pc,DS,SI);
|
||||
tandy_b8000[addr&0x7FFF]=val;
|
||||
}
|
||||
|
||||
uint8_t tandy_read(uint32_t addr)
|
||||
uint8_t tandy_read(uint32_t addr, void *priv)
|
||||
{
|
||||
if (tandy_memctrl==-1) return 0xFF;
|
||||
// pclog("Tandy VRAM read %05X %02X %04X:%04X\n",addr,tandy_b8000[addr&0x7FFF],CS,pc);
|
||||
|
|
@ -106,19 +107,22 @@ uint8_t tandy_read(uint32_t addr)
|
|||
|
||||
void tandy_recalctimings()
|
||||
{
|
||||
double _dispontime, _dispofftime;
|
||||
if (tandy_mode&1)
|
||||
{
|
||||
disptime=crtc[0]+1;
|
||||
dispontime=crtc[1];
|
||||
_dispontime=crtc[1];
|
||||
}
|
||||
else
|
||||
{
|
||||
disptime=(crtc[0]+1)<<1;
|
||||
dispontime=crtc[1]<<1;
|
||||
_dispontime=crtc[1]<<1;
|
||||
}
|
||||
dispofftime=disptime-dispontime;
|
||||
dispontime*=CGACONST;
|
||||
dispofftime*=CGACONST;
|
||||
_dispofftime=disptime-_dispontime;
|
||||
_dispontime*=CGACONST;
|
||||
_dispofftime*=CGACONST;
|
||||
dispontime = (int)(_dispontime * (1 << TIMER_SHIFT));
|
||||
dispofftime = (int)(_dispofftime * (1 << TIMER_SHIFT));
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -127,7 +131,7 @@ static int sc,vc;
|
|||
static int cgadispon;
|
||||
static int con,coff,cursoron,cgablink;
|
||||
static int vsynctime,vadj;
|
||||
static uint16_t ma,maback,ca;
|
||||
static uint16_t ma,maback;
|
||||
|
||||
static int ntsc_col[8][8]=
|
||||
{
|
||||
|
|
@ -157,7 +161,7 @@ void tandy_poll()
|
|||
int x,c;
|
||||
int oldvc;
|
||||
uint8_t chr,attr;
|
||||
uint16_t dat,dat2,dat3,dat4;
|
||||
uint16_t dat;
|
||||
int cols[4];
|
||||
int col;
|
||||
int oldsc;
|
||||
|
|
@ -582,8 +586,8 @@ void tandy_poll()
|
|||
|
||||
int tandy_init()
|
||||
{
|
||||
mem_sethandler(0xb8000, 0x8000, tandy_read, NULL, NULL, tandy_write, NULL, NULL);
|
||||
io_sethandler(0x00a0, 0x0002, tandy_in, NULL, NULL, tandy_out, NULL, NULL);
|
||||
mem_sethandler(0xb8000, 0x8000, tandy_read, NULL, NULL, tandy_write, NULL, NULL, NULL);
|
||||
io_sethandler(0x00a0, 0x0002, tandy_in, NULL, NULL, tandy_out, NULL, NULL, NULL);
|
||||
tandy_memctrl = -1;
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue