80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Merge pull request #2387 from 86Box/tc1995

Browse Source 
EGA fixes to FantasyLand for said card.
This commit is contained in:
Miran Grča
2022-06-12 20:18:39 +02:00
committed by GitHub
parent fabeeca2da dbea8ec715
commit dce5055d9c
4 changed files with 309 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/include/86box/vid_ega.h
View File

@@ -65,6 +65,9 @@ typedef struct ega_t {
double clock; double clock;
int remap_required;
uint32_t (*remap_func)(struct ega_t *ega, uint32_t in_addr);
void (*render)(struct ega_t *svga); void (*render)(struct ega_t *svga);
void *eeprom; void *eeprom;
@@ -94,6 +97,7 @@ extern int update_overscan;
#if defined(EMU_MEM_H) && defined(EMU_ROM_H) #if defined(EMU_MEM_H) && defined(EMU_ROM_H)
extern void ega_init(ega_t *ega, int monitor_type, int is_mono); extern void ega_init(ega_t *ega, int monitor_type, int is_mono);
extern void ega_recalctimings(struct ega_t *ega); extern void ega_recalctimings(struct ega_t *ega);
extern void ega_recalc_remap_func(struct ega_t *ega);
#endif #endif
extern void ega_out(uint16_t addr, uint8_t val, void *p); extern void ega_out(uint16_t addr, uint8_t val, void *p);

111
src/include/86box/vid_ega_render_remap.h Normal file
View File

@@ -0,0 +1,111 @@
#ifndef VIDEO_EGA_RENDER_REMAP_H
# define VIDEO_EGA_RENDER_REMAP_H
#define VAR_BYTE_MODE (0 << 0)
#define VAR_WORD_MODE_MA13 (1 << 0)
#define VAR_WORD_MODE_MA15 (2 << 0)
#define VAR_DWORD_MODE (3 << 0)
#define VAR_MODE_MASK (3 << 0)
#define VAR_ROW0_MA13 (1 << 2)
#define VAR_ROW1_MA14 (1 << 3)
#define ADDRESS_REMAP_FUNC(nr) \
static uint32_t address_remap_func_ ## nr(ega_t *ega, uint32_t in_addr) \
{ \
uint32_t out_addr; \
\
switch (nr & VAR_MODE_MASK) \
{ \
case VAR_BYTE_MODE: \
out_addr = in_addr; \
break; \
\
case VAR_WORD_MODE_MA13: \
out_addr = ((in_addr << 1) & 0x1fff8) | \
((in_addr >> 13) & 0x4) | \
(in_addr & ~0x1ffff); \
break; \
\
case VAR_WORD_MODE_MA15: \
out_addr = ((in_addr << 1) & 0x1fff8) | \
((in_addr >> 15) & 0x4) | \
(in_addr & ~0x1ffff); \
break; \
\
case VAR_DWORD_MODE: \
out_addr = ((in_addr << 2) & 0x3fff0) | \
((in_addr >> 14) & 0xc) | \
(in_addr & ~0x3ffff); \
break; \
} \
\
if (nr & VAR_ROW0_MA13) \
out_addr = (out_addr & ~0x8000) | \
((ega->sc & 1) ? 0x8000 : 0); \
if (nr & VAR_ROW1_MA14) \
out_addr = (out_addr & ~0x10000) | \
((ega->sc & 2) ? 0x10000 : 0); \
\
return out_addr; \
}
ADDRESS_REMAP_FUNC(0)
ADDRESS_REMAP_FUNC(1)
ADDRESS_REMAP_FUNC(2)
ADDRESS_REMAP_FUNC(3)
ADDRESS_REMAP_FUNC(4)
ADDRESS_REMAP_FUNC(5)
ADDRESS_REMAP_FUNC(6)
ADDRESS_REMAP_FUNC(7)
ADDRESS_REMAP_FUNC(8)
ADDRESS_REMAP_FUNC(9)
ADDRESS_REMAP_FUNC(10)
ADDRESS_REMAP_FUNC(11)
ADDRESS_REMAP_FUNC(12)
ADDRESS_REMAP_FUNC(13)
ADDRESS_REMAP_FUNC(14)
ADDRESS_REMAP_FUNC(15)
static uint32_t (*address_remap_funcs[16])(ega_t *ega, uint32_t in_addr) =
{
address_remap_func_0,
address_remap_func_1,
address_remap_func_2,
address_remap_func_3,
address_remap_func_4,
address_remap_func_5,
address_remap_func_6,
address_remap_func_7,
address_remap_func_8,
address_remap_func_9,
address_remap_func_10,
address_remap_func_11,
address_remap_func_12,
address_remap_func_13,
address_remap_func_14,
address_remap_func_15
};
void ega_recalc_remap_func(ega_t *ega)
{
int func_nr;
if (ega->crtc[0x14] & 0x40)
func_nr = VAR_DWORD_MODE;
else if (ega->crtc[0x17] & 0x40)
func_nr = VAR_BYTE_MODE;
else if (ega->crtc[0x17] & 0x20)
func_nr = VAR_WORD_MODE_MA15;
else
func_nr = VAR_WORD_MODE_MA13;
if (!(ega->crtc[0x17] & 0x01))
func_nr |= VAR_ROW0_MA13;
if (!(ega->crtc[0x17] & 0x02))
func_nr |= VAR_ROW1_MA14;
ega->remap_required = (func_nr != 0);
ega->remap_func = address_remap_funcs[func_nr];
}
#endif /*VIDEO_RENDER_REMAP_H*/

4
src/video/vid_ega.c
View File

@@ -461,6 +461,8 @@ ega_recalctimings(ega_t *ega)
ega->dispontime = TIMER_USEC; ega->dispontime = TIMER_USEC;
if (ega->dispofftime < TIMER_USEC) if (ega->dispofftime < TIMER_USEC)
ega->dispofftime = TIMER_USEC; ega->dispofftime = TIMER_USEC;
ega_recalc_remap_func(ega);
} }
@@ -561,7 +563,7 @@ ega_poll(void *p)
} }
} }
ega->vc++; ega->vc++;
ega->vc &= 1023; ega->vc &= 511;
if (ega->vc == ega->split) { if (ega->vc == ega->split) {
if (ega->interlace && ega->oddeven) if (ega->interlace && ega->oddeven)
ega->ma = ega->maback = ega->ma_latch + (ega->rowoffset << 1); ega->ma = ega->maback = ega->ma_latch + (ega->rowoffset << 1);

426
src/video/vid_ega_render.c
View File

@@ -27,6 +27,7 @@
#include <86box/rom.h> #include <86box/rom.h>
#include <86box/video.h> #include <86box/video.h>
#include <86box/vid_ega.h> #include <86box/vid_ega.h>
#include <86box/vid_ega_render_remap.h>
int int
@@ -113,6 +114,7 @@ ega_render_text_40(ega_t *ega)
uint8_t chr, attr, dat; uint8_t chr, attr, dat;
uint32_t charaddr; uint32_t charaddr;
int fg, bg; int fg, bg;
uint32_t addr;
if ((ega->displine + ega->y_add) < 0) if ((ega->displine + ega->y_add) < 0)
return; return;
@@ -126,27 +128,31 @@ ega_render_text_40(ega_t *ega)
xinc = (ega->seqregs[1] & 1) ? 16 : 18; xinc = (ega->seqregs[1] & 1) ? 16 : 18;
for (x = 0; x < (ega->hdisp + ega->scrollcache); x += xinc) { for (x = 0; x < (ega->hdisp + ega->scrollcache); x += xinc) {
addr = ega->remap_func(ega, ega->ma) & ega->vrammask;
drawcursor = ((ega->ma == ega->ca) && ega->con && ega->cursoron); drawcursor = ((ega->ma == ega->ca) && ega->con && ega->cursoron);
if (ega->crtc[0x17] & 0x80) { if (ega->crtc[0x17] & 0x80) {
chr = ega->vram[(ega->ma << 1) & ega->vrammask]; chr = ega->vram[addr];
attr = ega->vram[((ega->ma << 1) + 1) & ega->vrammask]; attr = ega->vram[addr + 1];
} else } else
chr = attr = 0; chr = attr = 0;
if (attr & 8) charaddr = ega->charsetb + (chr * 128); if (attr & 8)
else charaddr = ega->charseta + (chr * 128); charaddr = ega->charsetb + ((chr * 0x80));
else
charaddr = ega->charseta + ((chr * 0x80));
if (drawcursor) { if (drawcursor) {
bg = ega->pallook[ega->egapal[attr & 15]]; bg = ega->pallook[ega->egapal[attr & 0x0f]];
fg = ega->pallook[ega->egapal[attr >> 4]]; fg = ega->pallook[ega->egapal[attr >> 4]];
} else { } else {
fg = ega->pallook[ega->egapal[attr & 15]]; fg = ega->pallook[ega->egapal[attr & 0x0f]];
bg = ega->pallook[ega->egapal[attr >> 4]]; bg = ega->pallook[ega->egapal[attr >> 4]];
if (attr & 0x80 && ega->attrregs[0x10] & 8) { if ((attr & 0x80) && ega->attrregs[0x10] & 8) {
bg = ega->pallook[ega->egapal[(attr >> 4) & 7]]; bg = ega->pallook[ega->egapal[(attr >> 4) & 7]];
if (ega->blink & 16) if (ega->blink & 0x10)
fg = bg; fg = bg;
} }
} }
@@ -180,6 +186,7 @@ ega_render_text_80(ega_t *ega)
uint8_t chr, attr, dat; uint8_t chr, attr, dat;
uint32_t charaddr; uint32_t charaddr;
int fg, bg; int fg, bg;
uint32_t addr;
if ((ega->displine + ega->y_add) < 0) if ((ega->displine + ega->y_add) < 0)
return; return;
@@ -189,50 +196,54 @@ ega_render_text_80(ega_t *ega)
ega->lastline_draw = ega->displine; ega->lastline_draw = ega->displine;
if (fullchange) { if (fullchange) {
p = &buffer32->line[ega->displine + ega->y_add][ega->x_add]; p = &buffer32->line[ega->displine + ega->y_add][ega->x_add];
xinc = (ega->seqregs[1] & 1) ? 8 : 9; xinc = (ega->seqregs[1] & 1) ? 8 : 9;
for (x = 0; x < (ega->hdisp + ega->scrollcache); x += xinc) { for (x = 0; x < (ega->hdisp + ega->scrollcache); x += xinc) {
drawcursor = ((ega->ma == ega->ca) && ega->con && ega->cursoron); addr = ega->remap_func(ega, ega->ma) & ega->vrammask;
if (ega->crtc[0x17] & 0x80) { drawcursor = ((ega->ma == ega->ca) && ega->con && ega->cursoron);
chr = ega->vram[(ega->ma << 1) & ega->vrammask];
attr = ega->vram[((ega->ma << 1) + 1) & ega->vrammask];
} else
chr = attr = 0;
if (attr & 8) charaddr = ega->charsetb + (chr * 128); if (ega->crtc[0x17] & 0x80) {
else charaddr = ega->charseta + (chr * 128); chr = ega->vram[addr];
attr = ega->vram[addr + 1];
} else
chr = attr = 0;
if (drawcursor) { if (attr & 0x08)
bg = ega->pallook[ega->egapal[attr & 15]]; charaddr = ega->charsetb + (chr * 0x80);
fg = ega->pallook[ega->egapal[attr >> 4]]; else
} else { charaddr = ega->charseta + (chr * 0x80);
fg = ega->pallook[ega->egapal[attr & 15]];
bg = ega->pallook[ega->egapal[attr >> 4]];
if (attr & 0x80 && ega->attrregs[0x10] & 8) {
bg = ega->pallook[ega->egapal[(attr >> 4) & 7]];
if (ega->blink & 16)
fg = bg;
}
}
dat = ega->vram[charaddr + (ega->sc << 2)]; if (drawcursor) {
if (ega->seqregs[1] & 1) { bg = ega->pallook[ega->egapal[attr & 0x0f]];
for (xx = 0; xx < 8; xx++) fg = ega->pallook[ega->egapal[attr >> 4]];
p[xx] = (dat & (0x80 >> xx)) ? fg : bg; } else {
} else { fg = ega->pallook[ega->egapal[attr & 0x0f]];
for (xx = 0; xx < 8; xx++) bg = ega->pallook[ega->egapal[attr >> 4]];
p[xx] = (dat & (0x80 >> xx)) ? fg : bg; if ((attr & 0x80) && ega->attrregs[0x10] & 8) {
if ((chr & ~0x1F) != 0xC0 || !(ega->attrregs[0x10] & 4)) bg = ega->pallook[ega->egapal[(attr >> 4) & 7]];
p[8] = bg; if (ega->blink & 16)
else fg = bg;
p[8] = (dat & 1) ? fg : bg; }
} }
ega->ma += 4;
p += xinc; dat = ega->vram[charaddr + (ega->sc << 2)];
} if (ega->seqregs[1] & 1) {
ega->ma &= ega->vrammask; for (xx = 0; xx < 8; xx++)
p[xx] = (dat & (0x80 >> xx)) ? fg : bg;
} else {
for (xx = 0; xx < 8; xx++)
p[xx] = (dat & (0x80 >> xx)) ? fg : bg;
if ((chr & ~0x1F) != 0xC0 || !(ega->attrregs[0x10] & 4))
p[8] = bg;
else
p[8] = (dat & 1) ? fg : bg;
}
ega->ma += 4;
p += xinc;
}
ega->ma &= ega->vrammask;
} }
} }
@@ -243,59 +254,47 @@ ega_render_2bpp_lowres(ega_t *ega)
int x; int x;
uint8_t dat[2]; uint8_t dat[2];
uint32_t addr, *p; uint32_t addr, *p;
uint32_t changed_addr;
if ((ega->displine + ega->y_add) < 0) if ((ega->displine + ega->y_add) < 0)
return; return;
p = &buffer32->line[ega->displine + ega->y_add][ega->x_add]; changed_addr = ega->remap_func(ega, ega->ma);
if (ega->firstline_draw == 2000) if (fullchange) {
ega->firstline_draw = ega->displine; p = &buffer32->line[ega->displine + ega->y_add][ega->x_add];
ega->lastline_draw = ega->displine;
for (x = 0; x <= (ega->hdisp + ega->scrollcache); x += 16) { if (ega->firstline_draw == 2000)
addr = ega->ma; ega->firstline_draw = ega->displine;
ega->lastline_draw = ega->displine;
if (!(ega->crtc[0x17] & 0x40)) { for (x = 0; x <= (ega->hdisp + ega->scrollcache); x += 16) {
addr = (addr << 1) & ega->vrammask; addr = ega->remap_func(ega, ega->ma);
addr &= ~7;
if ((ega->crtc[0x17] & 0x20) && (ega->ma & 0x20000)) dat[0] = ega->vram[addr];
addr |= 4; dat[1] = ega->vram[addr | 0x1];
if (ega->seqregs[1] & 4)
ega->ma += 2;
else
ega->ma += 4;
if (!(ega->crtc[0x17] & 0x20) && (ega->ma & 0x8000)) ega->ma &= ega->vrammask;
addr |= 4;
if (ega->crtc[0x17] & 0x80) {
p[0] = p[1] = ega->pallook[ega->egapal[(dat[0] >> 6) & 3]];
p[2] = p[3] = ega->pallook[ega->egapal[(dat[0] >> 4) & 3]];
p[4] = p[5] = ega->pallook[ega->egapal[(dat[0] >> 2) & 3]];
p[6] = p[7] = ega->pallook[ega->egapal[dat[0] & 3]];
p[8] = p[9] = ega->pallook[ega->egapal[(dat[1] >> 6) & 3]];
p[10] = p[11] = ega->pallook[ega->egapal[(dat[1] >> 4) & 3]];
p[12] = p[13] = ega->pallook[ega->egapal[(dat[1] >> 2) & 3]];
p[14] = p[15] = ega->pallook[ega->egapal[dat[1] & 3]];
} else
memset(p, 0x00, 16 * sizeof(uint32_t));
p += 16;
}
} }
if (!(ega->crtc[0x17] & 0x01))
addr = (addr & ~0x8000) | ((ega->sc & 1) ? 0x8000 : 0);
if (!(ega->crtc[0x17] & 0x02))
addr = (addr & ~0x10000) | ((ega->sc & 2) ? 0x10000 : 0);
dat[0] = ega->vram[addr];
dat[1] = ega->vram[addr | 0x1];
if (ega->seqregs[1] & 4)
ega->ma += 2;
else
ega->ma += 4;
ega->ma &= ega->vrammask;
if (ega->crtc[0x17] & 0x80) {
p[0] = p[1] = ega->pallook[ega->egapal[(dat[0] >> 6) & 3]];
p[2] = p[3] = ega->pallook[ega->egapal[(dat[0] >> 4) & 3]];
p[4] = p[5] = ega->pallook[ega->egapal[(dat[0] >> 2) & 3]];
p[6] = p[7] = ega->pallook[ega->egapal[dat[0] & 3]];
p[8] = p[9] = ega->pallook[ega->egapal[(dat[1] >> 6) & 3]];
p[10] = p[11] = ega->pallook[ega->egapal[(dat[1] >> 4) & 3]];
p[12] = p[13] = ega->pallook[ega->egapal[(dat[1] >> 2) & 3]];
p[14] = p[15] = ega->pallook[ega->egapal[dat[1] & 3]];
} else
memset(p, 0x00, 16 * sizeof(uint32_t));
p += 16;
}
} }
@@ -305,58 +304,46 @@ ega_render_2bpp_highres(ega_t *ega)
int x; int x;
uint8_t dat[2]; uint8_t dat[2];
uint32_t addr, *p; uint32_t addr, *p;
uint32_t changed_addr;
if ((ega->displine + ega->y_add) < 0) if ((ega->displine + ega->y_add) < 0)
return; return;
changed_addr = ega->remap_func(ega, ega->ma);
if (fullchange) {
p = &buffer32->line[ega->displine + ega->y_add][ega->x_add]; p = &buffer32->line[ega->displine + ega->y_add][ega->x_add];
if (ega->firstline_draw == 2000) if (ega->firstline_draw == 2000)
ega->firstline_draw = ega->displine; ega->firstline_draw = ega->displine;
ega->lastline_draw = ega->displine; ega->lastline_draw = ega->displine;
for (x = 0; x <= (ega->hdisp + ega->scrollcache); x += 8) { for (x = 0; x <= (ega->hdisp + ega->scrollcache); x += 8) {
addr = ega->ma; addr = ega->remap_func(ega, ega->ma);
if (!(ega->crtc[0x17] & 0x40)) { dat[0] = ega->vram[addr];
addr = (addr << 1) & ega->vrammask; dat[1] = ega->vram[addr | 0x1];
addr &= ~7; if (ega->seqregs[1] & 4)
ega->ma += 2;
else
ega->ma += 4;
if ((ega->crtc[0x17] & 0x20) && (ega->ma & 0x20000)) ega->ma &= ega->vrammask;
addr |= 4;
if (!(ega->crtc[0x17] & 0x20) && (ega->ma & 0x8000)) if (ega->crtc[0x17] & 0x80) {
addr |= 4; p[0] = ega->pallook[ega->egapal[(dat[0] >> 6) & 3]];
} p[1] = ega->pallook[ega->egapal[(dat[0] >> 4) & 3]];
p[2] = ega->pallook[ega->egapal[(dat[0] >> 2) & 3]];
p[3] = ega->pallook[ega->egapal[dat[0] & 3]];
p[4] = ega->pallook[ega->egapal[(dat[1] >> 6) & 3]];
p[5] = ega->pallook[ega->egapal[(dat[1] >> 4) & 3]];
p[6] = ega->pallook[ega->egapal[(dat[1] >> 2) & 3]];
p[7] = ega->pallook[ega->egapal[dat[1] & 3]];
} else
memset(p, 0x00, 8 * sizeof(uint32_t));
if (!(ega->crtc[0x17] & 0x01)) p += 8;
addr = (addr & ~0x8000) | ((ega->sc & 1) ? 0x8000 : 0); }
if (!(ega->crtc[0x17] & 0x02))
addr = (addr & ~0x10000) | ((ega->sc & 2) ? 0x10000 : 0);
dat[0] = ega->vram[addr];
dat[1] = ega->vram[addr | 0x1];
if (ega->seqregs[1] & 4)
ega->ma += 2;
else
ega->ma += 4;
ega->ma &= ega->vrammask;
if (ega->crtc[0x17] & 0x80) {
p[0] = ega->pallook[ega->egapal[(dat[0] >> 6) & 3]];
p[1] = ega->pallook[ega->egapal[(dat[0] >> 4) & 3]];
p[2] = ega->pallook[ega->egapal[(dat[0] >> 2) & 3]];
p[3] = ega->pallook[ega->egapal[dat[0] & 3]];
p[4] = ega->pallook[ega->egapal[(dat[1] >> 6) & 3]];
p[5] = ega->pallook[ega->egapal[(dat[1] >> 4) & 3]];
p[6] = ega->pallook[ega->egapal[(dat[1] >> 2) & 3]];
p[7] = ega->pallook[ega->egapal[dat[1] & 3]];
} else
memset(p, 0x00, 8 * sizeof(uint32_t));
p += 8;
} }
} }
@@ -367,72 +354,54 @@ ega_render_4bpp_lowres(ega_t *ega)
int x, oddeven; int x, oddeven;
uint8_t dat, edat[4]; uint8_t dat, edat[4];
uint32_t addr, *p; uint32_t addr, *p;
uint32_t changed_addr;
if ((ega->displine + ega->y_add) < 0) if ((ega->displine + ega->y_add) < 0)
return; return;
p = &buffer32->line[ega->displine + ega->y_add][ega->x_add]; changed_addr = ega->remap_func(ega, ega->ma);
if (ega->firstline_draw == 2000) if (fullchange) {
ega->firstline_draw = ega->displine; p = &buffer32->line[ega->displine + ega->y_add][ega->x_add];
ega->lastline_draw = ega->displine;
for (x = 0; x <= (ega->hdisp + ega->scrollcache); x += 16) { if (ega->firstline_draw == 2000)
addr = ega->ma; ega->firstline_draw = ega->displine;
oddeven = 0; ega->lastline_draw = ega->displine;
if (!(ega->crtc[0x17] & 0x40)) { for (x = 0; x <= (ega->hdisp + ega->scrollcache); x += 16) {
addr = (addr << 1) & ega->vrammask; addr = ega->remap_func(ega, ega->ma);
oddeven = 0;
if (ega->seqregs[1] & 4) if (ega->seqregs[1] & 4) {
oddeven = (addr & 4) ? 1 : 0; oddeven = (addr & 4) ? 1 : 0;
edat[0] = ega->vram[addr | oddeven];
edat[2] = ega->vram[addr | oddeven | 0x2];
edat[1] = edat[3] = 0;
ega->ma += 2;
} else {
*(uint32_t *)(&edat[0]) = *(uint32_t *)(&ega->vram[addr]);
ega->ma += 4;
}
ega->ma &= ega->vrammask;
addr &= ~7; if (ega->crtc[0x17] & 0x80) {
dat = edatlookup[edat[0] >> 6][edat[1] >> 6] | (edatlookup[edat[2] >> 6][edat[3] >> 6] << 2);
p[0] = p[1] = ega->pallook[ega->egapal[(dat >> 4) & ega->plane_mask]];
p[2] = p[3] = ega->pallook[ega->egapal[dat & ega->plane_mask]];
dat = edatlookup[(edat[0] >> 4) & 3][(edat[1] >> 4) & 3] | (edatlookup[(edat[2] >> 4) & 3][(edat[3] >> 4) & 3] << 2);
p[4] = p[5] = ega->pallook[ega->egapal[(dat >> 4) & ega->plane_mask]];
p[6] = p[7] = ega->pallook[ega->egapal[dat & ega->plane_mask]];
dat = edatlookup[(edat[0] >> 2) & 3][(edat[1] >> 2) & 3] | (edatlookup[(edat[2] >> 2) & 3][(edat[3] >> 2) & 3] << 2);
p[8] = p[9] = ega->pallook[ega->egapal[(dat >> 4) & ega->plane_mask]];
p[10] = p[11] = ega->pallook[ega->egapal[dat & ega->plane_mask]];
dat = edatlookup[edat[0] & 3][edat[1] & 3] | (edatlookup[edat[2] & 3][edat[3] & 3] << 2);
p[12] = p[13] = ega->pallook[ega->egapal[(dat >> 4) & ega->plane_mask]];
p[14] = p[15] = ega->pallook[ega->egapal[dat & ega->plane_mask]];
} else
memset(p, 0x00, 16 * sizeof(uint32_t));
if ((ega->crtc[0x17] & 0x20) && (ega->ma & 0x20000)) p += 16;
addr |= 4; }
if (!(ega->crtc[0x17] & 0x20) && (ega->ma & 0x8000))
addr |= 4;
}
if (!(ega->crtc[0x17] & 0x01))
addr = (addr & ~0x8000) | ((ega->sc & 1) ? 0x8000 : 0);
if (!(ega->crtc[0x17] & 0x02))
addr = (addr & ~0x10000) | ((ega->sc & 2) ? 0x10000 : 0);
if (ega->seqregs[1] & 4) {
edat[0] = ega->vram[addr | oddeven];
edat[2] = ega->vram[addr | oddeven | 0x2];
edat[1] = edat[3] = 0;
ega->ma += 2;
} else {
edat[0] = ega->vram[addr];
edat[1] = ega->vram[addr | 0x1];
edat[2] = ega->vram[addr | 0x2];
edat[3] = ega->vram[addr | 0x3];
ega->ma += 4;
}
ega->ma &= ega->vrammask;
if (ega->crtc[0x17] & 0x80) {
dat = edatlookup[edat[0] >> 6][edat[1] >> 6] | (edatlookup[edat[2] >> 6][edat[3] >> 6] << 2);
p[0] = p[1] = ega->pallook[ega->egapal[(dat >> 4) & ega->plane_mask]];
p[2] = p[3] = ega->pallook[ega->egapal[dat & ega->plane_mask]];
dat = edatlookup[(edat[0] >> 4) & 3][(edat[1] >> 4) & 3] | (edatlookup[(edat[2] >> 4) & 3][(edat[3] >> 4) & 3] << 2);
p[4] = p[5] = ega->pallook[ega->egapal[(dat >> 4) & ega->plane_mask]];
p[6] = p[7] = ega->pallook[ega->egapal[dat & ega->plane_mask]];
dat = edatlookup[(edat[0] >> 2) & 3][(edat[1] >> 2) & 3] | (edatlookup[(edat[2] >> 2) & 3][(edat[3] >> 2) & 3] << 2);
p[8] = p[9] = ega->pallook[ega->egapal[(dat >> 4) & ega->plane_mask]];
p[10] = p[11] = ega->pallook[ega->egapal[dat & ega->plane_mask]];
dat = edatlookup[edat[0] & 3][edat[1] & 3] | (edatlookup[edat[2] & 3][edat[3] & 3] << 2);
p[12] = p[13] = ega->pallook[ega->egapal[(dat >> 4) & ega->plane_mask]];
p[14] = p[15] = ega->pallook[ega->egapal[dat & ega->plane_mask]];
} else
memset(p, 0x00, 16 * sizeof(uint32_t));
p += 16;
} }
} }
@@ -443,66 +412,53 @@ ega_render_4bpp_highres(ega_t *ega)
int x, oddeven; int x, oddeven;
uint8_t dat, edat[4]; uint8_t dat, edat[4];
uint32_t addr, *p; uint32_t addr, *p;
uint32_t changed_addr;
if ((ega->displine + ega->y_add) < 0) if ((ega->displine + ega->y_add) < 0)
return; return;
p = &buffer32->line[ega->displine + ega->y_add][ega->x_add]; changed_addr = ega->remap_func(ega, ega->ma);
if (ega->firstline_draw == 2000) if (fullchange) {
ega->firstline_draw = ega->displine; p = &buffer32->line[ega->displine + ega->y_add][ega->x_add];
ega->lastline_draw = ega->displine;
for (x = 0; x <= (ega->hdisp + ega->scrollcache); x += 8) { if (ega->firstline_draw == 2000)
addr = ega->ma; ega->firstline_draw = ega->displine;
oddeven = 0; ega->lastline_draw = ega->displine;
if (!(ega->crtc[0x17] & 0x40)) { for (x = 0; x <= (ega->hdisp + ega->scrollcache); x += 8) {
addr = (addr << 1) & ega->vrammask; addr = ega->remap_func(ega, ega->ma);
oddeven = 0;
if (ega->seqregs[1] & 4) if (ega->seqregs[1] & 4) {
oddeven = (addr & 4) ? 1 : 0; oddeven = (addr & 4) ? 1 : 0;
edat[0] = ega->vram[addr | oddeven];
edat[2] = ega->vram[addr | oddeven | 0x2];
edat[1] = edat[3] = 0;
ega->ma += 2;
} else {
*(uint32_t *)(&edat[0]) = *(uint32_t *)(&ega->vram[addr]);
ega->ma += 4;
}
ega->ma &= ega->vrammask;
addr &= ~7; if (ega->crtc[0x17] & 0x80) {
dat = edatlookup[edat[0] >> 6][edat[1] >> 6] | (edatlookup[edat[2] >> 6][edat[3] >> 6] << 2);
p[0] = ega->pallook[ega->egapal[(dat >> 4) & ega->plane_mask]];
p[1] = ega->pallook[ega->egapal[dat & ega->plane_mask]];
dat = edatlookup[(edat[0] >> 4) & 3][(edat[1] >> 4) & 3] | (edatlookup[(edat[2] >> 4) & 3][(edat[3] >> 4) & 3] << 2);
p[2] = ega->pallook[ega->egapal[(dat >> 4) & ega->plane_mask]];
p[3] = ega->pallook[ega->egapal[dat & ega->plane_mask]];
dat = edatlookup[(edat[0] >> 2) & 3][(edat[1] >> 2) & 3] | (edatlookup[(edat[2] >> 2) & 3][(edat[3] >> 2) & 3] << 2);
p[4] = ega->pallook[ega->egapal[(dat >> 4) & ega->plane_mask]];
p[5] = ega->pallook[ega->egapal[dat & ega->plane_mask]];
dat = edatlookup[edat[0] & 3][edat[1] & 3] | (edatlookup[edat[2] & 3][edat[3] & 3] << 2);
p[6] = ega->pallook[ega->egapal[(dat >> 4) & ega->plane_mask]];
p[7] = ega->pallook[ega->egapal[dat & ega->plane_mask]];
} else
memset(p, 0x00, 8 * sizeof(uint32_t));
if ((ega->crtc[0x17] & 0x20) && (ega->ma & 0x20000)) p += 8;
addr |= 4; }
if (!(ega->crtc[0x17] & 0x20) && (ega->ma & 0x8000))
addr |= 4;
}
if (!(ega->crtc[0x17] & 0x01))
addr = (addr & ~0x8000) | ((ega->sc & 1) ? 0x8000 : 0);
if (!(ega->crtc[0x17] & 0x02))
addr = (addr & ~0x10000) | ((ega->sc & 2) ? 0x10000 : 0);
if (ega->seqregs[1] & 4) {
edat[0] = ega->vram[addr | oddeven];
edat[2] = ega->vram[addr | oddeven | 0x2];
edat[1] = edat[3] = 0;
ega->ma += 2;
} else {
*(uint32_t *)(&edat[0]) = *(uint32_t *)(&ega->vram[addr]);
ega->ma += 4;
}
ega->ma &= ega->vrammask;
if (ega->crtc[0x17] & 0x80) {
dat = edatlookup[edat[0] >> 6][edat[1] >> 6] | (edatlookup[edat[2] >> 6][edat[3] >> 6] << 2);
p[0] = ega->pallook[ega->egapal[(dat >> 4) & ega->plane_mask]];
p[1] = ega->pallook[ega->egapal[dat & ega->plane_mask]];
dat = edatlookup[(edat[0] >> 4) & 3][(edat[1] >> 4) & 3] | (edatlookup[(edat[2] >> 4) & 3][(edat[3] >> 4) & 3] << 2);
p[2] = ega->pallook[ega->egapal[(dat >> 4) & ega->plane_mask]];
p[3] = ega->pallook[ega->egapal[dat & ega->plane_mask]];
dat = edatlookup[(edat[0] >> 2) & 3][(edat[1] >> 2) & 3] | (edatlookup[(edat[2] >> 2) & 3][(edat[3] >> 2) & 3] << 2);
p[4] = ega->pallook[ega->egapal[(dat >> 4) & ega->plane_mask]];
p[5] = ega->pallook[ega->egapal[dat & ega->plane_mask]];
dat = edatlookup[edat[0] & 3][edat[1] & 3] | (edatlookup[edat[2] & 3][edat[3] & 3] << 2);
p[6] = ega->pallook[ega->egapal[(dat >> 4) & ega->plane_mask]];
p[7] = ega->pallook[ega->egapal[dat & ega->plane_mask]];
} else
memset(p, 0x00, 8 * sizeof(uint32_t));
p += 8;
} }
} }