Added more VS System info to DB, support for new NES 2.0 proposals (WIP) + some refactoring

Author: SourMesen

Core/AXROM.h

@@ -14,7 +14,7 @@ class AXROM : public BaseMapper
 			SelectCHRPage(0, 0);
 		}
 
-		bool HasBusConflicts() override { return _subMapperID == 2; }
+		bool HasBusConflicts() override { return _romInfo.SubMapperID == 2; }
 
 		void WriteRegister(uint16_t addr, uint8_t value) override
 		{

Core/BF9096.h

@@ -28,7 +28,7 @@ class BF9096 : public BaseMapper
 		if(addr >= 0xC000) {
 			_prgPage = value & 0x03;
 		} else if(addr < 0xC000) {
-			if(_subMapperID == 1) {
+			if(_romInfo.SubMapperID == 1) {
 				//"232: 1 Aladdin Deck Enhancer"
 				//"Aladdin Deck Enhancer variation.Swap the bits of the outer bank number."
 				//But this seems to match the Pegasus 4-in-1 behavior?  Wiki wrong?

Core/BF909x.h

@@ -13,7 +13,7 @@ class BF909x : public BaseMapper
 
 	void InitMapper() override 
 	{
-		if(_subMapperID == 1) {
+		if(_romInfo.SubMapperID == 1) {
 			_bf9097Mode = true;
 		}
 

Core/BandaiFcg.h

@@ -22,7 +22,7 @@ class BandaiFcg : public BaseMapper
 	uint16_t RegisterStartAddress() override { return 0x6000; }
 	uint16_t RegisterEndAddress() override { return 0xFFFF; }
 	bool AllowRegisterRead() override { return true; }
-	ConsoleFeatures GetAvailableFeatures() override { return _mapperID == 157 ? (ConsoleFeatures)((int)ConsoleFeatures::BarcodeReader | (int)ConsoleFeatures::DatachBarcodeReader) : ConsoleFeatures::None; }
+	ConsoleFeatures GetAvailableFeatures() override { return _romInfo.MapperID == 157 ? (ConsoleFeatures)((int)ConsoleFeatures::BarcodeReader | (int)ConsoleFeatures::DatachBarcodeReader) : ConsoleFeatures::None; }
 
 	void InitMapper() override
 	{
@@ -33,7 +33,7 @@ class BandaiFcg : public BaseMapper
 		_prgPage = 0;
 		_prgBankSelect = 0;
 
-		if(_mapperID == 157) {
+		if(_romInfo.MapperID == 157) {
 			//"Mapper 157 is used for Datach Joint ROM System boards"
 			_barcodeReader.reset(new DatachBarcodeReader(_console));
 			_mapperControlDevice = _barcodeReader;
@@ -42,7 +42,7 @@ class BandaiFcg : public BaseMapper
 		//Only allow reads from 0x6000 to 0x7FFF
 		RemoveRegisterRange(0x8000, 0xFFFF, MemoryOperation::Read);
 
-		if(_mapperID != 16 || GetPRGPageCount() >= 0x20) {
+		if(_romInfo.MapperID != 16 || GetPRGPageCount() >= 0x20) {
 			//"For iNES Mapper 153 (with SRAM), the writeable ports must only be mirrored across $8000-$FFFF."
 			//"Mappers 157 and 159 do not need to support the FCG-1 and -2 and so should only mirror the ports across $8000-$FFFF."
 
@@ -86,14 +86,14 @@ class BandaiFcg : public BaseMapper
 		switch(addr & 0x000F) {
 			case 0x00: case 0x01: case 0x02: case 0x03: case 0x04: case 0x05: case 0x06: case 0x07:
 				_chrRegs[addr & 0x07] = value;
-				if(_mapperID == 153 || GetPRGPageCount() >= 0x20) {
+				if(_romInfo.MapperID == 153 || GetPRGPageCount() >= 0x20) {
 					_prgBankSelect = 0;
 					for(int i = 0; i < 8; i++) {
 						_prgBankSelect |= (_chrRegs[i] & 0x01) << 4;
 					}
 					SelectPRGPage(0, _prgPage | _prgBankSelect);
 					SelectPRGPage(1, 0x0F | _prgBankSelect);
-				} else if(!HasChrRam() && _mapperID != 157) {
+				} else if(!HasChrRam() && _romInfo.MapperID != 157) {
 					SelectCHRPage(addr & 0x07, value);
 				}
 				break;

Core/BaseMapper.cpp

@@ -347,7 +347,7 @@ uint8_t BaseMapper::GetPowerOnByte(uint8_t defaultValue)
 
 bool BaseMapper::HasBattery()
 {
-	return _hasBattery;
+	return _romInfo.HasBattery;
 }
 
 void BaseMapper::LoadBattery()
@@ -384,7 +384,7 @@ uint32_t BaseMapper::GetCHRPageCount()
 
 string BaseMapper::GetBatteryFilename()
 {
-	return FolderUtilities::CombinePath(FolderUtilities::GetSaveFolder(), FolderUtilities::GetFilename(_romName, false) + ".sav");
+	return FolderUtilities::CombinePath(FolderUtilities::GetSaveFolder(), FolderUtilities::GetFilename(_romInfo.RomName, false) + ".sav");
 }
 
 void BaseMapper::RestoreOriginalPrgRam()
@@ -493,17 +493,10 @@ void BaseMapper::StreamState(bool saving)
 
 void BaseMapper::Initialize(RomData &romData)
 {
-	_mapperID = romData.MapperID;
-	_subMapperID = romData.SubMapperID;
+	_romInfo = romData.Info;
 
-	_databaseInfo = romData.DatabaseInfo;
-
-	_romName = romData.RomName;
-	_romFilename = romData.Filename;
 	_batteryFilename = GetBatteryFilename();
 
-	_hasBattery = romData.HasBattery;
-
 	if(romData.SaveRamSize == -1 || ForceSaveRamSize()) {
 		_saveRamSize = GetSaveRamSize();
 	} else {
@@ -522,10 +515,7 @@ void BaseMapper::Initialize(RomData &romData)
 	memset(_isWriteRegisterAddr, 0, sizeof(_isWriteRegisterAddr));
 	AddRegisterRange(RegisterStartAddress(), RegisterEndAddress(), MemoryOperation::Any);
 
-	_nesHeader = romData.NesHeader;
-	_romFormat = romData.Format;
-
-	_mirroringType = romData.Mirroring;
+	_mirroringType = romData.Info.Mirroring;
 
 	_prgSize = (uint32_t)romData.PrgRom.size();
 	_chrRomSize = (uint32_t)romData.ChrRom.size();
@@ -541,13 +531,7 @@ void BaseMapper::Initialize(RomData &romData)
 
 	_hasChrBattery = romData.SaveChrRamSize > 0 || ForceChrBattery();
 
-	_gameSystem = romData.System;
-	_hashInfo.Crc32Hash = romData.Crc32;
-	_hashInfo.PrgCrc32Hash = romData.PrgCrc32;
-	_hashInfo.PrgChrCrc32Hash = romData.PrgChrCrc32;
-	_hashInfo.Sha1Hash = romData.Sha1;
-	_hashInfo.PrgChrMd5Hash = romData.PrgChrMd5;
-	switch(romData.BusConflicts) {
+	switch(romData.Info.BusConflicts) {
 		case BusConflictType::Default: _hasBusConflicts = HasBusConflicts(); break;
 		case BusConflictType::Yes: _hasBusConflicts = true; break;
 		case BusConflictType::No: _hasBusConflicts = false; break;
@@ -590,7 +574,7 @@ void BaseMapper::Initialize(RomData &romData)
 	//Load battery data if present
 	LoadBattery();
 
-	if(romData.HasTrainer) {
+	if(romData.Info.HasTrainer) {
 		if(_workRamSize >= 0x2000) {
 			memcpy(_workRam + 0x1000, romData.TrainerData.data(), 512);
 		} else if(_saveRamSize >= 0x2000) {
@@ -604,6 +588,8 @@ void BaseMapper::Initialize(RomData &romData)
 	InitMapper(romData);
 
 	ApplyCheats();
+
+	_romInfo.HasChrRam = HasChrRam();
 }
 
 BaseMapper::~BaseMapper()
@@ -643,7 +629,7 @@ void BaseMapper::ApplyCheats()
 
 void BaseMapper::GetMemoryRanges(MemoryRanges &ranges)
 {
-	if(_gameSystem == GameSystem::VsUniSystem || _gameSystem == GameSystem::VsDualSystem) {
+	if(_romInfo.System == GameSystem::VsSystem) {
 		ranges.AddHandler(MemoryOperation::Read, 0x6000, 0xFFFF);
 		ranges.AddHandler(MemoryOperation::Write, 0x6000, 0xFFFF);
 	} else {
@@ -730,17 +716,9 @@ shared_ptr<BaseControlDevice> BaseMapper::GetMapperControlDevice()
 	return _mapperControlDevice;
 }
 
-MapperInfo BaseMapper::GetMapperInfo()
+RomInfo BaseMapper::GetRomInfo()
 {
-	return {
-		_romName,
-		_romFormat,
-		_gameSystem,
-		_mapperID,
-		_subMapperID,
-		_hashInfo,
-		HasChrRam()
-	};
+	return _romInfo;
 }
 
 MirroringType BaseMapper::GetMirroringType()
@@ -859,7 +837,7 @@ void BaseMapper::WriteVRAM(uint16_t addr, uint8_t value)
 
 bool BaseMapper::IsNes20()
 {
-	return _nesHeader.GetRomHeaderVersion() == RomHeaderVersion::Nes2_0;
+	return _romInfo.NesHeader.GetRomHeaderVersion() == RomHeaderVersion::Nes2_0;
 }
 
 //Debugger Helper Functions
@@ -1131,11 +1109,6 @@ CartridgeState BaseMapper::GetState()
 	return state;
 }
 
-NESHeader BaseMapper::GetNesHeader()
-{
-	return _nesHeader;
-}
-
 void BaseMapper::GetRomFileData(vector<uint8_t> &out, bool asIpsFile, uint8_t* header)
 {
 	if(header) {
@@ -1147,7 +1120,7 @@ void BaseMapper::GetRomFileData(vector<uint8_t> &out, bool asIpsFile, uint8_t* h
 		out.insert(out.end(), originalFile.begin()+sizeof(NESHeader), originalFile.end());
 	} else {
 		vector<uint8_t> newFile;
-		newFile.insert(newFile.end(), (uint8_t*)&_nesHeader, ((uint8_t*)&_nesHeader) + sizeof(NESHeader));
+		newFile.insert(newFile.end(), (uint8_t*)&_romInfo.NesHeader, ((uint8_t*)&_romInfo.NesHeader) + sizeof(NESHeader));
 		newFile.insert(newFile.end(), _prgRom, _prgRom + _prgSize);
 		if(HasChrRom()) {
 			newFile.insert(newFile.end(), _chrRom, _chrRom + _chrRomSize);

Core/BaseMapper.h

@@ -31,10 +31,6 @@ class BaseMapper : public IMemoryHandler, public Snapshotable, public INotificat
 	bool _onlyChrRam = false;
 	bool _hasBusConflicts = false;
 
-	string _romFilename;
-	string _romName;
-	RomFormat _romFormat;
-
 	bool _allowRegisterRead = false;
 	bool _isReadRegisterAddr[0x10000];
 	bool _isWriteRegisterAddr[0x10000];
@@ -47,22 +43,15 @@ class BaseMapper : public IMemoryHandler, public Snapshotable, public INotificat
 	uint32_t _prgPageNumbers[64];
 	uint32_t _chrPageNumbers[64];
 
-	HashInfo _hashInfo;
-
 	vector<uint8_t> _originalPrgRom;
 	vector<uint8_t> _originalChrRom;
 
 protected:
+	RomInfo _romInfo;
+
 	shared_ptr<BaseControlDevice> _mapperControlDevice;
 	shared_ptr<Console> _console;
 
-	NESHeader _nesHeader;
-	GameInfo _databaseInfo;
-
-	uint16_t _mapperID;
-	uint8_t _subMapperID;
-	GameSystem _gameSystem;
-
 	uint8_t* _prgRom = nullptr;
 	uint8_t* _chrRom = nullptr;
 	uint8_t* _chrRam = nullptr;
@@ -74,7 +63,6 @@ class BaseMapper : public IMemoryHandler, public Snapshotable, public INotificat
 	uint32_t _saveRamSize = 0;
 	uint32_t _workRamSize = 0;
 	uint8_t* _workRam = nullptr;
-	bool _hasBattery = false;
 	bool _hasChrBattery = false;
 	int16_t _vramOpenBusValue = -1;
 
@@ -175,7 +163,7 @@ class BaseMapper : public IMemoryHandler, public Snapshotable, public INotificat
 	virtual void SetDefaultNametables(uint8_t* nametableA, uint8_t* nametableB);
 
 	shared_ptr<BaseControlDevice> GetMapperControlDevice();
-	MapperInfo GetMapperInfo();
+	RomInfo GetRomInfo();
 
 	__forceinline uint8_t ReadRAM(uint16_t addr) override;
 	uint8_t DebugReadRAM(uint16_t addr);
@@ -229,7 +217,6 @@ class BaseMapper : public IMemoryHandler, public Snapshotable, public INotificat
 	bool IsWriteRegister(uint16_t addr);
 	bool IsReadRegister(uint16_t addr);
 
-	NESHeader GetNesHeader();
 	void GetRomFileData(vector<uint8_t> &out, bool asIpsFile, uint8_t* header);
 
 	vector<uint8_t> GetPrgChrCopy();

Core/BizhawkMovie.cpp

@@ -106,16 +106,16 @@ bool BizhawkMovie::InitializeGameData(ZipReader &reader)
 		if(line.compare(0, 4, "SHA1", 4) == 0) {
 			if(line.size() >= 45) {
 				HashInfo hashInfo;
-				hashInfo.Sha1Hash = line.substr(5, 40);
+				hashInfo.Sha1 = line.substr(5, 40);
 				if(_console->LoadMatchingRom("", hashInfo)) {
 					return true;
 				}
 			}
 		} else if(line.compare(0, 3, "MD5", 3) == 0) {
 			if(line.size() >= 36) {
 				HashInfo hashInfo;
-				hashInfo.PrgChrMd5Hash = line.substr(4, 32);
-				std::transform(hashInfo.PrgChrMd5Hash.begin(), hashInfo.PrgChrMd5Hash.end(), hashInfo.PrgChrMd5Hash.begin(), ::toupper);
+				hashInfo.PrgChrMd5 = line.substr(4, 32);
+				std::transform(hashInfo.PrgChrMd5.begin(), hashInfo.PrgChrMd5.end(), hashInfo.PrgChrMd5.begin(), ::toupper);
 				if(_console->LoadMatchingRom("", hashInfo)) {
 					return true;
 				}

Core/CNROM.h

@@ -20,14 +20,14 @@ class CNROM : public BaseMapper
 		_vramOpenBusValue = 0xFF;
 	}
 
-	bool HasBusConflicts() override { return (_mapperID == 3 && _subMapperID == 2) || _mapperID == 185; }
+	bool HasBusConflicts() override { return (_romInfo.MapperID == 3 && _romInfo.SubMapperID == 2) || _romInfo.MapperID == 185; }
 
 	void WriteRegister(uint16_t addr, uint8_t value) override
 	{
 		if(_enableCopyProtection) {
 			//"if C AND $0F is nonzero, and if C does not equal $13: CHR is enabled"
 			//Seicross (mapper 185 version) is assigned to submapper 16 (not a real submapper) to make it work properly
-			if((_subMapperID == 16 && !(value & 0x01)) || (_subMapperID == 0 && (value & 0x0F) != 0 && value != 0x13)) {
+			if((_romInfo.SubMapperID == 16 && !(value & 0x01)) || (_romInfo.SubMapperID == 0 && (value & 0x0F) != 0 && value != 0x13)) {
 				SelectCHRPage(0, 0);
 			} else {
 				RemovePpuMemoryMapping(0x0000, 0x1FFF);

Core/ColorDreams.h

@@ -17,7 +17,7 @@ class ColorDreams : public BaseMapper
 
 		void WriteRegister(uint16_t addr, uint8_t value) override
 		{
-			if(_mapperID == 144) {
+			if(_romInfo.MapperID == 144) {
 				//"This addition means that only the ROM's least significant bit always wins bus conflicts."
 				value |= (ReadRAM(addr) & 0x01);
 			}