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

Convert more defines to static constexpr, take 2.

This commit is contained in:
Stephen Anthony 2022-12-01 19:13:44 -03:30
parent 61d6d89a21
commit e4d8072503
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/emucore/Thumbulator.cxx
View File

@ -274,7 +274,7 @@ void Thumbulator::dump_counters() const
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void Thumbulator::dump_regs() void Thumbulator::dump_regs()
{ {
for (int cnt = 0; cnt <= 12; cnt++) for(int cnt = 0; cnt <= 12; ++cnt)
{ {
statusMsg << "R" << std::dec << std::setfill(' ') << std::setw(2) << std::left << cnt statusMsg << "R" << std::dec << std::setfill(' ') << std::setw(2) << std::left << cnt
<< "= " << Base::HEX8 << reg_norm[cnt]; << "= " << Base::HEX8 << reg_norm[cnt];

25
src/emucore/Thumbulator.hxx
View File

@ -34,17 +34,6 @@ class Cartridge;
#define UNSAFE_OPTIMIZATIONS #define UNSAFE_OPTIMIZATIONS
#endif #endif
#define ROMADDMASK 0x7FFFF
#define RAMADDMASK 0x7FFF
#define ROMSIZE (ROMADDMASK+1) // 512KB
#define RAMSIZE (RAMADDMASK+1) // 32KB
#define CPSR_N (1u<<31)
#define CPSR_Z (1u<<30)
#define CPSR_C (1u<<29)
#define CPSR_V (1u<<28)
#ifdef DEBUGGER_SUPPORT #ifdef DEBUGGER_SUPPORT
#define THUMB_CYCLE_COUNT #define THUMB_CYCLE_COUNT
#define COUNT_OPS #define COUNT_OPS
@ -335,7 +324,19 @@ class Thumbulator
ConfigureFor configuration; ConfigureFor configuration;
Cartridge* myCartridge; Cartridge* myCartridge{nullptr};
static constexpr uInt32
ROMADDMASK = 0x7FFFF,
RAMADDMASK = 0x7FFF,
ROMSIZE = ROMADDMASK + 1, // 512KB
RAMSIZE = RAMADDMASK + 1, // 32KB
CPSR_N = 1u << 31,
CPSR_Z = 1u << 30,
CPSR_C = 1u << 29,
CPSR_V = 1u << 28;
private: private:
// Following constructors and assignment operators not supported // Following constructors and assignment operators not supported