iris/kaizen
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Not too sure about this, return to old

Browse Source
This commit is contained in:
SimoneN64
2024-06-19 23:10:23 +02:00
parent b70a881b2a
commit 5400238fac
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/backend/core/mmio/PI.cpp
View File

@@ -432,11 +432,6 @@ void PI::Write(u32 addr, u32 val) {
rdLen = val & 0x00FFFFFF; rdLen = val & 0x00FFFFFF;
s32 len = val + 1; s32 len = val + 1;
s32 misalign = dramAddr & 7;
s32 distEndOfRow = 0x800-(dramAddr&0x7ff);
s32 blockLen = std::min(128-misalign, distEndOfRow);
s32 curLen = std::min(len, blockLen);
for (int i = 0; i < len; i++) { for (int i = 0; i < len; i++) {
u32 address = BYTE_ADDRESS(dramAddr + i) & RDRAM_DSIZE; u32 address = BYTE_ADDRESS(dramAddr + i) & RDRAM_DSIZE;
if (address < RDRAM_SIZE) { if (address < RDRAM_SIZE) {
@@ -448,7 +443,8 @@ void PI::Write(u32 addr, u32 val) {
} }
dramAddr += len; dramAddr += len;
dramAddr = (dramAddr + 7) & ~7; dramAddr = (dramAddr + 7) & ~7;
for(s32 i = 0; i < curLen; i+=2) cartAddr += 2; cartAddr += len;
if(cartAddr & 1) cartAddr += 1;
Util::trace("PI DMA from RDRAM to CARTRIDGE (size: {} B, {:08X} to {:08X})", len, dramAddr, cartAddr); Util::trace("PI DMA from RDRAM to CARTRIDGE (size: {} B, {:08X} to {:08X})", len, dramAddr, cartAddr);
dmaBusy = true; dmaBusy = true;
toCart = true; toCart = true;
@@ -458,11 +454,6 @@ void PI::Write(u32 addr, u32 val) {
wrLen = val & 0x00FFFFFF; wrLen = val & 0x00FFFFFF;
s32 len = wrLen + 1; s32 len = wrLen + 1;
s32 misalign = dramAddr & 7;
s32 distEndOfRow = 0x800-(dramAddr&0x7ff);
s32 blockLen = std::min(128-misalign, distEndOfRow);
s32 curLen = std::min(len, blockLen);
if(mem.saveType == SAVE_FLASH_1m && cartAddr >= SREGION_PI_SRAM && cartAddr < 0x08010000) { if(mem.saveType == SAVE_FLASH_1m && cartAddr >= SREGION_PI_SRAM && cartAddr < 0x08010000) {
cartAddr = SREGION_PI_SRAM | ((cartAddr & 0xFFFFF) << 1); cartAddr = SREGION_PI_SRAM | ((cartAddr & 0xFFFFF) << 1);
} }
@@ -475,7 +466,8 @@ void PI::Write(u32 addr, u32 val) {
} }
dramAddr += len; dramAddr += len;
dramAddr = (dramAddr + 7) & ~7; dramAddr = (dramAddr + 7) & ~7;
for(s32 i = 0; i < curLen; i+=2) cartAddr += 2; cartAddr += len;
if(cartAddr & 1) cartAddr += 1;
dmaBusy = true; dmaBusy = true;
Util::trace("PI DMA from CARTRIDGE to RDRAM (size: {} B, {:08X} to {:08X})", len, cartAddr, dramAddr); Util::trace("PI DMA from CARTRIDGE to RDRAM (size: {} B, {:08X} to {:08X})", len, cartAddr, dramAddr);
toCart = false; toCart = false;