mirrors
/
Bochs
mirror of https://github.com/bochs-emu/Bochs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Some work on the CMDFIFO "byte disable" (Voodoo2) / "byte enable" (Banshee) 

feature of packet type #5. Added some W2 cases for texture writes, modified
code for linear LFB writes and added BX_ERROR messages for the WN cases. Some
more test cases are needed for a complete implementation.
This commit is contained in:
Volker Ruppert 2020-09-27 08:15:48 +00:00
parent 8977c34db1
commit e8e9cd03a3
1 changed files with 35 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
bochs/iodev/display/voodoo_func.h
View File

@ -2725,24 +2725,26 @@ void cmdfifo_process(cmdfifo_info *f)
regaddr = (cmdfifo_r(f) & 0xffffff) >> 2;
code = (command >> 30);
disbytes = (command >> 22) & 0xff;
if ((disbytes > 0) && (code != 0)) {
BX_ERROR(("CMDFIFO packet type 5: byte disable not supported yet (dest code = %d)", code));
if ((disbytes > 0) && (code != 0) && (code != 3)) {
BX_ERROR(("CMDFIFO packet type 5: byte disable not supported yet (dest code = %d disbytes = 0x%02x)", code, disbytes));
}
switch (code) {
case 0:
regaddr <<= 2;
w0 = 0;
wn = nwords;
if ((disbytes > 0) && (disbytes != 0x30) && (disbytes != 0xc0)) {
BX_ERROR(("CMDFIFO packet type 5: byte disable not complete yet (dest code = 0)"));
}
if ((disbytes & 0xf0) > 0) {
data = cmdfifo_r(f);
if ((disbytes & 0xf0) == 0x30) {
Banshee_LFB_write(regaddr + 2, data >> 16, 2);
data >>= 16;
} else if ((disbytes & 0xf0) == 0xc0) {
Banshee_LFB_write(regaddr, data, 2);
data &= 0xffff;
} else {
BX_ERROR(("CMDFIFO packet type 5: byte disable not complete (dest code = 0)"));
}
BX_UNLOCK(cmdfifo_mutex);
Banshee_LFB_write(regaddr, data, 2);
BX_LOCK(cmdfifo_mutex);
w0++;
regaddr += 4;
}
@ -2753,6 +2755,9 @@ void cmdfifo_process(cmdfifo_info *f)
BX_LOCK(cmdfifo_mutex);
regaddr += 4;
}
if ((disbytes & 0x0f) > 0) {
BX_ERROR(("CMDFIFO packet type 5: byte disable not complete (dest code = 0)"));
}
break;
case 2:
for (i = 0; i < (int)nwords; i++) {
@ -2764,13 +2769,35 @@ void cmdfifo_process(cmdfifo_info *f)
}
break;
case 3:
for (i = 0; i < (int)nwords; i++) {
w0 = 0;
wn = nwords;
if ((disbytes & 0xf0) > 0) {
data = cmdfifo_r(f);
if ((disbytes & 0xf0) == 0x30) {
data >>= 16;
} else if ((disbytes & 0xf0) == 0xc0) {
data &= 0xffff;
} else if ((disbytes & 0xf0) == 0xe0) {
data &= 0xff;
} else {
BX_ERROR(("CMDFIFO packet type 5: byte disable not complete (dest code = 3)"));
}
BX_UNLOCK(cmdfifo_mutex);
texture_w(regaddr, data);
BX_LOCK(cmdfifo_mutex);
w0++;
regaddr += 4;
}
for (i = w0; i < wn; i++) {
data = cmdfifo_r(f);
BX_UNLOCK(cmdfifo_mutex);
texture_w(regaddr, data);
BX_LOCK(cmdfifo_mutex);
regaddr++;
}
if ((disbytes & 0x0f) > 0) {
BX_ERROR(("CMDFIFO packet type 5: byte disable not complete (dest code = 3)"));
}
break;
default:
BX_ERROR(("CMDFIFO packet type 5: unsupported destination type %d", code));