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

Small changes in the Voodoo Banshee code. 

- Added support for byte and word access to Banshee i/o space.
- Added stub for the CMDFIFO command JMP AGP.
This commit is contained in:
Volker Ruppert 2021-06-30 07:41:21 +00:00
parent 89a0507703
commit 28b506f2de
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
bochs/iodev/display/banshee.cc
View File

@ -541,13 +541,10 @@ Bit32u bx_banshee_c::read(Bit32u address, unsigned io_len)
Bit32u result;
Bit8u offset = (Bit8u)(address & 0xff);
Bit8u reg = (offset>>2);
if ((offset & 3) && (reg > io_status) && (reg < io_vgab0)) {
BX_ERROR(("unaligned read from address 0x%04x", address));
}
Bit8u reg = (offset >> 2);
switch (reg) {
case io_status:
result = register_r(0) >> ((offset & 3) * 8);
result = register_r(0);
break;
case io_dacData:
@ -584,6 +581,11 @@ Bit32u bx_banshee_c::read(Bit32u address, unsigned io_len)
result = v->banshee.io[reg];
break;
}
if ((reg < io_vgab0) || (reg > io_vgadc)) {
if ((offset & 3) != 0) {
result >>= ((offset & 3) * 8);
}
}
if ((reg != io_status) || (lastreg != io_status)) {
BX_DEBUG(("banshee read from offset 0x%02x (%s) result = 0x%08x", offset,
banshee_io_reg_name[reg], result));
@ -601,8 +603,8 @@ void bx_banshee_c::write_handler(void *this_ptr, Bit32u address, Bit32u value, u
void bx_banshee_c::write(Bit32u address, Bit32u value, unsigned io_len)
{
Bit8u offset = (Bit8u)(address & 0xff);
Bit8u reg = (offset>>2), dac_idx, k, m, n;
Bit32u old = v->banshee.io[reg];
Bit8u reg = (offset>>2), dac_idx, k, m, n, shift;
Bit32u old = v->banshee.io[reg], mask;
bool prev_hwce = v->banshee.hwcursor.enabled;
Bit16u prev_hwcx = v->banshee.hwcursor.x;
Bit16u prev_hwcy = v->banshee.hwcursor.y;
@ -610,8 +612,16 @@ void bx_banshee_c::write(Bit32u address, Bit32u value, unsigned io_len)
BX_DEBUG(("banshee write to offset 0x%02x: value = 0x%08x len=%d (%s)", offset, value,
io_len, banshee_io_reg_name[reg]));
if ((offset & 3) && (reg < io_vgab0)) {
BX_ERROR(("unaligned write to address 0x%04x", address));
if ((reg < io_vgab0) || (reg > io_vgadc)) {
if (io_len == 1) {
shift = ((offset & 3) * 8);
mask = ~(0xff << shift);
value = (old & mask) | (value << shift);
} else if (io_len == 2) {
shift = ((offset & 2) * 8);
mask = ~(0xffff << shift);
value = (old & mask) | (value << shift);
}
}
switch (reg) {
case io_lfbMemoryConfig:

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

@ -2962,6 +2962,8 @@ void cmdfifo_process(cmdfifo_info *f)
BX_DEBUG(("cmdfifo_process(): JMP 0x%08x", f->rdptr));
}
break;
case 4: // JMP AGP
data = cmdfifo_r(f);
default:
BX_ERROR(("CMDFIFO packet type 0: unsupported code %d", code));
}