ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1106 from Nekokabu/master 

Update Sram.cpp
This commit is contained in:
zilmar 2016-06-05 11:13:50 +10:00
parent 8bd03a6763 bd9adbf1a1
commit 33ba964f67
1 changed files with 9 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
Source/Project64-core/N64System/Mips/Sram.cpp
View File

@ -52,7 +52,6 @@ bool CSram::LoadSram()
void CSram::DmaFromSram(uint8_t * dest, int32_t StartOffset, int32_t len) void CSram::DmaFromSram(uint8_t * dest, int32_t StartOffset, int32_t len)
{ {
uint32_t i; uint32_t i;
uint8_t tmp[4];
if (!m_File.IsOpen()) if (!m_File.IsOpen())
{ {
@ -65,66 +64,17 @@ void CSram::DmaFromSram(uint8_t * dest, int32_t StartOffset, int32_t len)
// Fix Dezaemon 3D saves // Fix Dezaemon 3D saves
StartOffset = ((StartOffset >> 3) & 0xFFFF8000) | (StartOffset & 0x7FFF); StartOffset = ((StartOffset >> 3) & 0xFFFF8000) | (StartOffset & 0x7FFF);
uint32_t Offset = StartOffset & 3; if (((StartOffset & 3) == 0) && ((((uint32_t)dest) & 3) == 0))
if (Offset == 0)
{ {
m_File.Seek(StartOffset, CFile::begin); m_File.Seek(StartOffset, CFile::begin);
m_File.Read(dest, len); m_File.Read(dest, len);
} }
else else
{ {
m_File.Seek(StartOffset - Offset, CFile::begin); for (i = 0; i < len; i++)
m_File.Read(tmp, 4);
for (i = 0; i < (4 - Offset); i++)
{ {
dest[i + Offset] = tmp[i]; m_File.Seek((StartOffset + i) ^ 3, CFile::begin);
} m_File.Read((uint8_t*)(((uint32_t)dest + i) ^ 3), 1);
for (i = 4 - Offset; i < len - Offset; i += 4)
{
m_File.Read(tmp, 4);
switch (Offset)
{
case 1:
dest[i + 2] = tmp[0];
dest[i + 3] = tmp[1];
dest[i + 4] = tmp[2];
dest[i - 3] = tmp[3];
break;
case 2:
dest[i + 4] = tmp[0];
dest[i + 5] = tmp[1];
dest[i - 2] = tmp[2];
dest[i - 1] = tmp[3];
break;
case 3:
dest[i + 6] = tmp[0];
dest[i - 1] = tmp[1];
dest[i] = tmp[2];
dest[i + 1] = tmp[3];
break;
default:
break;
}
}
m_File.Read(tmp, 4);
switch (Offset)
{
case 1:
dest[i - 3] = tmp[3];
break;
case 2:
dest[i - 2] = tmp[2];
dest[i - 1] = tmp[3];
break;
case 3:
dest[i - 1] = tmp[1];
dest[i] = tmp[2];
dest[i + 1] = tmp[3];
break;
default:
break;
} }
} }
} }
@ -132,7 +82,6 @@ void CSram::DmaFromSram(uint8_t * dest, int32_t StartOffset, int32_t len)
void CSram::DmaToSram(uint8_t * Source, int32_t StartOffset, int32_t len) void CSram::DmaToSram(uint8_t * Source, int32_t StartOffset, int32_t len)
{ {
uint32_t i; uint32_t i;
uint8_t tmp[4];
if (m_ReadOnly) if (m_ReadOnly)
{ {
@ -150,69 +99,18 @@ void CSram::DmaToSram(uint8_t * Source, int32_t StartOffset, int32_t len)
// Fix Dezaemon 3D saves // Fix Dezaemon 3D saves
StartOffset = ((StartOffset >> 3) & 0xFFFF8000) | (StartOffset & 0x7FFF); StartOffset = ((StartOffset >> 3) & 0xFFFF8000) | (StartOffset & 0x7FFF);
uint32_t Offset = StartOffset & 3; if (((StartOffset & 3) == 0) && ((((uint32_t)Source) & 3) == 0) && NULL != NULL)
if (Offset == 0)
{ {
m_File.Seek(StartOffset, CFile::begin); m_File.Seek(StartOffset, CFile::begin);
m_File.Write(Source, len); m_File.Write(Source, len);
} }
else else
{ {
for (i = 0; i < (4 - Offset); i++) for (i = 0; i < len; i++)
{ {
tmp[i] = Source[i + Offset]; m_File.Seek((StartOffset + i) ^ 3, CFile::begin);
m_File.Write((uint8_t*)(((uint32_t)Source + i) ^ 3), 1);
} }
m_File.Seek(StartOffset - Offset, CFile::begin);
m_File.Write(tmp, (4 - Offset));
m_File.Seek(Offset, CFile::current);
for (i = 4 - Offset; i < len - Offset; i += 4)
{
switch (Offset)
{
case 1:
tmp[0] = Source[i + 2];
tmp[1] = Source[i + 3];
tmp[2] = Source[i + 4];
tmp[3] = Source[i - 3];
break;
case 2:
tmp[0] = Source[i + 4];
tmp[1] = Source[i + 5];
tmp[2] = Source[i - 2];
tmp[3] = Source[i - 1];
break;
case 3:
tmp[0] = Source[i + 6];
tmp[1] = Source[i - 1];
tmp[2] = Source[i];
tmp[3] = Source[i + 1];
break;
default:
break;
}
m_File.Write(tmp, 4);
}
switch (Offset)
{
case 1:
tmp[0] = Source[i - 3];
break;
case 2:
tmp[0] = Source[i - 2];
tmp[0] = Source[i - 1];
break;
case 3:
tmp[0] = Source[i - 1];
tmp[0] = Source[i];
tmp[0] = Source[i + 1];
break;
default:
break;
}
m_File.Seek(4 - Offset, CFile::current);
m_File.Write(tmp, Offset);
} }
m_File.Flush(); m_File.Flush();
} }