diff --git a/src/devices/cpu/rsp/rspcp2d.cpp b/src/devices/cpu/rsp/rspcp2d.cpp index c755a3528ac..c904caf8646 100644 --- a/src/devices/cpu/rsp/rspcp2d.cpp +++ b/src/devices/cpu/rsp/rspcp2d.cpp @@ -301,7 +301,7 @@ void rsp_cop2_drc::lsv() uint32_t op = m_rspcop2_state->op; int dest = (op >> 16) & 0x1f; int base = (op >> 21) & 0x1f; - int index = (op >> 7) & 0xe; + int index = (op >> 7) & 0xf; int offset = (op & 0x7f); if (offset & 0x40) { @@ -338,7 +338,7 @@ void rsp_cop2_drc::llv() uint32_t ea; int dest = (op >> 16) & 0x1f; int base = (op >> 21) & 0x1f; - int index = (op >> 7) & 0xc; + int index = (op >> 7) & 0xf; int offset = (op & 0x7f); if (offset & 0x40) { @@ -377,7 +377,7 @@ void rsp_cop2_drc::ldv() uint32_t ea; int dest = (op >> 16) & 0x1f; int base = (op >> 21) & 0x1f; - int index = (op >> 7) & 0x8; + int index = (op >> 7) & 0xf; int offset = (op & 0x7f); if (offset & 0x40) { @@ -906,7 +906,7 @@ void rsp_cop2_drc::sdv() uint32_t op = m_rspcop2_state->op; int dest = (op >> 16) & 0x1f; int base = (op >> 21) & 0x1f; - int index = (op >> 7) & 0x8; + int index = (op >> 7) & 0xf; int offset = (op & 0x7f); if (offset & 0x40) { diff --git a/src/mame/video/n64.cpp b/src/mame/video/n64.cpp index 014c41b718c..762b5de0854 100644 --- a/src/mame/video/n64.cpp +++ b/src/mame/video/n64.cpp @@ -1664,7 +1664,7 @@ void n64_rdp::disassemble(char* buffer) case 0x2f: sprintf(buffer, "Set_Other_Modes %08X %08X", uint32_t(cmd[0] >> 32), (uint32_t)cmd[0]); break; case 0x30: sprintf(buffer, "Load_TLUT %d, %s, %s, %s, %s", tile, sl, tl, sh, th); break; case 0x32: sprintf(buffer, "Set_Tile_Size %d, %s, %s, %s, %s", tile, sl, tl, sh, th); break; - case 0x33: sprintf(buffer, "Load_Block %d, %03X, %03X, %03X, %03X", tile, uint32_t(cmd[0] >> 44) & 0xfff, uint32_t(cmd[0] >> 32) & 0xfff, uint32_t(cmd[0] >> 12) & 0xfff, uint32_t(cmd[1]) & 0xfff); break; + case 0x33: sprintf(buffer, "Load_Block %d, %03X, %03X, %03X, %03X", tile, uint32_t(cmd[0] >> 44) & 0xfff, uint32_t(cmd[0] >> 32) & 0xfff, uint32_t(cmd[0] >> 12) & 0xfff, uint32_t(cmd[0]) & 0xfff); break; case 0x34: sprintf(buffer, "Load_Tile %d, %s, %s, %s, %s", tile, sl, tl, sh, th); break; case 0x35: sprintf(buffer, "Set_Tile %d, %s, %s, %d, %04X", tile, format, size, (uint32_t(cmd[0] >> 41) & 0x1ff) * 8, (uint32_t(cmd[0] >> 32) & 0x1ff) * 8); break; case 0x36: sprintf(buffer, "Fill_Rectangle %s, %s, %s, %s", sh, th, sl, tl); break;