archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-06 15:01:28 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

mem16_t replaced

Browse source 
I think it's not bad to use pointer type when possible, because it's
often originally pointer, not reference.
This commit is contained in:
Nekotekina 2014-09-01 01:55:38 +04:00
parent 49b295e332
commit 0d94c78e63
3 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
rpcs3/Emu/Memory/Memory.h
View file

@ -768,7 +768,6 @@ public:
} }
}; };
typedef mem_t<u16, u32> mem16_t;
typedef mem_t<u32, u32> mem32_t; typedef mem_t<u32, u32> mem32_t;
typedef mem_t<u64, u32> mem64_t; typedef mem_t<u64, u32> mem64_t;

8
rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp
View file

@ -325,10 +325,10 @@ s64 cellSpursEventFlagDetachLv2EventQueue(mem_ptr_t<CellSpursEventFlag> eventFla
#endif #endif
} }
s64 cellSpursEventFlagWait(mem_ptr_t<CellSpursEventFlag> eventFlag, mem16_t mask, u32 mode) s64 cellSpursEventFlagWait(mem_ptr_t<CellSpursEventFlag> eventFlag, vm::ptr<be_t<u16>> mask, u32 mode)
{ {
#ifdef PRX_DEBUG #ifdef PRX_DEBUG
cellSpurs->Warning("cellSpursEventFlagWait(eventFlag_addr=0x%x, mask_addr=0x%x, mode=%d)", eventFlag.GetAddr(), mask.GetAddr(), mode); cellSpurs->Warning("cellSpursEventFlagWait(eventFlag_addr=0x%x, mask_addr=0x%x, mode=%d)", eventFlag.GetAddr(), mask.addr(), mode);
return GetCurrentPPUThread().FastCall2(libsre + 0x15E68, libsre_rtoc); return GetCurrentPPUThread().FastCall2(libsre + 0x15E68, libsre_rtoc);
#else #else
UNIMPLEMENTED_FUNC(cellSpurs); UNIMPLEMENTED_FUNC(cellSpurs);
@ -358,10 +358,10 @@ s64 cellSpursEventFlagSet(mem_ptr_t<CellSpursEventFlag> eventFlag, u16 bits)
#endif #endif
} }
s64 cellSpursEventFlagTryWait(mem_ptr_t<CellSpursEventFlag> eventFlag, mem16_t mask, u32 mode) s64 cellSpursEventFlagTryWait(mem_ptr_t<CellSpursEventFlag> eventFlag, vm::ptr<be_t<u16>> mask, u32 mode)
{ {
#ifdef PRX_DEBUG #ifdef PRX_DEBUG
cellSpurs->Warning("cellSpursEventFlagTryWait(eventFlag_addr=0x%x, mask_addr=0x%x, mode=0x%x)", eventFlag.GetAddr(), mask.GetAddr(), mode); cellSpurs->Warning("cellSpursEventFlagTryWait(eventFlag_addr=0x%x, mask_addr=0x%x, mode=0x%x)", eventFlag.GetAddr(), mask.addr(), mode);
return GetCurrentPPUThread().FastCall2(libsre + 0x15E70, libsre_rtoc); return GetCurrentPPUThread().FastCall2(libsre + 0x15E70, libsre_rtoc);
#else #else
UNIMPLEMENTED_FUNC(cellSpurs); UNIMPLEMENTED_FUNC(cellSpurs);

10
rpcs3/Emu/SysCalls/Modules/libmixer.cpp
View file

@ -361,6 +361,7 @@ int cellSurMixerCreate(const mem_ptr_t<CellSurMixerConfig> config)
for (auto& p : ssp) if (p.m_active && p.m_created) for (auto& p : ssp) if (p.m_active && p.m_created)
{ {
auto v = vm::ptr<s16>::make(p.m_addr); // 16-bit LE audio data
float left = 0.0f; float left = 0.0f;
float right = 0.0f; float right = 0.0f;
float speed = fabs(p.m_speed); float speed = fabs(p.m_speed);
@ -398,15 +399,12 @@ int cellSurMixerCreate(const mem_ptr_t<CellSurMixerConfig> config)
p.m_position += (u32)pos_inc; p.m_position += (u32)pos_inc;
if (p.m_channels == 1) // get mono data if (p.m_channels == 1) // get mono data
{ {
mem16_t v(p.m_addr + pos * sizeof(u16)); left = right = (float)v[pos] / 0x8000 * p.m_level;
left = right = (float)(s16)re16(v.GetValue()) / 0x8000 * p.m_level;
} }
else if (p.m_channels == 2) // get stereo data else if (p.m_channels == 2) // get stereo data
{ {
mem16_t v1(p.m_addr + (pos * 2 + 0) * sizeof(u16)); left = (float)v[pos * 2 + 0] / 0x8000 * p.m_level;
mem16_t v2(p.m_addr + (pos * 2 + 1) * sizeof(u16)); right = (float)v[pos * 2 + 1] / 0x8000 * p.m_level;
left = (float)(s16)re16(v1.GetValue()) / 0x8000 * p.m_level;
right = (float)(s16)re16(v2.GetValue()) / 0x8000 * p.m_level;
} }
if (p.m_connected) // mix if (p.m_connected) // mix
{ {