Merge pull request #398 from AppleWin/master

Debugger: support slot 0 LC, eg. for 'm1 s0/lc1/d000' etc

Author: audetto

source/Debugger/Debugger_Display.cpp

@@ -2167,7 +2167,7 @@ static BYTE ReadByteFromMemoryWithPrefix(const WORD iAddress, AddressPrefix_t& a
 			else
 				nData = ReadByteFromMemory(iAddress);
 		}
-		else // Saturn
+		else // Saturn (or slot 0 LC)
 		{
 			if (iAddress < 0xD000)
 			{
@@ -2184,7 +2184,7 @@ static BYTE ReadByteFromMemoryWithPrefix(const WORD iAddress, AddressPrefix_t& a
 				if (addrPrefix.nLangCard == 1 && iAddress >= 0xD000 && iAddress <= 0xDFFF)
 					physicalAddrOffset = iAddress - 0x1000;
 
-				nData = GetCardMgr().GetLanguageCardMgr().ReadByteFromSaturn(addrPrefix.nSlot, nBank, physicalAddrOffset);
+				nData = GetCardMgr().GetLanguageCardMgr().ReadByte(addrPrefix.nSlot, nBank, physicalAddrOffset);
 			}
 		}
 	}

source/LanguageCard.cpp

@@ -199,6 +199,19 @@ bool LanguageCardUnit::IsOpcodeRMWabs(WORD addr)
 	return false;
 }
 
+uint8_t LanguageCardUnit::ReadByte(uint16_t phyAddr)
+{
+	if (phyAddr < 0xC000)
+		return 0;
+
+	// LC1-4K:      physical addr [$C000-CFFF] - $C000 -> [$0000-0FFF]
+	// LC2-4K & 8K: physical addr [$D000-FFFF] - $C000 -> [$1000-3FFF]
+	if (QueryType() == CT_LanguageCardIIe)
+		return *MemGetMainPtrWithLC(phyAddr);
+	else
+		return m_pMemory[phyAddr - 0xC000];
+}
+
 //-------------------------------------
 
 LanguageCardSlot0 * LanguageCardSlot0::create(UINT slot)
@@ -710,19 +723,25 @@ bool LanguageCardManager::SetLanguageCard(SS_CARDTYPE type)
 	return true;
 }
 
-uint8_t LanguageCardManager::ReadByteFromSaturn(uint8_t slot, uint8_t bank, uint16_t phyAddr)
+uint8_t LanguageCardManager::ReadByte(uint8_t slot, uint8_t bank, uint16_t phyAddr)
 {
 	if (slot > SLOT7)
 	{
 		_ASSERT(0);
 		return 0;
 	}
 
-	if (GetCardMgr().QuerySlot(slot) != CT_Saturn128K)
+	if (GetCardMgr().QuerySlot(slot) == CT_LanguageCard || GetCardMgr().QuerySlot(slot) == CT_LanguageCardIIe)
 	{
-		_ASSERT(0);
-		return 0;
+		_ASSERT(slot == SLOT0);
+		_ASSERT(bank == 0);
+		return dynamic_cast<LanguageCardUnit&>(GetCardMgr().GetRef(slot)).ReadByte(phyAddr);
+	}
+	else if (GetCardMgr().QuerySlot(slot) == CT_Saturn128K)
+	{
+		return dynamic_cast<Saturn128K&>(GetCardMgr().GetRef(slot)).ReadByteFromBank(bank, phyAddr);
 	}
 
-	return dynamic_cast<Saturn128K&>(GetCardMgr().GetRef(slot)).ReadByteFromBank(bank, phyAddr);
+	_ASSERT(0);
+	return 0;
 }

source/LanguageCard.h

@@ -31,6 +31,7 @@ class LanguageCardUnit : public Card
 	void SetLCMemMode(UINT memMode) { m_memMode = memMode; }
 	SS_CARDTYPE GetMemoryType(void) { return QueryType(); }
 	bool IsOpcodeRMWabs(WORD addr);
+	uint8_t ReadByte(uint16_t phyAddr);
 
 	static BYTE __stdcall IO(WORD PC, WORD uAddr, BYTE bWrite, BYTE uValue, ULONG nExecutedCycles);
 
@@ -141,7 +142,7 @@ class LanguageCardManager
 	void SetMemMode(const uint8_t slot);
 	void SetMemModeFromSnapshot(void);
 
-	uint8_t ReadByteFromSaturn(uint8_t slot, uint8_t bank, uint16_t phyAddr);
+	uint8_t ReadByte(uint8_t slot, uint8_t bank, uint16_t phyAddr);
 
 private:
 	LanguageCardUnit* m_pLanguageCard;