archive/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-09-21 03:41:42 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1982 from skidau/AGP-hash

Browse source 
Advance Game Port (AGP) fixes
This commit is contained in:
skidau 2015-01-31 12:34:01 +11:00
commit 3b07fe01a2
4 changed files with 28 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
Source/Core/Core/HW/EXI_DeviceAGP.cpp
View file

@ -21,7 +21,6 @@ CEXIAgp::CEXIAgp(int index)
LoadRom(); LoadRom();
m_address = 0; m_address = 0;
m_rom_hash_loaded = false;
} }
CEXIAgp::~CEXIAgp() CEXIAgp::~CEXIAgp()
@ -36,15 +35,21 @@ CEXIAgp::~CEXIAgp()
SaveFileFromEEPROM(gbapath + ".sav"); SaveFileFromEEPROM(gbapath + ".sav");
} }
void CEXIAgp::DoHash(u8* data, u32 size) void CEXIAgp::CRC8(u8* data, u32 size)
{ {
if (!m_rom_hash_loaded)
LoadHash();
for (u32 it = 0; it < size; it++) for (u32 it = 0; it < size; it++)
{ {
u8 crc = 0;
m_hash = m_hash ^ data[it]; m_hash = m_hash ^ data[it];
m_hash = m_hash_array[m_hash]; if (m_hash & 1) crc ^= 0x5e;
if (m_hash & 2) crc ^= 0xbc;
if (m_hash & 4) crc ^= 0x61;
if (m_hash & 8) crc ^= 0xc2;
if (m_hash & 0x10) crc ^= 0x9d;
if (m_hash & 0x20) crc ^= 0x23;
if (m_hash & 0x40) crc ^= 0x46;
if (m_hash & 0x80) crc ^= 0x8c;
m_hash = crc;
} }
} }
@ -107,23 +112,6 @@ void CEXIAgp::SaveFileFromEEPROM(const std::string& filename)
} }
} }
void CEXIAgp::LoadHash()
{
if (!m_rom_hash_loaded && m_rom_size > 0)
{
for (int i = 0; i < 0x100; i++)
{
// Load the ROM hash expected by the AGP
m_hash_array[i] = Memory::ReadUnchecked_U8(0x0017e908 + i);
}
// Verify the hash
if (m_hash_array[HASH_SIZE - 1] == 0x35)
{
m_rom_hash_loaded = true;
}
}
}
u32 CEXIAgp::ImmRead(u32 _uSize) u32 CEXIAgp::ImmRead(u32 _uSize)
{ {
// We don't really care about _uSize // We don't really care about _uSize
@ -155,8 +143,8 @@ u32 CEXIAgp::ImmRead(u32 _uSize)
RomVal1 = m_rom[m_rw_offset++]; RomVal1 = m_rom[m_rw_offset++];
RomVal2 = m_rom[m_rw_offset++]; RomVal2 = m_rom[m_rw_offset++];
} }
DoHash(&RomVal2, 1); CRC8(&RomVal2, 1);
DoHash(&RomVal1, 1); CRC8(&RomVal1, 1);
uData = (RomVal2 << 24) | (RomVal1 << 16) | (m_hash << 8); uData = (RomVal2 << 24) | (RomVal1 << 16) | (m_hash << 8);
m_current_cmd = 0; m_current_cmd = 0;
break; break;
@ -172,18 +160,18 @@ u32 CEXIAgp::ImmRead(u32 _uSize)
RomVal2 = m_rom[m_rw_offset++]; RomVal2 = m_rom[m_rw_offset++];
RomVal3 = m_rom[m_rw_offset++]; RomVal3 = m_rom[m_rw_offset++];
RomVal4 = m_rom[m_rw_offset++]; RomVal4 = m_rom[m_rw_offset++];
DoHash(&RomVal2, 1); CRC8(&RomVal2, 1);
DoHash(&RomVal1, 1); CRC8(&RomVal1, 1);
DoHash(&RomVal4, 1); CRC8(&RomVal4, 1);
DoHash(&RomVal3, 1); CRC8(&RomVal3, 1);
uData = (RomVal2 << 24) | (RomVal1 << 16) | (RomVal4 << 8) | (RomVal3); uData = (RomVal2 << 24) | (RomVal1 << 16) | (RomVal4 << 8) | (RomVal3);
} }
break; break;
case 0xAE0B0000: case 0xAE0B0000:
RomVal1 = m_eeprom_pos < 4 ? 0xA : (((u64*)m_eeprom.data())[(m_eeprom_cmd >> 1) & 0x3F] >> (m_eeprom_pos - 4)) & 0x1; RomVal1 = m_eeprom_pos < 4 ? 0xA : (((u64*)m_eeprom.data())[(m_eeprom_cmd >> 1) & 0x3F] >> (m_eeprom_pos - 4)) & 0x1;
RomVal2 = 0; RomVal2 = 0;
DoHash(&RomVal2, 1); CRC8(&RomVal2, 1);
DoHash(&RomVal1, 1); CRC8(&RomVal1, 1);
uData = (RomVal2 << 24) | (RomVal1 << 16) | (m_hash << 8); uData = (RomVal2 << 24) | (RomVal1 << 16) | (m_hash << 8);
m_eeprom_pos++; m_eeprom_pos++;
m_current_cmd = 0; m_current_cmd = 0;
@ -216,11 +204,11 @@ void CEXIAgp::ImmWrite(u32 _uData, u32 _uSize)
m_rw_offset = ((_uData & 0xFFFFFF00) >> 7) & m_rom_mask; m_rw_offset = ((_uData & 0xFFFFFF00) >> 7) & m_rom_mask;
m_return_pos = 0; m_return_pos = 0;
HashCmd = (_uData & 0xFF000000) >> 24; HashCmd = (_uData & 0xFF000000) >> 24;
DoHash(&HashCmd, 1); CRC8(&HashCmd, 1);
HashCmd = (_uData & 0x00FF0000) >> 16; HashCmd = (_uData & 0x00FF0000) >> 16;
DoHash(&HashCmd, 1); CRC8(&HashCmd, 1);
HashCmd = (_uData & 0x0000FF00) >> 8; HashCmd = (_uData & 0x0000FF00) >> 8;
DoHash(&HashCmd, 1); CRC8(&HashCmd, 1);
break; break;
case 0xAE0C0000: case 0xAE0C0000:
if ((m_eeprom_pos < 0x8) || (m_eeprom_pos == ((m_eeprom_cmd & EE_READ) ? 0x8 : 0x48))) if ((m_eeprom_pos < 0x8) || (m_eeprom_pos == ((m_eeprom_cmd & EE_READ) ? 0x8 : 0x48)))
@ -244,9 +232,9 @@ void CEXIAgp::ImmWrite(u32 _uData, u32 _uSize)
m_eeprom_pos++; m_eeprom_pos++;
m_return_pos = 0; m_return_pos = 0;
HashCmd = (_uData & 0xFF000000) >> 24; HashCmd = (_uData & 0xFF000000) >> 24;
DoHash(&HashCmd, 1); CRC8(&HashCmd, 1);
HashCmd = (_uData & 0x00FF0000) >> 16; HashCmd = (_uData & 0x00FF0000) >> 16;
DoHash(&HashCmd, 1); CRC8(&HashCmd, 1);
break; break;
case 0xAE0B0000: case 0xAE0B0000:
break; break;
@ -260,7 +248,7 @@ void CEXIAgp::ImmWrite(u32 _uData, u32 _uSize)
m_return_pos = 0; m_return_pos = 0;
m_hash = 0xFF; m_hash = 0xFF;
HashCmd = (_uData & 0x00FF0000) >> 16; HashCmd = (_uData & 0x00FF0000) >> 16;
DoHash(&HashCmd, 1); CRC8(&HashCmd, 1);
break; break;
} }
} }
@ -277,7 +265,6 @@ void CEXIAgp::DoState(PointerWrap &p)
p.Do(m_eeprom_pos); p.Do(m_eeprom_pos);
p.Do(m_eeprom_size); p.Do(m_eeprom_size);
p.Do(m_hash); p.Do(m_hash);
p.Do(m_hash_array);
p.Do(m_position); p.Do(m_position);
p.Do(m_return_pos); p.Do(m_return_pos);
p.Do(m_rom); p.Do(m_rom);

