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

EEPROM (93c46) support for SMS

This commit is contained in:
Tastyfish 2017-10-21 21:18:23 -04:00
parent 3e3a64fffe
commit 5e87b45df0
5 changed files with 369 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Assets/gamedb/gamedb_sega_gg.txt
View File

@ -231,7 +231,7 @@ B19256C6716147A9744F5BD528F14450 Magic Knight Rayearth 2 - Making of Magic Knig
846D48D0F4024C8094117599D0E1EEF1 Magic Knight Rayearth (J) GG SRAM=8192 Japan
E496FF2196C372F4D6111538950D25CA Magical Puzzle Popils (W) (En,Ja) GG Puzzle SRAM=8192 World
3AF0C6DDF5F00A493E1F159FCEDC0933 Magical Taruruuto-kun (J) GG Japan
B0C35BC53AB7C184D34E5624F69AAD24 The Majors Pro Baseball (U) GG Sports;Baseball SRAM=128;GGLink USA
B0C35BC53AB7C184D34E5624F69AAD24 The Majors Pro Baseball (U) GG Sports;Baseball SRAM=128;GGLink;EEPROM USA
A15C5219F766D516D1B8D9A09B9A2BB4 Mappy (J) GG Japan
B83F36FD113A8F75F1A29652ACB641FC Marble Madness (UE) GG Arcade USA;Europe
BA846684A66E90372C3C234955EE28BC Marko's Magic Football (E) (En,Fr,De,Es) GG Europe
@ -461,9 +461,9 @@ A23E89266DDAD3C856E7401D04A49C6C Woody Pop (W) (Rev 1) GG World
13F72ACFEA47587F9AA9F655BF98653C World Class Leader Board Golf (UE) GG Sports;Golf USA;Europe
D95D381C6AFFB8345EE5457655E393D1 World Cup USA 94 (UE) (En,Fr,De,Es,It,Nl,Pt,Sv) GG Sports;Soccer USA;Europe
D8939B64458FAF174CDC1241F777CB59 World Derby (J) GG GGLink Japan
E7EABBFC7A1F1339C4720249AEA92A32 World Series Baseball '95 (U) GG Sports;Baseball SRAM=128;GGLink USA
59359FC38865CFF00C90D6EB148DDC2F World Series Baseball (U) GG Sports;Baseball SRAM=128;GGLink USA
05CAC33029F0CAAC27774504C1AA8597 World Series Baseball (U) (Rev 1) GG Sports;Baseball SRAM=128;GGLink USA
E7EABBFC7A1F1339C4720249AEA92A32 World Series Baseball '95 (U) GG Sports;Baseball SRAM=128;GGLink;EEPROM USA
59359FC38865CFF00C90D6EB148DDC2F World Series Baseball (U) GG Sports;Baseball SRAM=128;GGLink;EEPROM USA
05CAC33029F0CAAC27774504C1AA8597 World Series Baseball (U) (Rev 1) GG Sports;Baseball SRAM=128;GGLink;EEPROM USA
D810E851AD60ED5BA50B6246C2CE12F2 WWF Raw (UE) GG Sports;Wrestling USA;Europe
571AC03B80E3075C699CD583BF8651FD X-Men - Gamemaster's Legacy (UE) GG Marvel USA;Europe
CA15F2BA2507EBD836C42D9D10231EB1 X-Men - Mojo World (UE) GG Marvel USA;Europe

8
BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
View File

@ -1071,6 +1071,8 @@
<Compile Include="Consoles\Sega\Saturn\LibSaturnus.cs" />
<Compile Include="Consoles\Sega\Saturn\Saturnus.cs" />
<Compile Include="Consoles\Sega\Saturn\SaturnusControllerDeck.cs" />
<Compile Include="Consoles\Sega\SMS\EEPROM.93c46.cs" />
<Compile Include="Consoles\Sega\SMS\MemoryMap.EEPROM.cs" />
<Compile Include="Consoles\Sega\SMS\SMS.cs" />
<Compile Include="Consoles\Sega\SMS\SMS.ICodeDataLogger.cs">
<DependentUpon>SMS.cs</DependentUpon>
@ -1190,9 +1192,9 @@
<Compile Include="CPUs\Z80A\Execute.cs" />
<Compile Include="CPUs\Z80A\Interrupts.cs" />
<Compile Include="CPUs\Z80A\Registers.cs" />
<Compile Include="CPUs\Z80A\Operations.cs" />
<Compile Include="CPUs\Z80A\Operations.cs" />
<Compile Include="CPUs\Z80A\Tables_Direct.cs" />
<Compile Include="CPUs\Z80A\Tables_Indirect.cs" />
<Compile Include="CPUs\Z80A\Tables_Indirect.cs" />
<Compile Include="CPUs\Z80A\Z80A.cs" />
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
@ -1316,4 +1318,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>

222
BizHawk.Emulation.Cores/Consoles/Sega/SMS/EEPROM.93c46.cs Normal file
View File

