openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

destination write mask support, fixed banked memory access, read-only access for bus type in SR 0x17 (Volker Ruppert) 

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1364 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
bellard 2005-04-17 17:56:18 +00:00
parent 40545f84cf
commit e3a4e4b643
2 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/cirrus_vga.c
View File

@ -800,7 +800,7 @@ static void cirrus_bitblt_start(CirrusVGAState * s)
s->cirrus_blt_srcpitch, s->cirrus_blt_srcpitch,
s->cirrus_blt_dstaddr, s->cirrus_blt_dstaddr,
s->cirrus_blt_srcaddr, s->cirrus_blt_srcaddr,
s->sr[0x2f]); s->gr[0x2f]);
#endif #endif
switch (s->cirrus_blt_mode & CIRRUS_BLTMODE_PIXELWIDTHMASK) { switch (s->cirrus_blt_mode & CIRRUS_BLTMODE_PIXELWIDTHMASK) {
@ -1042,10 +1042,10 @@ static void cirrus_update_bank_ptr(CirrusVGAState * s, unsigned bank_index)
else else
offset <<= 12; offset <<= 12;
if (s->vram_size <= offset) if (s->real_vram_size <= offset)
limit = 0; limit = 0;
else else
limit = s->vram_size - offset; limit = s->real_vram_size - offset;
if (((s->gr[0x0b] & 0x01) == 0) && (bank_index != 0)) { if (((s->gr[0x0b] & 0x01) == 0) && (bank_index != 0)) {
if (limit > 0x8000) { if (limit > 0x8000) {
@ -1213,7 +1213,7 @@ cirrus_hook_write_sr(CirrusVGAState * s, unsigned reg_index, int reg_value)
#endif #endif
break; break;
case 0x17: // Configuration Readback and Extended Control case 0x17: // Configuration Readback and Extended Control
s->sr[reg_index] = reg_value; s->sr[reg_index] = (s->sr[reg_index] & 0x38) | (reg_value & 0xc7);
cirrus_update_memory_access(s); cirrus_update_memory_access(s);
break; break;
default: default:

37
hw/cirrus_vga_rop2.h
View File

@ -47,6 +47,7 @@ glue(glue(glue(cirrus_patternfill_, ROP_NAME), _),DEPTH)
int x, y, pattern_y, pattern_pitch, pattern_x; int x, y, pattern_y, pattern_pitch, pattern_x;
unsigned int col; unsigned int col;
const uint8_t *src1; const uint8_t *src1;
int skipleft = (s->gr[0x2f] & 0x07) * (DEPTH / 8);
#if DEPTH == 8 #if DEPTH == 8
pattern_pitch = 8; pattern_pitch = 8;
@ -56,11 +57,11 @@ glue(glue(glue(cirrus_patternfill_, ROP_NAME), _),DEPTH)
pattern_pitch = 32; pattern_pitch = 32;
#endif #endif
pattern_y = s->cirrus_blt_srcaddr & 7; pattern_y = s->cirrus_blt_srcaddr & 7;
pattern_x = 0; pattern_x = skipleft;
for(y = 0; y < bltheight; y++) { for(y = 0; y < bltheight; y++) {
d = dst; d = dst + skipleft;
src1 = src + pattern_y * pattern_pitch; src1 = src + pattern_y * pattern_pitch;
for (x = 0; x < bltwidth; x += (DEPTH / 8)) { for (x = skipleft; x < bltwidth; x += (DEPTH / 8)) {
#if DEPTH == 8 #if DEPTH == 8
col = src1[pattern_x]; col = src1[pattern_x];
pattern_x = (pattern_x + 1) & 7; pattern_x = (pattern_x + 1) & 7;
@ -99,7 +100,8 @@ glue(glue(glue(cirrus_colorexpand_transp_, ROP_NAME), _),DEPTH)
unsigned int col; unsigned int col;
unsigned bitmask; unsigned bitmask;
unsigned index; unsigned index;
int srcskipleft = 0; int srcskipleft = s->gr[0x2f] & 0x07;
int dstskipleft = srcskipleft * (DEPTH / 8);
if (s->cirrus_blt_modeext & CIRRUS_BLTMODEEXT_COLOREXPINV) { if (s->cirrus_blt_modeext & CIRRUS_BLTMODEEXT_COLOREXPINV) {
bits_xor = 0xff; bits_xor = 0xff;
@ -112,8 +114,8 @@ glue(glue(glue(cirrus_colorexpand_transp_, ROP_NAME), _),DEPTH)
for(y = 0; y < bltheight; y++) { for(y = 0; y < bltheight; y++) {
bitmask = 0x80 >> srcskipleft; bitmask = 0x80 >> srcskipleft;
bits = *src++ ^ bits_xor; bits = *src++ ^ bits_xor;
d = dst; d = dst + dstskipleft;
for (x = 0; x < bltwidth; x += (DEPTH / 8)) { for (x = dstskipleft; x < bltwidth; x += (DEPTH / 8)) {
if ((bitmask & 0xff) == 0) { if ((bitmask & 0xff) == 0) {
bitmask = 0x80; bitmask = 0x80;
bits = *src++ ^ bits_xor; bits = *src++ ^ bits_xor;
@ -142,15 +144,16 @@ glue(glue(glue(cirrus_colorexpand_, ROP_NAME), _),DEPTH)
unsigned bits; unsigned bits;
unsigned int col; unsigned int col;
unsigned bitmask; unsigned bitmask;
int srcskipleft = 0; int srcskipleft = s->gr[0x2f] & 0x07;
int dstskipleft = srcskipleft * (DEPTH / 8);
colors[0] = s->cirrus_blt_bgcol; colors[0] = s->cirrus_blt_bgcol;
colors[1] = s->cirrus_blt_fgcol; colors[1] = s->cirrus_blt_fgcol;
for(y = 0; y < bltheight; y++) { for(y = 0; y < bltheight; y++) {
bitmask = 0x80 >> srcskipleft; bitmask = 0x80 >> srcskipleft;
bits = *src++; bits = *src++;
d = dst; d = dst + dstskipleft;
for (x = 0; x < bltwidth; x += (DEPTH / 8)) { for (x = dstskipleft; x < bltwidth; x += (DEPTH / 8)) {
if ((bitmask & 0xff) == 0) { if ((bitmask & 0xff) == 0) {
bitmask = 0x80; bitmask = 0x80;
bits = *src++; bits = *src++;
@ -175,6 +178,8 @@ glue(glue(glue(cirrus_colorexpand_pattern_transp_, ROP_NAME), _),DEPTH)
int x, y, bitpos, pattern_y; int x, y, bitpos, pattern_y;
unsigned int bits, bits_xor; unsigned int bits, bits_xor;
unsigned int col; unsigned int col;
int srcskipleft = s->gr[0x2f] & 0x07;
int dstskipleft = srcskipleft * (DEPTH / 8);
if (s->cirrus_blt_modeext & CIRRUS_BLTMODEEXT_COLOREXPINV) { if (s->cirrus_blt_modeext & CIRRUS_BLTMODEEXT_COLOREXPINV) {
bits_xor = 0xff; bits_xor = 0xff;
@ -187,9 +192,9 @@ glue(glue(glue(cirrus_colorexpand_pattern_transp_, ROP_NAME), _),DEPTH)
for(y = 0; y < bltheight; y++) { for(y = 0; y < bltheight; y++) {
bits = src[pattern_y] ^ bits_xor; bits = src[pattern_y] ^ bits_xor;
bitpos = 7; bitpos = 7 - srcskipleft;
d = dst; d = dst + dstskipleft;
for (x = 0; x < bltwidth; x += (DEPTH / 8)) { for (x = dstskipleft; x < bltwidth; x += (DEPTH / 8)) {
if ((bits >> bitpos) & 1) { if ((bits >> bitpos) & 1) {
PUTPIXEL(); PUTPIXEL();
} }
@ -213,6 +218,8 @@ glue(glue(glue(cirrus_colorexpand_pattern_, ROP_NAME), _),DEPTH)
int x, y, bitpos, pattern_y; int x, y, bitpos, pattern_y;
unsigned int bits; unsigned int bits;
unsigned int col; unsigned int col;
int srcskipleft = s->gr[0x2f] & 0x07;
int dstskipleft = srcskipleft * (DEPTH / 8);
colors[0] = s->cirrus_blt_bgcol; colors[0] = s->cirrus_blt_bgcol;
colors[1] = s->cirrus_blt_fgcol; colors[1] = s->cirrus_blt_fgcol;
@ -220,9 +227,9 @@ glue(glue(glue(cirrus_colorexpand_pattern_, ROP_NAME), _),DEPTH)
for(y = 0; y < bltheight; y++) { for(y = 0; y < bltheight; y++) {
bits = src[pattern_y]; bits = src[pattern_y];
bitpos = 7; bitpos = 7 - srcskipleft;
d = dst; d = dst + dstskipleft;
for (x = 0; x < bltwidth; x += (DEPTH / 8)) { for (x = dstskipleft; x < bltwidth; x += (DEPTH / 8)) {
col = colors[(bits >> bitpos) & 1]; col = colors[(bits >> bitpos) & 1];
PUTPIXEL(); PUTPIXEL();
d += (DEPTH / 8); d += (DEPTH / 8);