david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mode 4 and 5 write fix (Magnus Damn)

Browse Source 
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1241 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
bellard 2005-01-26 19:50:16 +00:00
parent f51589dad5
commit 0b74ed78ef
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hw/cirrus_vga.c
View File

@ -790,7 +790,7 @@ static void cirrus_bitblt_start(CirrusVGAState * s)
blt_rop = s->gr[0x32]; blt_rop = s->gr[0x32];
#ifdef DEBUG_BITBLT #ifdef DEBUG_BITBLT
printf("rop=0x%02x mode=0x%02x modeext=0x%02x w=%d h=%d dpitch=%d spicth=%d daddr=0x%08x saddr=0x%08x writemask=0x%02x\n", printf("rop=0x%02x mode=0x%02x modeext=0x%02x w=%d h=%d dpitch=%d spitch=%d daddr=0x%08x saddr=0x%08x writemask=0x%02x\n",
blt_rop, blt_rop,
s->cirrus_blt_mode, s->cirrus_blt_mode,
s->cirrus_blt_modeext, s->cirrus_blt_modeext,
@ -1780,11 +1780,12 @@ static void cirrus_mem_writeb_mode4and5_8bpp(CirrusVGAState * s,
dst = s->vram_ptr + offset; dst = s->vram_ptr + offset;
for (x = 0; x < 8; x++) { for (x = 0; x < 8; x++) {
if (val & 0x80) { if (val & 0x80) {
*dst++ = s->cirrus_shadow_gr1; *dst = s->cirrus_shadow_gr1;
} else if (mode == 5) { } else if (mode == 5) {
*dst++ = s->cirrus_shadow_gr0; *dst = s->cirrus_shadow_gr0;
} }
val <<= 1; val <<= 1;
dst++;
} }
cpu_physical_memory_set_dirty(s->vram_offset + offset); cpu_physical_memory_set_dirty(s->vram_offset + offset);
cpu_physical_memory_set_dirty(s->vram_offset + offset + 7); cpu_physical_memory_set_dirty(s->vram_offset + offset + 7);
@ -1802,13 +1803,14 @@ static void cirrus_mem_writeb_mode4and5_16bpp(CirrusVGAState * s,
dst = s->vram_ptr + offset; dst = s->vram_ptr + offset;
for (x = 0; x < 8; x++) { for (x = 0; x < 8; x++) {
if (val & 0x80) { if (val & 0x80) {
*dst++ = s->cirrus_shadow_gr1; *dst = s->cirrus_shadow_gr1;
*dst++ = s->gr[0x11]; *(dst + 1) = s->gr[0x11];
} else if (mode == 5) { } else if (mode == 5) {
*dst++ = s->cirrus_shadow_gr0; *dst = s->cirrus_shadow_gr0;
*dst++ = s->gr[0x10]; *(dst + 1) = s->gr[0x10];
} }
val <<= 1; val <<= 1;
dst += 2;
} }
cpu_physical_memory_set_dirty(s->vram_offset + offset); cpu_physical_memory_set_dirty(s->vram_offset + offset);
cpu_physical_memory_set_dirty(s->vram_offset + offset + 15); cpu_physical_memory_set_dirty(s->vram_offset + offset + 15);