@ -0,0 +1,222 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BizHawk.Emulation.Cores.Sega.MasterSystem
{
class EEPROM93c46
{
enum EEPROMWriteMode
{
Instruction,
WriteData,
WriteAll,
Read
}
enum EEPROMReadMode
{
ReadNew,
ReadOld,
Hold
}
[Flags]
enum EEPROMFlags : byte
{
Ready = 1,
Clock = 2,
ChipSelect = 4
}
ushort Address = 0;
ushort Value = 0;
int BitsWritten = 0;
int BitsRead = 0;
bool WriteEnable = false;
EEPROMWriteMode WriteMode = EEPROMWriteMode.Instruction;
EEPROMReadMode ReadMode = EEPROMReadMode.Hold;
EEPROMFlags Flags = 0;
public byte Read(byte[] saveRAM)
{
switch (ReadMode)
{
case EEPROMReadMode.ReadNew:
// A new value clocking out
ReadMode = EEPROMReadMode.ReadOld;
byte ret = Read(saveRAM);
if (++BitsRead == 8)
{
// Increment address
BitsRead = 0;
++Address;
if(Address % 2 == 0)
{
WriteMode = EEPROMWriteMode.Instruction;
ReadMode = EEPROMReadMode.Hold;
BitsWritten = 0;
Value = 0;
}
}
return ret;
case EEPROMReadMode.ReadOld:
// repeat old value
byte bit = (byte)((saveRAM[Address % saveRAM.Length] >> (7 - BitsRead)) & 1);
return (byte)((byte)(Flags | EEPROMFlags.Clock) | bit);
default:
// ready/busy flag is always ready in this emulation
return (byte)(Flags | EEPROMFlags.Clock | EEPROMFlags.Ready);
}
}
public void Write(byte bit, byte[] saveRAM)
{
// new instruction?
if ((bit & 4) == 0)
{
WriteMode = EEPROMWriteMode.Instruction;
ReadMode = EEPROMReadMode.Hold;
BitsWritten = 0;
Value = 0;
Flags = (EEPROMFlags)bit & ~EEPROMFlags.Ready;
return;
}
// clock low to high?
if ((bit & (byte)EEPROMFlags.Clock) != 0 && (Flags & EEPROMFlags.Clock) == 0)
{
// all modes shift in a larger value
Value = (ushort)((Value << 1) | (bit & 1));
++BitsWritten;
switch (WriteMode)
{
case EEPROMWriteMode.Instruction:
// Process opcode including start bit
// check start bit
if ((Value & 0x100) == 0)
return;
byte op = (byte)Value;
Value = 0;
BitsWritten = 0;
switch (op & 0xC0)
{
case 0x00:
// non-addressed commands
switch (op & 0xF0)
{
case 0x00:
// EWDS: write disable
WriteEnable = false;
return;
case 0x10:
// WRAL: write to all addresses (silly)
WriteMode = EEPROMWriteMode.WriteAll;
ReadMode = EEPROMReadMode.Hold;
return;
case 0x20:
// ERAL: erase all addresses
if (WriteEnable)
{
for (int i = 0; i < saveRAM.Length; ++i)
{
saveRAM[i] = 0xFF;
}
}
ReadMode = EEPROMReadMode.Hold;
return;
case 0x30:
// EWEN: write enable
WriteEnable = true;
return;
default:
// impossible
return;
}
case 0x40:
// WRITE
Address = (ushort)((op & 0x3F) << 1);
WriteMode = EEPROMWriteMode.WriteData;
ReadMode = EEPROMReadMode.Hold;
return;
case 0x80:
// READ
Address = (ushort)((op & 0x3F) << 1);
ReadMode = EEPROMReadMode.Hold;
WriteMode = EEPROMWriteMode.Read;
BitsRead = 0;
return;
case 0xC0:
// ERASE
Address = (ushort)((op & 0x3F) << 1);
if (WriteEnable)
{
saveRAM[Address % saveRAM.Length] = 0xFF;
saveRAM[(Address + 1) % saveRAM.Length] = 0xFF;
}
ReadMode = EEPROMReadMode.Hold;
return;
default:
// impossible
return;
}
case EEPROMWriteMode.WriteData:
// Write bits
if (BitsWritten < 16)
return;
if (WriteEnable)
{
saveRAM[Address % saveRAM.Length] = (byte)(Value >> 8);
saveRAM[(Address + 1) % saveRAM.Length] = (byte)Value;
}
WriteMode = EEPROMWriteMode.Instruction;
Value = 0;
BitsWritten = 0;
return;
case EEPROMWriteMode.WriteAll:
// write to ALL addresses
if (BitsWritten < 16)
return;
Value = 0;
BitsWritten = 0;
if (WriteEnable)
{
for (int i = 0; i < saveRAM.Length; i += 2)
{
saveRAM[i % saveRAM.Length] = (byte)Value;
saveRAM[(i + 1) % saveRAM.Length] = (byte)(Value >> 8);
}
}
WriteMode = EEPROMWriteMode.Instruction;
return;
case EEPROMWriteMode.Read:
// Clock a new value out
ReadMode = EEPROMReadMode.ReadNew;
return;
}
}
Flags = (EEPROMFlags)bit & ~EEPROMFlags.Ready;
}
}
}

