Retro/pcem
Watch
1
0
Fork
You've already forked pcem
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Now up to date with current dev version.

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

52
src/vid_ega.c
View file

@ -1,10 +1,11 @@
/*EGA emulation*/
#include "ibm.h"
#include "io.h"
#include "mem.h"
#include "timer.h"
#include "video.h"
void ega_recalctimings();
void ega_write(uint32_t addr, uint8_t val);
uint8_t ega_read(uint32_t addr);
#include "vid_ega.h"
#include "vid_svga.h"
extern uint8_t edatlookup[4][4];
@ -16,7 +17,7 @@ static uint8_t ega_rotate[8][256];
/*3C2 controls default mode on EGA. On VGA, it determines monitor type (mono or colour)*/
int egaswitchread,egaswitches=9; /*7=CGA mode (200 lines), 9=EGA mode (350 lines), 8=EGA mode (200 lines)*/
void ega_out(uint16_t addr, uint8_t val)
void ega_out(uint16_t addr, uint8_t val, void *priv)
{
int c;
uint8_t o,old;
@ -73,21 +74,21 @@ void ega_out(uint16_t addr, uint8_t val)
case 4: readplane=val&3; break;
case 5: writemode=val&3; readmode=val&8; break;
case 6:
mem_removehandler(0xa0000, 0x20000, ega_read, NULL, NULL, ega_write, NULL, NULL);
mem_removehandler(0xa0000, 0x20000, ega_read, NULL, NULL, ega_write, NULL, NULL, NULL);
// pclog("Write mapping %02X\n", val);
switch (val&0xC)
{
case 0x0: /*128k at A0000*/
mem_sethandler(0xa0000, 0x20000, ega_read, NULL, NULL, ega_write, NULL, NULL);
mem_sethandler(0xa0000, 0x20000, ega_read, NULL, NULL, ega_write, NULL, NULL, NULL);
break;
case 0x4: /*64k at A0000*/
mem_sethandler(0xa0000, 0x10000, ega_read, NULL, NULL, ega_write, NULL, NULL);
mem_sethandler(0xa0000, 0x10000, ega_read, NULL, NULL, ega_write, NULL, NULL, NULL);
break;
case 0x8: /*32k at B0000*/
mem_sethandler(0xb0000, 0x08000, ega_read, NULL, NULL, ega_write, NULL, NULL);
mem_sethandler(0xb0000, 0x08000, ega_read, NULL, NULL, ega_write, NULL, NULL, NULL);
break;
case 0xC: /*32k at B8000*/
mem_sethandler(0xb8000, 0x08000, ega_read, NULL, NULL, ega_write, NULL, NULL);
mem_sethandler(0xb8000, 0x08000, ega_read, NULL, NULL, ega_write, NULL, NULL, NULL);
break;
}
@ -114,9 +115,8 @@ void ega_out(uint16_t addr, uint8_t val)
}
}
uint8_t ega_in(uint16_t addr)
uint8_t ega_in(uint16_t addr, void *priv)
{
uint8_t temp;
if ((addr&0xFFF0) == 0x3B0) addr |= 0x20;
switch (addr)
{
@ -161,8 +161,9 @@ static int scrollcache;
void ega_recalctimings()
{
float crtcconst;
int temp;
double _dispontime, _dispofftime;
double crtcconst;
ega_vtotal=crtc[6];
ega_dispend=crtc[0x12];
ega_vsyncstart=crtc[0x10];
@ -195,14 +196,16 @@ void ega_recalctimings()
else crtcconst=(seqregs[1]&1)?(CGACONST*(8.0/9.0)):CGACONST;
disptime=crtc[0]+2;
dispontime=crtc[1]+1;
_dispontime=crtc[1]+1;
printf("Disptime %f dispontime %f hdisp %i\n",disptime,dispontime,crtc[1]*8);
if (seqregs[1]&8) { disptime*=2; dispontime*=2; }
dispofftime=disptime-dispontime;
dispontime*=crtcconst;
dispofftime*=crtcconst;
printf("Disptime %f dispontime %f hdisp %i\n",disptime,_dispontime,crtc[1]*8);
if (seqregs[1]&8) { disptime*=2; _dispontime*=2; }
_dispofftime=disptime-_dispontime;
_dispontime*=crtcconst;
_dispofftime*=crtcconst;
dispontime = (int)(_dispontime * (1 << TIMER_SHIFT));
dispofftime = (int)(_dispofftime * (1 << TIMER_SHIFT));
// printf("EGA horiz total %i display end %i clock rate %i vidclock %i %i\n",crtc[0],crtc[1],egaswitchread,vidclock,((ega3c2>>2)&3) | ((tridentnewctrl2<<2)&4));
// printf("EGA vert total %i display end %i max row %i vsync %i\n",ega_vtotal,ega_dispend,(crtc[9]&31)+1,ega_vsyncstart);
@ -525,11 +528,9 @@ void ega_poll()
}
void ega_write(uint32_t addr, uint8_t val)
void ega_write(uint32_t addr, uint8_t val, void *priv)
{
int x,y;
char s[2]={0,0};
uint8_t vala,valb,valc,vald,wm=writemask;
uint8_t vala,valb,valc,vald;
egawrites++;
cycles -= video_timing_b;
@ -647,10 +648,9 @@ void ega_write(uint32_t addr, uint8_t val)
}
}
uint8_t ega_read(uint32_t addr)
uint8_t ega_read(uint32_t addr, void *priv)
{
uint8_t temp,temp2,temp3,temp4;
uint32_t addr2;
egareads++;
cycles -= video_timing_b;
cycles_lost += video_timing_b;