8
Source/Core/Core/HW/EXI_DeviceAGP.h
View file

@ -23,8 +23,6 @@ public:
private: private:
enum enum
{ {
HASH_SIZE = 256,
HASH_MASK = (HASH_SIZE - 1),
EE_READ = 0x80 EE_READ = 0x80
}; };
@ -37,7 +35,6 @@ private:
u32 m_eeprom_mask = 0; u32 m_eeprom_mask = 0;
std::vector<u8> m_rom; std::vector<u8> m_rom;
std::vector<u8> m_eeprom; std::vector<u8> m_eeprom;
std::array<u8, HASH_SIZE> m_hash_array;
//! Helper //! Helper
u32 m_position = 0; u32 m_position = 0;
@ -50,13 +47,10 @@ private:
void LoadFileToROM(const std::string& filename); void LoadFileToROM(const std::string& filename);
void LoadFileToEEPROM(const std::string& filename); void LoadFileToEEPROM(const std::string& filename);
void SaveFileFromEEPROM(const std::string& filename); void SaveFileFromEEPROM(const std::string& filename);
void LoadHash();
void LoadRom(); void LoadRom();
void DoHash(u8* data, u32 size); void CRC8(u8* data, u32 size);
u8 m_hash = 0; u8 m_hash = 0;
u32 m_current_cmd = 0; u32 m_current_cmd = 0;
u32 m_return_pos = 0; u32 m_return_pos = 0;
bool m_rom_hash_loaded = false;
}; };

2
Source/Core/Core/PowerPC/JitCommon/Jit_Util.cpp
View file

@ -1058,7 +1058,7 @@ void EmuCodeBlock::SetFPRF(Gen::X64Reg xmm)
void EmuCodeBlock::JitGetAndClearCAOV(bool oe) void EmuCodeBlock::JitGetAndClearCAOV(bool oe)
{ {
if (oe) if (oe)
AND(8, PPCSTATE(xer_so_ov), Imm32(~XER_OV_MASK)); //XER.OV = 0 AND(8, PPCSTATE(xer_so_ov), Imm8(~XER_OV_MASK)); //XER.OV = 0
SHR(8, PPCSTATE(xer_ca), Imm8(1)); //carry = XER.CA, XER.CA = 0 SHR(8, PPCSTATE(xer_ca), Imm8(1)); //carry = XER.CA, XER.CA = 0
} }

1
Source/Core/DolphinWX/ConfigMain.cpp
View file

@ -1076,6 +1076,7 @@ void CConfigMain::ChooseSlotPath(bool isSlotA, TEXIDevices device_type)
filename = "./" + filename; filename = "./" + filename;
} }
} }
std::replace(filename.begin(), filename.end(), '\\', '/');
#endif #endif
// also check that the path isn't used for the other memcard... // also check that the path isn't used for the other memcard...