136
BizHawk.Emulation.Cores/Consoles/Sega/SMS/MemoryMap.EEPROM.cs Normal file
View File

@ -0,0 +1,136 @@
using System;
namespace BizHawk.Emulation.Cores.Sega.MasterSystem
{
public partial class SMS
{
// The 93c46-connected mapper is assumed to be equivalent to the Sega mapper except for $8000-..
// The Sega memory mapper layout looks like so:
// $0000-$03FF - ROM (unpaged)
// $0400-$3FFF - ROM mapper slot 0
// $4000-$7FFF - ROM mapper slot 1
// $8000-$BFFF - ROM mapper slot 2 - OR - EEPROM
// $C000-$DFFF - System RAM
// $E000-$FFFF - System RAM (mirror)
// $FFFC - SaveRAM mapper control
// $FFFD - Mapper slot 0 control
// $FFFE - Mapper slot 1 control
// $FFFF - Mapper slot 2 control
EEPROM93c46 EEPROM;
byte ReadMemoryEEPROM(ushort address)
{
byte ret = 0xFF;
if (address < 0xC000)
{
if ((Port3E & 0x48) == 0x48) // cart and bios disabled, return empty bus
ret = 0xFF;
else if (BiosMapped && BiosRom != null)
ret = BiosRom[address & 0x1FFF];
else if (address < 1024)
ret = RomData[address];
else if (address < 0x4000)
ret = RomData[(RomBank0 * BankSize) + address];
else if (address < 0x8000)
ret = RomData[(RomBank1 * BankSize) + (address & BankSizeMask)];
else
{
switch (SaveRamBank)
{
case 0: ret = RomData[(RomBank2 * BankSize) + (address & BankSizeMask)]; break;
case 1: if (SaveRAM != null && EEPROM != null) ret = EEPROM.Read(SaveRAM); break;
default:
ret = SystemRam[address & RamSizeMask];
break;
}
}
}
else
{
ret = SystemRam[address & RamSizeMask];
}
return ret;
}
CDLog_MapResults MapMemoryEEPROM(ushort address, bool write)
{
if (address < 0xC000)
{
if ((Port3E & 0x48) == 0x48) // cart and bios disabled, return empty bus
return new CDLog_MapResults();
else if (BiosMapped && BiosRom != null)
return new CDLog_MapResults(); //bios tracking of CDL is not supported
else if (address < 1024)
return new CDLog_MapResults() { Type = CDLog_AddrType.ROM, Address = address };
else if (address < 0x4000)
return new CDLog_MapResults() { Type = CDLog_AddrType.ROM, Address = (RomBank0 * BankSize) + address };
else if (address < 0x8000)
return new CDLog_MapResults() { Type = CDLog_AddrType.ROM, Address = (RomBank1 * BankSize) + (address & BankSizeMask) };
else
{
switch (SaveRamBank)
{
case 0: return new CDLog_MapResults() { Type = CDLog_AddrType.ROM, Address = (RomBank2 * BankSize) + (address & BankSizeMask) };
case 1: return new CDLog_MapResults(); // a serial IO port
case 2: return new CDLog_MapResults(); // a serial IO port
default:
return new CDLog_MapResults() { Type = CDLog_AddrType.MainRAM, Address = address & RamSizeMask };
}
}
}
else
{
return new CDLog_MapResults() { Type = CDLog_AddrType.MainRAM, Address = address & RamSizeMask };
}
}
void WriteMemoryEEPROM(ushort address, byte value)
{
if (address >= 0xC000)
SystemRam[address & RamSizeMask] = value;
else if (address >= 0x8000)
{
if (SaveRAM != null)
{
SaveRamModified = true;
EEPROM.Write(value, SaveRAM);
return;
}
else System.Console.WriteLine("Game attempt to use SRAM but SRAM not present");
}
if (address >= 0xFFFC)
{
if (address == 0xFFFC)
{
if ((value & 8) != 0)
SaveRamBank = (byte)((value & 4) == 0 ? 1 : 2); // SaveRAM selected
else
SaveRamBank = 0; // ROM bank selected
}
else if (address == 0xFFFD) RomBank0 = (byte)(value % RomBanks);
else if (address == 0xFFFE) RomBank1 = (byte)(value % RomBanks);
else if (address == 0xFFFF) RomBank2 = (byte)(value % RomBanks);
return;
}
}
void InitEEPROMMapper()
{
ReadMemory = ReadMemoryEEPROM;
WriteMemory = WriteMemoryEEPROM;
MapMemory = MapMemoryEEPROM;
WriteMemoryEEPROM(0xFFFC, 0);
WriteMemoryEEPROM(0xFFFD, 0);
WriteMemoryEEPROM(0xFFFE, 1);
WriteMemoryEEPROM(0xFFFF, 2);
EEPROM = new EEPROM93c46();
}
}
}

2
BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.cs
View File

@ -114,6 +114,8 @@ namespace BizHawk.Emulation.Cores.Sega.MasterSystem
InitNemesisMapper();
else if (game["TerebiOekaki"])
InitTerebiOekaki();
else if (game["EEPROM"])
InitEEPROMMapper();
else
InitSegaMapper();