empathicqubit/Mesen-X
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Nina-03/06 support (Mapper 79)

Browse source
This commit is contained in:
Souryo 2015-12-30 11:47:36 -05:00
parent 759b6e8628
commit a98ce1c518
6 changed files with 91 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
Core/BaseMapper.h
View file

@ -27,8 +27,25 @@ enum MemoryAccessType
class BaseMapper : public IMemoryHandler, public Snapshotable, public INotificationListener
{
private:
const uint16_t PrgAddressRangeSize = 0x8000;
const uint16_t ChrAddressRangeSize = 0x2000;
MirroringType _mirroringType;
string _batteryFilename;
uint16_t InternalGetPrgPageSize()
{
//Make sure the page size is no bigger than the size of the ROM itself
//Otherwise we will end up reading from unallocated memory
return std::min((uint32_t)GetPRGPageSize(), _prgSize);
}
uint16_t InternalGetChrPageSize()
{
//Make sure the page size is no bigger than the size of the ROM itself
//Otherwise we will end up reading from unallocated memory
return std::min((uint32_t)GetCHRPageSize(), _chrSize);
}
protected:
uint8_t* _prgRom;
@ -99,7 +116,7 @@ class BaseMapper : public IMemoryHandler, public Snapshotable, public INotificat
case PrgMemoryType::PrgRom:
source = _prgRom;
pageCount = GetPRGPageCount();
pageSize = GetPRGPageSize();
pageSize = InternalGetPrgPageSize();
break;
case PrgMemoryType::SaveRam:
source = _saveRam;
@ -132,7 +149,7 @@ class BaseMapper : public IMemoryHandler, public Snapshotable, public INotificat
void SetPpuMemoryMapping(uint16_t startAddr, uint16_t endAddr, uint16_t pageNumber, int8_t accessType = -1)
{
pageNumber = pageNumber % GetCHRPageCount();
SetPpuMemoryMapping(startAddr, endAddr, &_chrRam[pageNumber * GetCHRPageSize()], accessType);
SetPpuMemoryMapping(startAddr, endAddr, &_chrRam[pageNumber * InternalGetChrPageSize()], accessType);
}
void SetPpuMemoryMapping(uint16_t startAddr, uint16_t endAddr, uint8_t* sourceMemory, int8_t accessType = -1)
@ -161,18 +178,47 @@ class BaseMapper : public IMemoryHandler, public Snapshotable, public INotificat
{
_prgPageNumbers[slot] = page;
uint16_t startAddr = 0x8000 + slot * GetPRGPageSize();
uint16_t endAddr = startAddr + GetPRGPageSize() - 1;
SetCpuMemoryMapping(startAddr, endAddr, page, memoryType);
if(_prgSize < PrgAddressRangeSize) {
//Total PRG size is smaller than available memory range, map the entire PRG to all slots
//i.e same logic as NROM (mapper 0) when PRG is 16kb
//Needed by "Pyramid" (mapper 79)
#ifdef _DEBUG
MessageManager::DisplayMessage("Debug", "PRG size is smaller than 32kb");
#endif
for(slot = 0; slot < PrgAddressRangeSize / _prgSize; slot++) {
uint16_t startAddr = 0x8000 + slot * _prgSize;
uint16_t endAddr = startAddr + _prgSize - 1;
SetCpuMemoryMapping(startAddr, endAddr, 0, memoryType);
}
} else {
uint16_t startAddr = 0x8000 + slot * InternalGetPrgPageSize();
uint16_t endAddr = startAddr + InternalGetPrgPageSize() - 1;
SetCpuMemoryMapping(startAddr, endAddr, page, memoryType);
}
}
void SelectCHRPage(uint16_t slot, uint16_t page)
{
_chrPageNumbers[slot] = page;
uint16_t startAddr = slot * GetCHRPageSize();
uint16_t endAddr = startAddr + GetCHRPageSize() - 1;
SetPpuMemoryMapping(startAddr, endAddr, page, _hasChrRam ? MemoryAccessType::ReadWrite : MemoryAccessType::Read);
if(_chrSize < ChrAddressRangeSize) {
//Total CHR size is smaller than available memory range, map the entire CHR to all slots
//Unsure if any game needs this, but assuming same behavior as PRG in similar situations
#ifdef _DEBUG
MessageManager::DisplayMessage("Debug", "CHR size is smaller than 8kb");
#endif
for(slot = 0; slot < ChrAddressRangeSize / _chrSize; slot++) {
uint16_t startAddr = slot * _chrSize;
uint16_t endAddr = startAddr + _chrSize - 1;
SetPpuMemoryMapping(startAddr, endAddr, (uint16_t)0, _hasChrRam ? MemoryAccessType::ReadWrite : MemoryAccessType::Read);
}
} else {
uint16_t startAddr = slot * InternalGetChrPageSize();
uint16_t endAddr = startAddr + InternalGetChrPageSize() - 1;
SetPpuMemoryMapping(startAddr, endAddr, page, _hasChrRam ? MemoryAccessType::ReadWrite : MemoryAccessType::Read);
}
}
bool HasBattery()
@ -207,12 +253,12 @@ class BaseMapper : public IMemoryHandler, public Snapshotable, public INotificat
uint32_t GetPRGPageCount()
{
return _prgSize / GetPRGPageSize();
return _prgSize / InternalGetPrgPageSize();
}
uint32_t GetCHRPageCount()
{
return _chrSize / GetCHRPageSize();
return _chrSize / InternalGetChrPageSize();
}
string GetBatteryFilename()

1
Core/Core.vcxproj
View file

@ -310,6 +310,7 @@
<ClInclude Include="JalecoSs88006.h" />
<ClInclude Include="MMC4.h" />
<ClInclude Include="MMC5.h" />
<ClInclude Include="Nina03_06.h" />
<ClInclude Include="NoiseChannel.h" />
<ClInclude Include="SquareChannel.h" />
<ClInclude Include="StandardController.h" />

3
Core/Core.vcxproj.filters
View file

@ -266,6 +266,9 @@
<ClInclude Include="UnlPci556.h">
<Filter>Header Files\Mappers</Filter>
</ClInclude>
<ClInclude Include="Nina03_06.h">
<Filter>Header Files\Mappers</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="CPU.cpp">

3
Core/MapperFactory.cpp
View file

@ -16,6 +16,7 @@
#include "MMC4.h"
#include "MMC5.h"
#include "Nanjing.h"
#include "Nina03_06.h"
#include "NROM.h"
#include "TaitoTc0190.h"
#include "UnlPci556.h"
@ -56,6 +57,8 @@ BaseMapper* MapperFactory::GetMapperFromID(uint8_t mapperID)
case 38: return new UnlPci556();
case 66: return new GxRom();
case 71: return new BF909x();
case 79: return new Nina03_06();
//case 87: return new JalecoJf05();
case 163: return new Nanjing();
case 189: return new MMC3_189();
}

