ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

vga font change detection 

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1141 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
bellard 2004-11-14 17:52:01 +00:00
parent e875c40a15
commit 546fa6abd1
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hw/vga.c
View File

@ -662,7 +662,7 @@ static uint32_t vga_mem_readl(void *opaque, target_phys_addr_t addr)
void vga_mem_writeb(void *opaque, target_phys_addr_t addr, uint32_t val) void vga_mem_writeb(void *opaque, target_phys_addr_t addr, uint32_t val)
{ {
VGAState *s = opaque; VGAState *s = opaque;
int memory_map_mode, plane, write_mode, b, func_select; int memory_map_mode, plane, write_mode, b, func_select, mask;
uint32_t write_mask, bit_mask, set_mask; uint32_t write_mask, bit_mask, set_mask;
#ifdef DEBUG_VGA_MEM #ifdef DEBUG_VGA_MEM
@ -695,22 +695,26 @@ void vga_mem_writeb(void *opaque, target_phys_addr_t addr, uint32_t val)
if (s->sr[4] & 0x08) { if (s->sr[4] & 0x08) {
/* chain 4 mode : simplest access */ /* chain 4 mode : simplest access */
plane = addr & 3; plane = addr & 3;
if (s->sr[2] & (1 << plane)) { mask = (1 << plane);
if (s->sr[2] & mask) {
s->vram_ptr[addr] = val; s->vram_ptr[addr] = val;
#ifdef DEBUG_VGA_MEM #ifdef DEBUG_VGA_MEM
printf("vga: chain4: [0x%x]\n", addr); printf("vga: chain4: [0x%x]\n", addr);
#endif #endif
s->plane_updated |= mask; /* only used to detect font change */
cpu_physical_memory_set_dirty(s->vram_offset + addr); cpu_physical_memory_set_dirty(s->vram_offset + addr);
} }
} else if (s->gr[5] & 0x10) { } else if (s->gr[5] & 0x10) {
/* odd/even mode (aka text mode mapping) */ /* odd/even mode (aka text mode mapping) */
plane = (s->gr[4] & 2) | (addr & 1); plane = (s->gr[4] & 2) | (addr & 1);
if (s->sr[2] & (1 << plane)) { mask = (1 << plane);
if (s->sr[2] & mask) {
addr = ((addr & ~1) << 1) | plane; addr = ((addr & ~1) << 1) | plane;
s->vram_ptr[addr] = val; s->vram_ptr[addr] = val;
#ifdef DEBUG_VGA_MEM #ifdef DEBUG_VGA_MEM
printf("vga: odd/even: [0x%x]\n", addr); printf("vga: odd/even: [0x%x]\n", addr);
#endif #endif
s->plane_updated |= mask; /* only used to detect font change */
cpu_physical_memory_set_dirty(s->vram_offset + addr); cpu_physical_memory_set_dirty(s->vram_offset + addr);
} }
} else { } else {
@ -775,7 +779,9 @@ void vga_mem_writeb(void *opaque, target_phys_addr_t addr, uint32_t val)
do_write: do_write:
/* mask data according to sr[2] */ /* mask data according to sr[2] */
write_mask = mask16[s->sr[2]]; mask = s->sr[2];
s->plane_updated |= mask; /* only used to detect font change */
write_mask = mask16[mask];
((uint32_t *)s->vram_ptr)[addr] = ((uint32_t *)s->vram_ptr)[addr] =
(((uint32_t *)s->vram_ptr)[addr] & ~write_mask) | (((uint32_t *)s->vram_ptr)[addr] & ~write_mask) |
(val & write_mask); (val & write_mask);
@ -1088,7 +1094,12 @@ static void vga_draw_text(VGAState *s, int full_update)
s->font_offsets[1] = offset; s->font_offsets[1] = offset;
full_update = 1; full_update = 1;
} }
if (s->plane_updated & (1 << 2)) {
/* if the plane 2 was modified since the last display, it
indicates the font may have been modified */
s->plane_updated = 0;
full_update = 1;
}
full_update |= update_basic_params(s); full_update |= update_basic_params(s);
line_offset = s->line_offset; line_offset = s->line_offset;

1
hw/vga_int.h
View File

@ -116,6 +116,7 @@
uint32_t line_offset; \ uint32_t line_offset; \
uint32_t line_compare; \ uint32_t line_compare; \
uint32_t start_addr; \ uint32_t start_addr; \
uint32_t plane_updated; \
uint8_t last_cw, last_ch; \ uint8_t last_cw, last_ch; \
uint32_t last_width, last_height; /* in chars or pixels */ \ uint32_t last_width, last_height; /* in chars or pixels */ \
uint32_t last_scr_width, last_scr_height; /* in pixels */ \ uint32_t last_scr_width, last_scr_height; /* in pixels */ \