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

Fix C-style rand(); use our Random class instead.

This commit is contained in:
Stephen Anthony 2024-08-06 21:42:29 -02:30
parent 6614a2228a
commit 4c53cb9010
4 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/emucore/elf/BusTransactionQueue.cxx
View File

@ -47,9 +47,10 @@ void BusTransactionQueue::Transaction::setBusState(bool& bs_drive, uInt8& bs_val
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
BusTransactionQueue::BusTransactionQueue(size_t capacity) : myQueueCapacity(capacity) BusTransactionQueue::BusTransactionQueue(size_t capacity)
: myQueueCapacity{capacity},
myQueue{make_unique<Transaction[]>(myQueueCapacity)}
{ {
myQueue = make_unique<Transaction[]>(myQueueCapacity);
reset(); reset();
} }

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

@ -49,9 +49,11 @@ namespace {
} // namespace } // namespace
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
ElfLinker::ElfLinker(uInt32 textBase, uInt32 dataBase, uInt32 rodataBase, const ElfFile& elf) ElfLinker::ElfLinker(uInt32 textBase, uInt32 dataBase, uInt32 rodataBase,
: myTextBase(textBase), myDataBase(dataBase), myRodataBase(rodataBase), myElf(elf) const ElfFile& elf)
{} : myTextBase{textBase}, myDataBase{dataBase}, myRodataBase{rodataBase}, myElf{elf}
{
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
ElfLinker& ElfLinker::setUndefinedSymbolDefault(uInt32 defaultValue) ElfLinker& ElfLinker::setUndefinedSymbolDefault(uInt32 defaultValue)
@ -162,13 +164,15 @@ ElfLinker::RelocatedSymbol ElfLinker::findRelocatedSymbol(string_view name) cons
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
const vector<optional<ElfLinker::RelocatedSection>>& ElfLinker::getRelocatedSections() const const vector<optional<ElfLinker::RelocatedSection>>&
ElfLinker::getRelocatedSections() const
{ {
return myRelocatedSections; return myRelocatedSections;
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
const vector<optional<ElfLinker::RelocatedSymbol>>& ElfLinker::getRelocatedSymbols() const const vector<optional<ElfLinker::RelocatedSymbol>>&
ElfLinker::getRelocatedSymbols() const
{ {
return myRelocatedSymbols; return myRelocatedSymbols;
} }

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

@ -106,7 +106,8 @@ namespace {
} // namespace } // namespace
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
VcsLib::VcsLib(BusTransactionQueue& transactionQueue) : myTransactionQueue(transactionQueue) VcsLib::VcsLib(BusTransactionQueue& transactionQueue)
: myTransactionQueue{transactionQueue}
{ {
} }
@ -366,7 +367,7 @@ CortexM0::err_t VcsLib::fetch16(uInt32 address, uInt16& value, uInt8& op, Cortex
} }
case ADDR_RANDINT: case ADDR_RANDINT:
cortex.setRegister(0, rand()); // FIXME: use C++11 random library instead cortex.setRegister(0, myRand.next());
return returnFromStub(value, op); return returnFromStub(value, op);
case ADDR_VCS_TXS2: case ADDR_VCS_TXS2:

3
src/emucore/elf/VcsLib.hxx
View File

@ -19,6 +19,7 @@
#define VCSLIB_H #define VCSLIB_H
#include "bspf.hxx" #include "bspf.hxx"
#include "Random.hxx"
#include "CortexM0.hxx" #include "CortexM0.hxx"
#include "BusTransactionQueue.hxx" #include "BusTransactionQueue.hxx"
@ -71,6 +72,8 @@ class VcsLib: public CortexM0::BusTransactionDelegate {
uInt16 myCurrentAddress{0}; uInt16 myCurrentAddress{0};
uInt8 myCurrentValue{0}; uInt8 myCurrentValue{0};
Random myRand;
private: private:
VcsLib(const VcsLib&) = delete; VcsLib(const VcsLib&) = delete;
VcsLib(VcsLib&&) = delete; VcsLib(VcsLib&&) = delete;