joncampbell123/dosbox-x
1
0
Fork 0
mirror of https://github.com/joncampbell123/dosbox-x.git synced 2025-10-14 02:17:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

PC-98 EGC: Replace ope_xx (generic unknown EGC ROP handler) with code to handle remaining ROPs properly. This fixes Atomic Punker, which uses EGC ROP 0xBE in the game engine. [https://github.com/joncampbell123/dosbox-x/issues/3035]

Browse Source
This commit is contained in:
Jonathan Campbell
2021-11-03 17:43:29 -07:00
parent 07d9a19abb
commit df72c064f8
2 changed files with 135 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG
View File

@@ -6,6 +6,10 @@
- Video emulation for PC-98 mode (for 400-line modes)
is now 16:10 instead of 4:3. 480-line PC-98 modes
are still 4:3. (joncampbell123)
- PC-98 EGC emulation: Add generic ope_xx handler for
the remaining block of undefined/undocumented EGC ROPs.
This fixes "Atomic Punker" which uses EGC ROP 0xBE
for sprite rendering.
0.83.19
- Reorganized the "List network interfaces" and "List
printer devices" dialogs (under the "Help" menu) to

155
src/hardware/vga_memory.cpp
View File

@@ -923,10 +923,106 @@ template <class AWT> static inline void egc_fetch_planar(egc_quad &dst,const Phy
dst[3].w = *((uint16_t*)(pc98_pgraph_current_cpu_page+vramoff+pc98_pgram_bitplane_offset(3)));
}
static egc_quad &ope_xx(uint8_t ope, const PhysPt ad) {
(void)ad;//UNUSED
LOG_MSG("EGC ROP 0x%2x not impl",ope);
return pc98_egc_last_vram;
/* Generic EGC ROP handling according to Neko Project II.
* I assume it uses specialized functions for common ROPs as an optimization method
* since this generic handler does a lot of conditional bit operations. This is
* ope_xx transcribed for DOSBox-X. */
static egc_quad &ope_xx(uint8_t ope, const PhysPt vramoff) {
egc_quad pat;
egc_quad dst;
egc_fetch_planar<uint16_t>(/*&*/dst,vramoff);
switch(pc98_egc_fgc) {
case 1:
pat[0].w = pc98_egc_bgcm[0].w;
pat[1].w = pc98_egc_bgcm[1].w;
pat[2].w = pc98_egc_bgcm[2].w;
pat[3].w = pc98_egc_bgcm[3].w;
break;
case 2:
pat[0].w = pc98_egc_fgcm[0].w;
pat[1].w = pc98_egc_fgcm[1].w;
pat[2].w = pc98_egc_fgcm[2].w;
pat[3].w = pc98_egc_fgcm[3].w;
break;
// TODO: NP2kai source code (Neko Project II KAI) suggests the illegal value 11b (3) returns one foreground and one background color.
// Ref: https://github.com/AZO234/NP2kai mem/memegc.c line 774 ope_nd and ope_xx. I don't know if any games rely on that, but
// it might improve emulation accuracy to support it.
default:
if (pc98_egc_regload & 1) {
pat[0].w = pc98_egc_src[0].w;
pat[1].w = pc98_egc_src[1].w;
pat[2].w = pc98_egc_src[2].w;
pat[3].w = pc98_egc_src[3].w;
}
else {
pat[0].w = pc98_gdc_tiles[0].w;
pat[1].w = pc98_gdc_tiles[1].w;
pat[2].w = pc98_gdc_tiles[2].w;
pat[3].w = pc98_gdc_tiles[3].w;
}
break;
}
pc98_egc_data[0].w = 0;
pc98_egc_data[1].w = 0;
pc98_egc_data[2].w = 0;
pc98_egc_data[3].w = 0;
if (ope & 0x80) {
pc98_egc_data[0].w |= (pat[0].w & pc98_egc_src[0].w & dst[0].w);
pc98_egc_data[1].w |= (pat[1].w & pc98_egc_src[1].w & dst[1].w);
pc98_egc_data[2].w |= (pat[2].w & pc98_egc_src[2].w & dst[2].w);
pc98_egc_data[3].w |= (pat[3].w & pc98_egc_src[3].w & dst[3].w);
}
if (ope & 0x40) {
pc98_egc_data[0].w |= ((~pat[0].w) & pc98_egc_src[0].w & dst[0].w);
pc98_egc_data[1].w |= ((~pat[1].w) & pc98_egc_src[1].w & dst[1].w);
pc98_egc_data[2].w |= ((~pat[2].w) & pc98_egc_src[2].w & dst[2].w);
pc98_egc_data[3].w |= ((~pat[3].w) & pc98_egc_src[3].w & dst[3].w);
}
if (ope & 0x20) {
pc98_egc_data[0].w |= (pat[0].w & pc98_egc_src[0].w & (~dst[0].w));
pc98_egc_data[1].w |= (pat[1].w & pc98_egc_src[1].w & (~dst[1].w));
pc98_egc_data[2].w |= (pat[2].w & pc98_egc_src[2].w & (~dst[2].w));
pc98_egc_data[3].w |= (pat[3].w & pc98_egc_src[3].w & (~dst[3].w));
}
if (ope & 0x10) {
pc98_egc_data[0].w |= ((~pat[0].w) & pc98_egc_src[0].w & (~dst[0].w));
pc98_egc_data[1].w |= ((~pat[1].w) & pc98_egc_src[1].w & (~dst[1].w));
pc98_egc_data[2].w |= ((~pat[2].w) & pc98_egc_src[2].w & (~dst[2].w));
pc98_egc_data[3].w |= ((~pat[3].w) & pc98_egc_src[3].w & (~dst[3].w));
}
if (ope & 0x08) {
pc98_egc_data[0].w |= (pat[0].w & (~pc98_egc_src[0].w) & dst[0].w);
pc98_egc_data[1].w |= (pat[1].w & (~pc98_egc_src[1].w) & dst[1].w);
pc98_egc_data[2].w |= (pat[2].w & (~pc98_egc_src[2].w) & dst[2].w);
pc98_egc_data[3].w |= (pat[3].w & (~pc98_egc_src[3].w) & dst[3].w);
}
if (ope & 0x04) {
pc98_egc_data[0].w |= ((~pat[0].w) & (~pc98_egc_src[0].w) & dst[0].w);
pc98_egc_data[1].w |= ((~pat[1].w) & (~pc98_egc_src[1].w) & dst[1].w);
pc98_egc_data[2].w |= ((~pat[2].w) & (~pc98_egc_src[2].w) & dst[2].w);
pc98_egc_data[3].w |= ((~pat[3].w) & (~pc98_egc_src[3].w) & dst[3].w);
}
if (ope & 0x02) {
pc98_egc_data[0].w |= (pat[0].w & (~pc98_egc_src[0].w) & (~dst[0].w));
pc98_egc_data[1].w |= (pat[1].w & (~pc98_egc_src[1].w) & (~dst[1].w));
pc98_egc_data[2].w |= (pat[2].w & (~pc98_egc_src[2].w) & (~dst[2].w));
pc98_egc_data[3].w |= (pat[3].w & (~pc98_egc_src[3].w) & (~dst[3].w));
}
if (ope & 0x01) {
pc98_egc_data[0].w |= ((~pat[0].w) & (~pc98_egc_src[0].w) & (~dst[0].w));
pc98_egc_data[1].w |= ((~pat[1].w) & (~pc98_egc_src[1].w) & (~dst[1].w));
pc98_egc_data[2].w |= ((~pat[2].w) & (~pc98_egc_src[2].w) & (~dst[2].w));
pc98_egc_data[3].w |= ((~pat[3].w) & (~pc98_egc_src[3].w) & (~dst[3].w));
}
return pc98_egc_data;
}
static egc_quad &ope_00(uint8_t ope, const PhysPt vramoff) {
@@ -1023,6 +1119,10 @@ static egc_quad &ope_nd(uint8_t ope, const PhysPt vramoff) {
pat[3].w = pc98_egc_fgcm[3].w;
break;
// TODO: NP2kai source code (Neko Project II KAI) suggests the illegal value 11b (3) returns one foreground and one background color.
// Ref: https://github.com/AZO234/NP2kai mem/memegc.c line 774 ope_nd and ope_xx. I don't know if any games rely on that, but
// it might improve emulation accuracy to support it.
default:
if (pc98_egc_regload & 1) {
pat[0].w = pc98_egc_src[0].w;
@@ -1045,29 +1145,29 @@ static egc_quad &ope_nd(uint8_t ope, const PhysPt vramoff) {
pc98_egc_data[3].w = 0;
if (ope & 0x80) {
pc98_egc_data[0].w |= (pat[0].w & pc98_egc_src[0].w);
pc98_egc_data[1].w |= (pat[1].w & pc98_egc_src[1].w);
pc98_egc_data[2].w |= (pat[2].w & pc98_egc_src[2].w);
pc98_egc_data[3].w |= (pat[3].w & pc98_egc_src[3].w);
}
pc98_egc_data[0].w |= (pat[0].w & pc98_egc_src[0].w);
pc98_egc_data[1].w |= (pat[1].w & pc98_egc_src[1].w);
pc98_egc_data[2].w |= (pat[2].w & pc98_egc_src[2].w);
pc98_egc_data[3].w |= (pat[3].w & pc98_egc_src[3].w);
}
if (ope & 0x40) {
pc98_egc_data[0].w |= ((~pat[0].w) & pc98_egc_src[0].w);
pc98_egc_data[1].w |= ((~pat[1].w) & pc98_egc_src[1].w);
pc98_egc_data[2].w |= ((~pat[2].w) & pc98_egc_src[2].w);
pc98_egc_data[3].w |= ((~pat[3].w) & pc98_egc_src[3].w);
}
pc98_egc_data[0].w |= ((~pat[0].w) & pc98_egc_src[0].w);
pc98_egc_data[1].w |= ((~pat[1].w) & pc98_egc_src[1].w);
pc98_egc_data[2].w |= ((~pat[2].w) & pc98_egc_src[2].w);
pc98_egc_data[3].w |= ((~pat[3].w) & pc98_egc_src[3].w);
}
if (ope & 0x08) {
pc98_egc_data[0].w |= (pat[0].w & (~pc98_egc_src[0].w));
pc98_egc_data[1].w |= (pat[1].w & (~pc98_egc_src[1].w));
pc98_egc_data[2].w |= (pat[2].w & (~pc98_egc_src[2].w));
pc98_egc_data[3].w |= (pat[3].w & (~pc98_egc_src[3].w));
}
pc98_egc_data[0].w |= (pat[0].w & (~pc98_egc_src[0].w));
pc98_egc_data[1].w |= (pat[1].w & (~pc98_egc_src[1].w));
pc98_egc_data[2].w |= (pat[2].w & (~pc98_egc_src[2].w));
pc98_egc_data[3].w |= (pat[3].w & (~pc98_egc_src[3].w));
}
if (ope & 0x04) {
pc98_egc_data[0].w |= ((~pat[0].w) & (~pc98_egc_src[0].w));
pc98_egc_data[1].w |= ((~pat[1].w) & (~pc98_egc_src[1].w));
pc98_egc_data[2].w |= ((~pat[2].w) & (~pc98_egc_src[2].w));
pc98_egc_data[3].w |= ((~pat[3].w) & (~pc98_egc_src[3].w));
}
pc98_egc_data[0].w |= ((~pat[0].w) & (~pc98_egc_src[0].w));
pc98_egc_data[1].w |= ((~pat[1].w) & (~pc98_egc_src[1].w));
pc98_egc_data[2].w |= ((~pat[2].w) & (~pc98_egc_src[2].w));
pc98_egc_data[3].w |= ((~pat[3].w) & (~pc98_egc_src[3].w));
}
(void)ope;
(void)vramoff;
@@ -1136,6 +1236,10 @@ static egc_quad &ope_gg(uint8_t ope, const PhysPt vramoff) {
pat[3].w = pc98_egc_fgcm[3].w;
break;
// TODO: NP2kai source code (Neko Project II KAI) suggests the illegal value 11b (3) returns one foreground and one background color.
// Ref: https://github.com/AZO234/NP2kai mem/memegc.c line 774 ope_nd and ope_xx. I don't know if any games rely on that, but
// it might improve emulation accuracy to support it.
default:
if (pc98_egc_regload & 1) {
pat[0].w = pc98_egc_src[0].w;
@@ -1287,6 +1391,9 @@ template <class AWT> static egc_quad &egc_ope(const PhysPt vramoff, const AWT va
return pc98_egc_bgcm;
else if (pc98_egc_fgc == 2)
return pc98_egc_fgcm;
// TODO: NP2kai source code (Neko Project II KAI) suggests the illegal value 11b (3) returns one foreground and one background color.
// Ref: https://github.com/AZO234/NP2kai mem/memegc.c line 774 ope_nd and ope_xx. I don't know if any games rely on that, but
// it might improve emulation accuracy to support it.
if (pc98_egc_shiftinput) {
pc98_egc_shift.input<AWT>(