9
Core/NROM.h
View file

@ -10,13 +10,8 @@ class NROM : public BaseMapper
virtual void InitMapper()
{
if(_prgSize == 0x4000) {
SelectPRGPage(0, 0);
SelectPRGPage(1, 0);
} else {
SelectPRGPage(0, 0);
SelectPRGPage(1, 1);
}
SelectPRGPage(0, 0);
SelectPRGPage(1, 1);
SelectCHRPage(0, 0);
}

26
Core/Nina03_06.h Normal file
View file

@ -0,0 +1,26 @@
#pragma once
#include "stdafx.h"
#include "BaseMapper.h"
class Nina03_06 : public BaseMapper
{
protected:
virtual uint16_t GetPRGPageSize() { return 0x8000; }
virtual uint16_t GetCHRPageSize() { return 0x2000; }
virtual uint16_t RegisterStartAddress() { return 0x4100; }
virtual uint16_t RegisterEndAddress() { return 0x5FFF; }
void InitMapper()
{
SelectPRGPage(0, 0);
SelectCHRPage(0, 0);
}
void WriteRegister(uint16_t addr, uint8_t value)
{
if((addr & 0x5100) != 0) {
SelectPRGPage(0, (value >> 3) & 0x01);
SelectCHRPage(0, value & 0x07);
}
}
};