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

Merge branch 'master' of https://github.com/stella-emu/stella

This commit is contained in:
thrust26 2024-08-11 19:48:23 +02:00
parent cdb3ef82ce d6fadd04d2
commit a5757a1562
7 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/emucore/CartELF.cxx
View File

@ -173,7 +173,7 @@ namespace {
{ {
if (!props) return SystemType::ntsc; if (!props) return SystemType::ntsc;
string displayFormat = props->get(PropType::Display_Format); const string displayFormat = props->get(PropType::Display_Format);
if(displayFormat == "PAL" || displayFormat == "SECAM") return SystemType::pal; if(displayFormat == "PAL" || displayFormat == "SECAM") return SystemType::pal;
if(displayFormat == "PAL60") return SystemType::pal60; if(displayFormat == "PAL60") return SystemType::pal60;

4
src/emucore/CortexM0.hxx
View File

@ -166,8 +166,8 @@ class CortexM0
bool readOnly{false}; bool readOnly{false};
std::variant< std::variant<
MemoryRegionAccessData, // ::get<0>, directData MemoryRegionAccessData, // ::get<0>, directData
MemoryRegionAccessCode, // ::get<1>, directCode MemoryRegionAccessCode, // ::get<1>, directCode
BusTransactionDelegate*, // ::get<2>, delegate BusTransactionDelegate*, // ::get<2>, delegate
std::monostate std::monostate
> access; > access;

2
src/emucore/elf/ElfFile.hxx
View File

@ -64,7 +64,7 @@ class ElfFile {
ElfFile() = default; ElfFile() = default;
virtual ~ElfFile() = default; virtual ~ElfFile() = default;
virtual const uInt8 *getData() const = 0; virtual const uInt8* getData() const = 0;
virtual size_t getSize() const = 0; virtual size_t getSize() const = 0;
virtual const vector<Section>& getSections() const = 0; virtual const vector<Section>& getSections() const = 0;

4
src/emucore/elf/ElfLinker.cxx
View File

@ -166,7 +166,7 @@ ElfLinker::RelocatedSymbol ElfLinker::findRelocatedSymbol(string_view name) cons
if (!myRelocatedSymbols[i]) if (!myRelocatedSymbols[i])
ElfSymbolResolutionError::raise("symbol could not be relocated"); ElfSymbolResolutionError::raise("symbol could not be relocated");
return myRelocatedSymbols[i].value(); return myRelocatedSymbols[i].value(); // NOLINT: we know the value is valid
} }
ElfSymbolResolutionError::raise("symbol not found"); ElfSymbolResolutionError::raise("symbol not found");
@ -423,7 +423,7 @@ void ElfLinker::copyInitArrays(vector<uInt32>& initArray, const std::unordered_m
void ElfLinker::applyRelocationToSection(const ElfFile::Relocation& relocation, size_t iSection) void ElfLinker::applyRelocationToSection(const ElfFile::Relocation& relocation, size_t iSection)
{ {
const auto& targetSection = myElf.getSections()[iSection]; const auto& targetSection = myElf.getSections()[iSection];
const auto& targetSectionRelocated = myRelocatedSections[iSection].value(); const auto& targetSectionRelocated = myRelocatedSections[iSection].value(); // NOLINT
const auto& symbol = myElf.getSymbols()[relocation.symbol]; const auto& symbol = myElf.getSymbols()[relocation.symbol];
const auto& relocatedSymbol = myRelocatedSymbols[relocation.symbol]; const auto& relocatedSymbol = myRelocatedSymbols[relocation.symbol];

18
src/emucore/elf/ElfParser.cxx
View File

@ -109,7 +109,7 @@ void ElfParser::parse(const uInt8 *elfData, size_t size)
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
const uInt8 *ElfParser::getData() const { return myData; } const uInt8* ElfParser::getData() const { return myData; }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
size_t ElfParser::getSize() const { return mySize; } size_t ElfParser::getSize() const { return mySize; }
@ -142,19 +142,21 @@ uInt8 ElfParser::read8(uInt32 offset) const
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
uInt16 ElfParser::read16(uInt32 offset) const uInt16 ElfParser::read16(uInt32 offset) const
{ {
return myBigEndian ? ((read8(offset) << 8) | read8(offset + 1)) return myBigEndian
: ((read8(offset + 1) << 8) | read8(offset)); ? ((read8(offset) << 8) | read8(offset + 1))
: ((read8(offset + 1) << 8) | read8(offset));
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
uInt32 ElfParser::read32(uInt32 offset) const uInt32 ElfParser::read32(uInt32 offset) const
{ {
return myBigEndian ? ((read8(offset) << 24) | (read8(offset + 1) << 16) | return myBigEndian
(read8(offset + 2) << 8) | read8(offset + 3)) ? ((read8(offset) << 24) | (read8(offset + 1) << 16) |
: ((read8(offset + 3) << 24) | (read8(offset + 2) << 16) | (read8(offset + 2) << 8) | read8(offset + 3))
(read8(offset + 1) << 8) | read8(offset)); : ((read8(offset + 3) << 24) | (read8(offset + 2) << 16) |
(read8(offset + 1) << 8) | read8(offset));
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

2
src/emucore/elf/ElfParser.hxx
View File

@ -48,7 +48,7 @@ class ElfParser : public ElfFile {
void parse(const uInt8 *elfData, size_t size); void parse(const uInt8 *elfData, size_t size);
const uInt8 *getData() const override; const uInt8* getData() const override;
size_t getSize() const override; size_t getSize() const override;
const vector<Section>& getSections() const override; const vector<Section>& getSections() const override;

1
src/emucore/elf/VcsLib.cxx
View File

@ -176,6 +176,7 @@ void VcsLib::vcsLda2(uInt8 value)
.injectROM(value); .injectROM(value);
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
CortexM0::err_t VcsLib::stackOperation(uInt16& value, uInt8& op, uInt8 opcode) CortexM0::err_t VcsLib::stackOperation(uInt16& value, uInt8& op, uInt8 opcode)
{ {
myTransactionQueue myTransactionQueue