Macintosh-Tools
/
dingusppc
mirror of https://github.com/dingusdev/dingusppc.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

platinum: cleanup non-DWORD register reads.

This commit is contained in:
Maxim Poliakovski 2024-03-12 17:29:19 +01:00
parent 2d68b72dbd
commit 54ce23d0a8
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/bitops.h
View File

@ -88,4 +88,9 @@ inline void set_bit(T &val, const int bit_num) {
val |= ((T)1 << bit_num); val |= ((T)1 << bit_num);
} }
static inline uint32_t extract_with_wrap_around(uint32_t val, int pos, int size) {
return (uint32_t)((((uint64_t)val << 32) | val) >> ((8 - (pos & 3) - size) << 3)) &
((1LL << (size << 3)) - 1);
}
#endif // BIT_OPS_H #endif // BIT_OPS_H

11
devices/memctrl/platinum.cpp
View File

@ -101,6 +101,8 @@ int PlatinumCtrl::device_postinit() {
} }
uint32_t PlatinumCtrl::read(uint32_t rgn_start, uint32_t offset, int size) { uint32_t PlatinumCtrl::read(uint32_t rgn_start, uint32_t offset, int size) {
uint32_t value;
if (rgn_start == VRAM_REGION_BASE) { if (rgn_start == VRAM_REGION_BASE) {
if (offset < this->vram_size) { if (offset < this->vram_size) {
// HACK: half bank configurations should return invalid data // HACK: half bank configurations should return invalid data
@ -117,8 +119,6 @@ uint32_t PlatinumCtrl::read(uint32_t rgn_start, uint32_t offset, int size) {
} }
} }
uint32_t value;
switch (offset >> 4) { switch (offset >> 4) {
case PlatinumReg::CPU_ID: case PlatinumReg::CPU_ID:
value = this->cpu_id; value = this->cpu_id;
@ -195,9 +195,10 @@ uint32_t PlatinumCtrl::read(uint32_t rgn_start, uint32_t offset, int size) {
value = 0; value = 0;
} }
uint32_t result = (uint32_t)( (((uint64_t)value << 32) | value) >> ((8 - (offset & 3) - size) << 3)) & ( (1LL << (size << 3)) - 1 ); if (size == 4)
return value;
return result; else
return extract_with_wrap_around(value, offset, size);
} }
void PlatinumCtrl::write(uint32_t rgn_start, uint32_t offset, uint32_t value, int size) void PlatinumCtrl::write(uint32_t rgn_start, uint32_t offset, uint32_t value, int size)