Index: /trunk/src/VBox/Devices/Graphics/DevVGA.cpp =================================================================== --- /trunk/src/VBox/Devices/Graphics/DevVGA.cpp (revision 49886) +++ /trunk/src/VBox/Devices/Graphics/DevVGA.cpp (revision 49887) @@ -112,4 +112,5 @@ #include #ifdef IN_RING3 +# include # include # include @@ -134,5 +135,4 @@ #endif -#include "vl_vbox.h" #include "VBoxDD.h" #include "VBoxDD2.h" @@ -1175,5 +1175,5 @@ /* called for accesses between 0xa0000 and 0xc0000 */ -static uint32_t vga_mem_readb(PVGASTATE pThis, target_phys_addr_t addr, int *prc) +static uint32_t vga_mem_readb(PVGASTATE pThis, RTGCPHYS addr, int *prc) { int memory_map_mode, plane; @@ -1256,5 +1256,5 @@ /* called for accesses between 0xa0000 and 0xc0000 */ -static int vga_mem_writeb(PVGASTATE pThis, target_phys_addr_t addr, uint32_t val) +static int vga_mem_writeb(PVGASTATE pThis, RTGCPHYS addr, uint32_t val) { int memory_map_mode, plane, write_mode, b, func_select, mask; @@ -2201,10 +2201,10 @@ addr = (addr & ~(1 << 16)) | ((y1 & 2) << 15); } - page0 = addr & TARGET_PAGE_MASK; - page1 = (addr + bwidth - 1) & TARGET_PAGE_MASK; + page0 = addr & ~PAGE_OFFSET_MASK; + page1 = (addr + bwidth - 1) & ~PAGE_OFFSET_MASK; bool update = full_update | vga_is_dirty(pThis, page0) | vga_is_dirty(pThis, page1); - if (page1 - page0 > TARGET_PAGE_SIZE) { + if (page1 - page0 > PAGE_SIZE) { /* if wide line, can use another page */ - update |= vga_is_dirty(pThis, page0 + TARGET_PAGE_SIZE); + update |= vga_is_dirty(pThis, page0 + PAGE_SIZE); } /* explicit invalidation for the hardware cursor */ @@ -2252,5 +2252,5 @@ /* reset modified pages */ if (page_max != -1 && reset_dirty) { - vga_reset_dirty(pThis, page_min, page_max + TARGET_PAGE_SIZE); + vga_reset_dirty(pThis, page_min, page_max + PAGE_SIZE); } memset(pThis->invalidated_y_table, 0, ((height + 31) >> 5) * 4); @@ -2391,72 +2391,74 @@ } -static void vga_save(QEMUFile *f, PVGASTATE pThis) +static void vga_save(PSSMHANDLE pSSM, PVGASTATE pThis) { int i; - qemu_put_be32s(f, &pThis->latch); - qemu_put_8s(f, &pThis->sr_index); - qemu_put_buffer(f, pThis->sr, 8); - qemu_put_8s(f, &pThis->gr_index); - qemu_put_buffer(f, pThis->gr, 16); - qemu_put_8s(f, &pThis->ar_index); - qemu_put_buffer(f, pThis->ar, 21); - qemu_put_be32s(f, &pThis->ar_flip_flop); - qemu_put_8s(f, &pThis->cr_index); - qemu_put_buffer(f, pThis->cr, 256); - qemu_put_8s(f, &pThis->msr); - qemu_put_8s(f, &pThis->fcr); - qemu_put_8s(f, &pThis->st00); - qemu_put_8s(f, &pThis->st01); - - qemu_put_8s(f, &pThis->dac_state); - qemu_put_8s(f, &pThis->dac_sub_index); - qemu_put_8s(f, &pThis->dac_read_index); - qemu_put_8s(f, &pThis->dac_write_index); - qemu_put_buffer(f, pThis->dac_cache, 3); - qemu_put_buffer(f, pThis->palette, 768); - - qemu_put_be32s(f, &pThis->bank_offset); + SSMR3PutU32(pSSM, pThis->latch); + SSMR3PutU8(pSSM, pThis->sr_index); + SSMR3PutMem(pSSM, pThis->sr, 8); + SSMR3PutU8(pSSM, pThis->gr_index); + SSMR3PutMem(pSSM, pThis->gr, 16); + SSMR3PutU8(pSSM, pThis->ar_index); + SSMR3PutMem(pSSM, pThis->ar, 21); + SSMR3PutU32(pSSM, pThis->ar_flip_flop); + SSMR3PutU8(pSSM, pThis->cr_index); + SSMR3PutMem(pSSM, pThis->cr, 256); + SSMR3PutU8(pSSM, pThis->msr); + SSMR3PutU8(pSSM, pThis->fcr); + SSMR3PutU8(pSSM, pThis->st00); + SSMR3PutU8(pSSM, pThis->st01); + + SSMR3PutU8(pSSM, pThis->dac_state); + SSMR3PutU8(pSSM, pThis->dac_sub_index); + SSMR3PutU8(pSSM, pThis->dac_read_index); + SSMR3PutU8(pSSM, pThis->dac_write_index); + SSMR3PutMem(pSSM, pThis->dac_cache, 3); + SSMR3PutMem(pSSM, pThis->palette, 768); + + SSMR3PutU32(pSSM, pThis->bank_offset); #ifdef CONFIG_BOCHS_VBE - qemu_put_byte(f, 1); - qemu_put_be16s(f, &pThis->vbe_index); + SSMR3PutU8(pSSM, 1); + SSMR3PutU16(pSSM, pThis->vbe_index); for(i = 0; i < VBE_DISPI_INDEX_NB_SAVED; i++) - qemu_put_be16s(f, &pThis->vbe_regs[i]); - qemu_put_be32s(f, &pThis->vbe_start_addr); - qemu_put_be32s(f, &pThis->vbe_line_offset); + SSMR3PutU16(pSSM, pThis->vbe_regs[i]); + SSMR3PutU32(pSSM, pThis->vbe_start_addr); + SSMR3PutU32(pSSM, pThis->vbe_line_offset); #else - qemu_put_byte(f, 0); + SSMR3PutU8(pSSM, 0); #endif } -static int vga_load(QEMUFile *f, PVGASTATE pThis, int version_id) +static int vga_load(PSSMHANDLE pSSM, PVGASTATE pThis, int version_id) { int is_vbe, i; uint32_t u32Dummy; - - qemu_get_be32s(f, &pThis->latch); - qemu_get_8s(f, &pThis->sr_index); - qemu_get_buffer(f, pThis->sr, 8); - qemu_get_8s(f, &pThis->gr_index); - qemu_get_buffer(f, pThis->gr, 16); - qemu_get_8s(f, &pThis->ar_index); - qemu_get_buffer(f, pThis->ar, 21); - qemu_get_be32s(f, (uint32_t *)&pThis->ar_flip_flop); - qemu_get_8s(f, &pThis->cr_index); - qemu_get_buffer(f, pThis->cr, 256); - qemu_get_8s(f, &pThis->msr); - qemu_get_8s(f, &pThis->fcr); - qemu_get_8s(f, &pThis->st00); - qemu_get_8s(f, &pThis->st01); - - qemu_get_8s(f, &pThis->dac_state); - qemu_get_8s(f, &pThis->dac_sub_index); - qemu_get_8s(f, &pThis->dac_read_index); - qemu_get_8s(f, &pThis->dac_write_index); - qemu_get_buffer(f, pThis->dac_cache, 3); - qemu_get_buffer(f, pThis->palette, 768); - - qemu_get_be32s(f, (uint32_t *)&pThis->bank_offset); - is_vbe = qemu_get_byte(f); + uint8_t u8; + + SSMR3GetU32(pSSM, &pThis->latch); + SSMR3GetU8(pSSM, &pThis->sr_index); + SSMR3GetMem(pSSM, pThis->sr, 8); + SSMR3GetU8(pSSM, &pThis->gr_index); + SSMR3GetMem(pSSM, pThis->gr, 16); + SSMR3GetU8(pSSM, &pThis->ar_index); + SSMR3GetMem(pSSM, pThis->ar, 21); + SSMR3GetU32(pSSM, (uint32_t *)&pThis->ar_flip_flop); + SSMR3GetU8(pSSM, &pThis->cr_index); + SSMR3GetMem(pSSM, pThis->cr, 256); + SSMR3GetU8(pSSM, &pThis->msr); + SSMR3GetU8(pSSM, &pThis->fcr); + SSMR3GetU8(pSSM, &pThis->st00); + SSMR3GetU8(pSSM, &pThis->st01); + + SSMR3GetU8(pSSM, &pThis->dac_state); + SSMR3GetU8(pSSM, &pThis->dac_sub_index); + SSMR3GetU8(pSSM, &pThis->dac_read_index); + SSMR3GetU8(pSSM, &pThis->dac_write_index); + SSMR3GetMem(pSSM, pThis->dac_cache, 3); + SSMR3GetMem(pSSM, pThis->palette, 768); + + SSMR3GetU32(pSSM, (uint32_t *)&pThis->bank_offset); + SSMR3GetU8(pSSM, &u8); + is_vbe = !!u8; #ifdef CONFIG_BOCHS_VBE if (!is_vbe) @@ -2465,13 +2467,13 @@ return VERR_SSM_DATA_UNIT_FORMAT_CHANGED; } - qemu_get_be16s(f, &pThis->vbe_index); + SSMR3GetU16(pSSM, &pThis->vbe_index); for(i = 0; i < VBE_DISPI_INDEX_NB_SAVED; i++) - qemu_get_be16s(f, &pThis->vbe_regs[i]); + SSMR3GetU16(pSSM, &pThis->vbe_regs[i]); if (version_id <= VGA_SAVEDSTATE_VERSION_INV_VHEIGHT) recalculate_data(pThis, false); /* <- re-calculate the pThis->vbe_regs[VBE_DISPI_INDEX_VIRT_HEIGHT] since it might be invalid */ - qemu_get_be32s(f, &pThis->vbe_start_addr); - qemu_get_be32s(f, &pThis->vbe_line_offset); + SSMR3GetU32(pSSM, &pThis->vbe_start_addr); + SSMR3GetU32(pSSM, &pThis->vbe_line_offset); if (version_id < 2) - qemu_get_be32s(f, &u32Dummy); + SSMR3GetU32(pSSM, &u32Dummy); pThis->vbe_bank_max = (pThis->vram_size >> 16) - 1; #else Index: /trunk/src/VBox/Devices/Graphics/DevVGATmpl.h =================================================================== --- /trunk/src/VBox/Devices/Graphics/DevVGATmpl.h (revision 49886) +++ /trunk/src/VBox/Devices/Graphics/DevVGATmpl.h (revision 49887) @@ -5,5 +5,5 @@ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as @@ -56,10 +56,10 @@ #if DEPTH != 15 -static inline void glue(vga_draw_glyph_line_, DEPTH)(uint8_t *d, - int font_data, - uint32_t xorcol, - uint32_t bgcol, - int dscan, - int linesize) +static inline void RT_CONCAT(vga_draw_glyph_line_, DEPTH)(uint8_t *d, + int font_data, + uint32_t xorcol, + uint32_t bgcol, + int dscan, + int linesize) { #if BPP == 1 @@ -92,7 +92,7 @@ } -static void glue(vga_draw_glyph8_, DEPTH)(uint8_t *d, int linesize, - const uint8_t *font_ptr, int h, - uint32_t fgcol, uint32_t bgcol, int dscan) +static void RT_CONCAT(vga_draw_glyph8_, DEPTH)(uint8_t *d, int linesize, + const uint8_t *font_ptr, int h, + uint32_t fgcol, uint32_t bgcol, int dscan) { uint32_t xorcol; @@ -102,5 +102,5 @@ do { font_data = font_ptr[0]; - glue(vga_draw_glyph_line_, DEPTH)(d, font_data, xorcol, bgcol, dscan, linesize); + RT_CONCAT(vga_draw_glyph_line_, DEPTH)(d, font_data, xorcol, bgcol, dscan, linesize); font_ptr += 4; d += linesize << dscan; @@ -108,7 +108,7 @@ } -static void glue(vga_draw_glyph16_, DEPTH)(uint8_t *d, int linesize, - const uint8_t *font_ptr, int h, - uint32_t fgcol, uint32_t bgcol, int dscan) +static void RT_CONCAT(vga_draw_glyph16_, DEPTH)(uint8_t *d, int linesize, + const uint8_t *font_ptr, int h, + uint32_t fgcol, uint32_t bgcol, int dscan) { uint32_t xorcol; @@ -118,10 +118,10 @@ do { font_data = font_ptr[0]; - glue(vga_draw_glyph_line_, DEPTH)(d, - expand4to8[font_data >> 4], - xorcol, bgcol, dscan, linesize); - glue(vga_draw_glyph_line_, DEPTH)(d + 8 * BPP, - expand4to8[font_data & 0x0f], - xorcol, bgcol, dscan, linesize); + RT_CONCAT(vga_draw_glyph_line_, DEPTH)(d, + expand4to8[font_data >> 4], + xorcol, bgcol, dscan, linesize); + RT_CONCAT(vga_draw_glyph_line_, DEPTH)(d + 8 * BPP, + expand4to8[font_data & 0x0f], + xorcol, bgcol, dscan, linesize); font_ptr += 4; d += linesize << dscan; @@ -129,7 +129,7 @@ } -static void glue(vga_draw_glyph9_, DEPTH)(uint8_t *d, int linesize, - const uint8_t *font_ptr, int h, - uint32_t fgcol, uint32_t bgcol, int dup9) +static void RT_CONCAT(vga_draw_glyph9_, DEPTH)(uint8_t *d, int linesize, + const uint8_t *font_ptr, int h, + uint32_t fgcol, uint32_t bgcol, int dup9) { uint32_t xorcol, v; @@ -140,7 +140,7 @@ font_data = font_ptr[0]; #if BPP == 1 - cpu_to_32wu((uint32_t *)d, (dmask16[(font_data >> 4)] & xorcol) ^ bgcol); + ((uint32_t *)d)[0] = RT_H2LE_U32((dmask16[(font_data >> 4)] & xorcol) ^ bgcol); v = (dmask16[(font_data >> 0) & 0xf] & xorcol) ^ bgcol; - cpu_to_32wu(((uint32_t *)d)+1, v); + ((uint32_t *)d)[1] = RT_H2LE_U32(v); if (dup9) ((uint8_t *)d)[8] = v >> (24 * (1 - BIG)); @@ -149,9 +149,9 @@ #elif BPP == 2 - cpu_to_32wu(((uint32_t *)d)+0, (dmask4[(font_data >> 6)] & xorcol) ^ bgcol); - cpu_to_32wu(((uint32_t *)d)+1, (dmask4[(font_data >> 4) & 3] & xorcol) ^ bgcol); - cpu_to_32wu(((uint32_t *)d)+2, (dmask4[(font_data >> 2) & 3] & xorcol) ^ bgcol); + ((uint32_t *)d)[0] = RT_H2LE_U32((dmask4[(font_data >> 6)] & xorcol) ^ bgcol); + ((uint32_t *)d)[1] = RT_H2LE_U32((dmask4[(font_data >> 4) & 3] & xorcol) ^ bgcol); + ((uint32_t *)d)[2] = RT_H2LE_U32((dmask4[(font_data >> 2) & 3] & xorcol) ^ bgcol); v = (dmask4[(font_data >> 0) & 3] & xorcol) ^ bgcol; - cpu_to_32wu(((uint32_t *)d)+3, v); + ((uint32_t *)d)[3] = RT_H2LE_U32(v); if (dup9) ((uint16_t *)d)[8] = v >> (16 * (1 - BIG)); @@ -181,6 +181,6 @@ * 4 color mode */ -static void glue(vga_draw_line2_, DEPTH)(VGAState *s1, uint8_t *d, - const uint8_t *s, int width) +static void RT_CONCAT(vga_draw_line2_, DEPTH)(VGAState *s1, uint8_t *d, + const uint8_t *s, int width) { uint32_t plane_mask, *palette, data, v, src_inc, dwb_mode; @@ -225,6 +225,6 @@ * 4 color mode, dup2 horizontal */ -static void glue(vga_draw_line2d2_, DEPTH)(VGAState *s1, uint8_t *d, - const uint8_t *s, int width) +static void RT_CONCAT(vga_draw_line2d2_, DEPTH)(VGAState *s1, uint8_t *d, + const uint8_t *s, int width) { uint32_t plane_mask, *palette, data, v, src_inc, dwb_mode; @@ -260,6 +260,6 @@ * 16 color mode */ -static void glue(vga_draw_line4_, DEPTH)(VGAState *s1, uint8_t *d, - const uint8_t *s, int width) +static void RT_CONCAT(vga_draw_line4_, DEPTH)(VGAState *s1, uint8_t *d, + const uint8_t *s, int width) { uint32_t plane_mask, data, v, *palette; @@ -292,6 +292,6 @@ * 16 color mode, dup2 horizontal */ -static void glue(vga_draw_line4d2_, DEPTH)(VGAState *s1, uint8_t *d, - const uint8_t *s, int width) +static void RT_CONCAT(vga_draw_line4d2_, DEPTH)(VGAState *s1, uint8_t *d, + const uint8_t *s, int width) { uint32_t plane_mask, data, v, *palette; @@ -326,6 +326,6 @@ * XXX: add plane_mask support (never used in standard VGA modes) */ -static void glue(vga_draw_line8d2_, DEPTH)(VGAState *s1, uint8_t *d, - const uint8_t *s, int width) +static void RT_CONCAT(vga_draw_line8d2_, DEPTH)(VGAState *s1, uint8_t *d, + const uint8_t *s, int width) { uint32_t *palette; @@ -349,6 +349,6 @@ * XXX: add plane_mask support (never used in standard VGA modes) */ -static void glue(vga_draw_line8_, DEPTH)(VGAState *s1, uint8_t *d, - const uint8_t *s, int width) +static void RT_CONCAT(vga_draw_line8_, DEPTH)(VGAState *s1, uint8_t *d, + const uint8_t *s, int width) { uint32_t *palette; @@ -379,6 +379,6 @@ * 15 bit color */ -static void glue(vga_draw_line15_, DEPTH)(VGAState *s1, uint8_t *d, - const uint8_t *s, int width) +static void RT_CONCAT(vga_draw_line15_, DEPTH)(VGAState *s1, uint8_t *d, + const uint8_t *s, int width) { #if DEPTH == 15 && defined(WORDS_BIGENDIAN) == defined(TARGET_WORDS_BIGENDIAN) @@ -390,9 +390,9 @@ w = width; do { - v = lduw_raw((void *)s); + v = s[0] | (s[1] << 8); r = (v >> 7) & 0xf8; g = (v >> 2) & 0xf8; b = (v << 3) & 0xf8; - ((PIXEL_TYPE *)d)[0] = glue(rgb_to_pixel, DEPTH)(r, g, b); + ((PIXEL_TYPE *)d)[0] = RT_CONCAT(rgb_to_pixel, DEPTH)(r, g, b); s += 2; d += BPP; @@ -405,6 +405,6 @@ * 16 bit color */ -static void glue(vga_draw_line16_, DEPTH)(VGAState *s1, uint8_t *d, - const uint8_t *s, int width) +static void RT_CONCAT(vga_draw_line16_, DEPTH)(VGAState *s1, uint8_t *d, + const uint8_t *s, int width) { #if DEPTH == 16 && defined(WORDS_BIGENDIAN) == defined(TARGET_WORDS_BIGENDIAN) @@ -416,9 +416,9 @@ w = width; do { - v = lduw_raw((void *)s); + v = s[0] | (s[1] << 8); r = (v >> 8) & 0xf8; g = (v >> 3) & 0xfc; b = (v << 3) & 0xf8; - ((PIXEL_TYPE *)d)[0] = glue(rgb_to_pixel, DEPTH)(r, g, b); + ((PIXEL_TYPE *)d)[0] = RT_CONCAT(rgb_to_pixel, DEPTH)(r, g, b); s += 2; d += BPP; @@ -431,6 +431,6 @@ * 24 bit color */ -static void glue(vga_draw_line24_, DEPTH)(VGAState *s1, uint8_t *d, - const uint8_t *s, int width) +static void RT_CONCAT(vga_draw_line24_, DEPTH)(VGAState *s1, uint8_t *d, + const uint8_t *s, int width) { int w; @@ -449,5 +449,5 @@ r = s[2]; #endif - ((PIXEL_TYPE *)d)[0] = glue(rgb_to_pixel, DEPTH)(r, g, b); + ((PIXEL_TYPE *)d)[0] = RT_CONCAT(rgb_to_pixel, DEPTH)(r, g, b); s += 3; d += BPP; @@ -458,6 +458,6 @@ * 32 bit color */ -static void glue(vga_draw_line32_, DEPTH)(VGAState *s1, uint8_t *d, - const uint8_t *s, int width) +static void RT_CONCAT(vga_draw_line32_, DEPTH)(VGAState *s1, uint8_t *d, + const uint8_t *s, int width) { #if DEPTH == 32 && defined(WORDS_BIGENDIAN) == defined(TARGET_WORDS_BIGENDIAN) @@ -478,5 +478,5 @@ r = s[2]; #endif - ((PIXEL_TYPE *)d)[0] = glue(rgb_to_pixel, DEPTH)(r, g, b); + ((PIXEL_TYPE *)d)[0] = RT_CONCAT(rgb_to_pixel, DEPTH)(r, g, b); s += 4; d += BPP; @@ -491,10 +491,10 @@ static #endif/* VBOX */ -void glue(vga_draw_cursor_line_, DEPTH)(uint8_t *d1, - const uint8_t *src1, - int poffset, int w, - unsigned int color0, - unsigned int color1, - unsigned int color_xor) +void RT_CONCAT(vga_draw_cursor_line_, DEPTH)(uint8_t *d1, + const uint8_t *src1, + int poffset, int w, + unsigned int color0, + unsigned int color1, + unsigned int color_xor) { const uint8_t *plane0, *plane1;