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

Replace C-style macros with C++ inlines using reinterpret_cast.

This commit is contained in:
Stephen Anthony 2024-08-06 22:07:50 -02:30
parent 4c53cb9010
commit f397dd024a
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/emucore/CortexM0.cxx
View File

@ -47,11 +47,21 @@
((uInt8*)(data))[(addr)] = value; \ ((uInt8*)(data))[(addr)] = value; \
((uInt8*)(data))[(addr) + 1] = (value) >> 8; ((uInt8*)(data))[(addr) + 1] = (value) >> 8;
#else #else
#define READ32(data, addr) (((uInt32*)(data))[(addr) >> 2]) namespace {
#define READ16(data, addr) (((uInt16*)(data))[(addr) >> 1]) inline uInt32 READ32(const uInt8* data, uInt32 addr) {
return (reinterpret_cast<const uInt32*>(data))[addr >> 2];
}
inline uInt16 READ16(const uInt8* data, uInt16 addr) {
return (reinterpret_cast<const uInt16*>(data))[addr >> 1];
}
#define WRITE32(data, addr, value) ((uInt32*)(data))[(addr) >> 2] = value; inline void WRITE32(uInt8* data, uInt32 addr, uInt32 value) {
#define WRITE16(data, addr, value) ((uInt16*)(data))[(addr) >> 1] = value; (reinterpret_cast<uInt32*>(data))[addr >> 2] = value;
}
inline void WRITE16(uInt8* data, uInt32 addr, uInt16 value) {
(reinterpret_cast<uInt16*>(data))[addr >> 1] = value;
}
} // namespace
#endif #endif
// #define THUMB_DISS // #define THUMB_DISS