mirrors/rpcs3
0
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-08-02 22:30:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #175 from eriksson/nx-fixes

Browse source 
*nix fixes
This commit is contained in:
Alexandro Sánchez Bach 2014-04-08 20:05:55 +02:00
commit ce1b6039ac
4 changed files with 53 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -402,7 +402,7 @@ void libmixer_init()
0xffffffff7c6307b4, 0xffffffff7c6307b4,
0xffffffff7c0803a6, 0xffffffff7c0803a6,
0xffffffff38210070, 0xffffffff38210070,
0xffffffff4e800020, 0xffffffff4e800020
); );
REG_SUB(libmixer, "surmxAAN", cellAANConnect, REG_SUB(libmixer, "surmxAAN", cellAANConnect,
@ -443,7 +443,7 @@ void libmixer_init()
0xffffffffe80100a0, 0xffffffffe80100a0,
0xffffffff38210090, 0xffffffff38210090,
0xffffffff7c0803a6, 0xffffffff7c0803a6,
0xffffffff4e800020, 0xffffffff4e800020
); );
REG_SUB(libmixer, "surmxAAN", cellAANDisconnect, REG_SUB(libmixer, "surmxAAN", cellAANDisconnect,
@ -484,7 +484,7 @@ void libmixer_init()
0xffffffffe80100a0, 0xffffffffe80100a0,
0xffffffff38210090, 0xffffffff38210090,
0xffffffff7c0803a6, 0xffffffff7c0803a6,
0xffffffff4e800020, 0xffffffff4e800020
); );
REG_SUB(libmixer, "surmixer", cellSurMixerCreate, REG_SUB(libmixer, "surmixer", cellSurMixerCreate,
@ -513,7 +513,7 @@ void libmixer_init()
0xffffffffeba10098, 0xffffffffeba10098,
0xffffffffebc100a0, 0xffffffffebc100a0,
0xffffffffebe100a8, 0xffffffffebe100a8,
0xffffffff382100b0, 0xffffffff382100b0
); );
REG_SUB(libmixer, "surmixer", cellSurMixerGetAANHandle, REG_SUB(libmixer, "surmixer", cellSurMixerGetAANHandle,
@ -530,7 +530,7 @@ void libmixer_init()
0xffffffff3c638031, 0xffffffff3c638031,
0xffffffff38630002, 0xffffffff38630002,
0xffffffff7c6307b4, 0xffffffff7c6307b4,
0xffffffff4e800020, 0xffffffff4e800020
); );
REG_SUB(libmixer, "surmixer", cellSurMixerChStripGetAANPortNo, REG_SUB(libmixer, "surmixer", cellSurMixerChStripGetAANPortNo,
@ -545,7 +545,7 @@ void libmixer_init()
0xffffffff2f800000, 0xffffffff2f800000,
0xffffffff4d9e0020, 0xffffffff4d9e0020,
0xffffffff78030020, 0xffffffff78030020,
0xf000000040000000, // b 0xf000000040000000 // b
); );
REG_SUB(libmixer, "surmixer", cellSurMixerSetNotifyCallback, REG_SUB(libmixer, "surmixer", cellSurMixerSetNotifyCallback,
@ -573,7 +573,7 @@ void libmixer_init()
0xffffffff79290020, 0xffffffff79290020,
0xffffffff38810070, 0xffffffff38810070,
0xffffffff2f800000, 0xffffffff2f800000,
0xffffffff7d234b78, 0xffffffff7d234b78
); );
REG_SUB(libmixer, "surmixer", cellSurMixerRemoveNotifyCallback, REG_SUB(libmixer, "surmixer", cellSurMixerRemoveNotifyCallback,
@ -591,7 +591,7 @@ void libmixer_init()
0xffffffff7d2307b4, 0xffffffff7d2307b4,
0xffffffff38210080, 0xffffffff38210080,
0xffffffff7c0803a6, 0xffffffff7c0803a6,
0xffffffff4e800020, 0xffffffff4e800020
); );
REG_SUB(libmixer, "surmixer", cellSurMixerStart, REG_SUB(libmixer, "surmixer", cellSurMixerStart,
@ -614,7 +614,7 @@ void libmixer_init()
0xffffffff7c0803a6, 0xffffffff7c0803a6,
0xffffffffebe10088, 0xffffffffebe10088,
0xffffffff38210090, 0xffffffff38210090,
0xffffffff4e800020, 0xffffffff4e800020
); );
REG_SUB(libmixer, "surmixer", cellSurMixerSetParameter, REG_SUB(libmixer, "surmixer", cellSurMixerSetParameter,
@ -644,7 +644,7 @@ void libmixer_init()
0xffff0000419cffd8, // blt 0xffff0000419cffd8, // blt
0xffffffff2b83002b, 0xffffffff2b83002b,
0xffff000040990008, // ble 0xffff000040990008, // ble
0xffff0000409d0054, // ble 0xffff0000409d0054 // ble
); );
REG_SUB(libmixer, "surmixer", cellSurMixerFinalize, REG_SUB(libmixer, "surmixer", cellSurMixerFinalize,
@ -670,7 +670,7 @@ void libmixer_init()
0xfffffffff8410028, 0xfffffffff8410028,
0xffffffff7c0903a6, 0xffffffff7c0903a6,
0xffffffff804a0004, 0xffffffff804a0004,
0xffffffff4e800421, 0xffffffff4e800421
); );
REG_SUB(libmixer, "surmixer", cellSurMixerSurBusAddData, REG_SUB(libmixer, "surmixer", cellSurMixerSurBusAddData,
@ -699,7 +699,7 @@ void libmixer_init()
0xffffffff7d034378, 0xffffffff7d034378,
0xffffffff79660020, 0xffffffff79660020,
0xffffffff78e70020, 0xffffffff78e70020,
0xffff0000419cffcc, // blt 0xffff0000419cffcc // blt
); );
REG_SUB(libmixer, "surmixer", cellSurMixerChStripSetParameter, REG_SUB(libmixer, "surmixer", cellSurMixerChStripSetParameter,
@ -719,7 +719,7 @@ void libmixer_init()
0xffffffff78c60020, 0xffffffff78c60020,
0xffffffff4d9c0020, 0xffffffff4d9c0020,
0xffffffff79230020, 0xffffffff79230020,
0xf000000048000000, // b 0xf000000048000000 // b
); );
REG_SUB(libmixer, "surmixer", cellSurMixerPause, REG_SUB(libmixer, "surmixer", cellSurMixerPause,
@ -744,7 +744,7 @@ void libmixer_init()
0xffffffff4e800020, 0xffffffff4e800020,
0xffffffff800a001c, 0xffffffff800a001c,
0xffffffff2b030002, 0xffffffff2b030002,
0xffffffff2f800000, 0xffffffff2f800000
); );
REG_SUB(libmixer, "surmixer", cellSurMixerGetCurrentBlockTag, REG_SUB(libmixer, "surmixer", cellSurMixerGetCurrentBlockTag,
@ -758,7 +758,7 @@ void libmixer_init()
0xffffffff39200000, 0xffffffff39200000,
0xfffffffff8030000, 0xfffffffff8030000,
0xffffffff7d2307b4, 0xffffffff7d2307b4,
0xffffffff4e800020, 0xffffffff4e800020
); );
REG_SUB(libmixer, "surmixer", cellSurMixerGetTimestamp, REG_SUB(libmixer, "surmixer", cellSurMixerGetTimestamp,
@ -780,7 +780,7 @@ void libmixer_init()
0xffffffff7c0803a6, 0xffffffff7c0803a6,
0xffffffff4e800020, 0xffffffff4e800020,
0xffffffff806b04d8, 0xffffffff806b04d8,
0xf000000048000001, // bl 0xf000000048000001 // bl
); );
REG_SUB(libmixer, "surmixer", cellSurMixerBeep, REG_SUB(libmixer, "surmixer", cellSurMixerBeep,
@ -794,7 +794,7 @@ void libmixer_init()
0xffffffff78840020, 0xffffffff78840020,
0xffffffff2f800000, 0xffffffff2f800000,
0xffffffff4d9c0020, 0xffffffff4d9c0020,
0xf000000048000000, // b 0xf000000048000000 // b
); );
REG_SUB(libmixer, "surmxSSP", cellSSPlayerCreate, REG_SUB(libmixer, "surmxSSP", cellSSPlayerCreate,
@ -828,7 +828,7 @@ void libmixer_init()
0xffffffff2f9d0000, 0xffffffff2f9d0000,
0xffffffff7ba30020, 0xffffffff7ba30020,
0xffff000041de00c0, // beq- 0xffff000041de00c0, // beq-
0xf000000048000001, // bl 0xf000000048000001 // bl
); );
REG_SUB(libmixer, "surmxSSP", cellSSPlayerRemove, REG_SUB(libmixer, "surmxSSP", cellSSPlayerRemove,
@ -858,7 +858,7 @@ void libmixer_init()
0xfffffffff8410028, 0xfffffffff8410028,
0xffffffff7c0903a6, 0xffffffff7c0903a6,
0xffffffff804b0004, 0xffffffff804b0004,
0xffffffff4e800421, 0xffffffff4e800421
); );
REG_SUB(libmixer, "surmxSSP", cellSSPlayerSetWave, REG_SUB(libmixer, "surmxSSP", cellSSPlayerSetWave,
@ -871,7 +871,7 @@ void libmixer_init()
0xffffffff78030020, 0xffffffff78030020,
0xf000000048000000, // b 0xf000000048000000, // b
0xffffffff60630003, 0xffffffff60630003,
0xffffffff4e800020, 0xffffffff4e800020
); );
REG_SUB(libmixer, "surmxSSP", cellSSPlayerPlay, REG_SUB(libmixer, "surmxSSP", cellSSPlayerPlay,
@ -890,7 +890,7 @@ void libmixer_init()
0xff00000081620028, // lwz 0xff00000081620028, // lwz
0xfffffffff8010090, 0xfffffffff8010090,
0xffffffff39400000, 0xffffffff39400000,
0xffffffff38630010, 0xffffffff38630010
); );
REG_SUB(libmixer, "surmxSSP", cellSSPlayerStop, REG_SUB(libmixer, "surmxSSP", cellSSPlayerStop,
@ -909,7 +909,7 @@ void libmixer_init()
0xffffffffe8010080, 0xffffffffe8010080,
0xffffffff38210070, 0xffffffff38210070,
0xffffffff7c0803a6, 0xffffffff7c0803a6,
0xffffffff4e800020, 0xffffffff4e800020
); );
REG_SUB(libmixer, "surmxSSP", cellSSPlayerSetParam, REG_SUB(libmixer, "surmxSSP", cellSSPlayerSetParam,
@ -928,7 +928,7 @@ void libmixer_init()
0xffffffff80030068, 0xffffffff80030068,
0xffffffff616b0002, 0xffffffff616b0002,
0xfffffffffbc10080, 0xfffffffffbc10080,
0xffffffff2f800000, 0xffffffff2f800000
); );
REG_SUB(libmixer, "surmxSSP", cellSSPlayerGetState, REG_SUB(libmixer, "surmxSSP", cellSSPlayerGetState,
@ -938,10 +938,10 @@ void libmixer_init()
0xffffffff60630003, 0xffffffff60630003,
0xffffffff4d9e0020, 0xffffffff4d9e0020,
0xffffffff78030020, 0xffffffff78030020,
0xf000000048000000, // b 0xf000000048000000 // b
); );
REG_SUB(libmixer, "surmxUti", cellSurMixerUtilGetLevelFromDB); REG_SUB_EMPTY(libmixer, "surmxUti", cellSurMixerUtilGetLevelFromDB);
REG_SUB(libmixer, "surmxUti", cellSurMixerUtilGetLevelFromDBIndex); REG_SUB_EMPTY(libmixer, "surmxUti", cellSurMixerUtilGetLevelFromDBIndex);
REG_SUB(libmixer, "surmxUti", cellSurMixerUtilNoteToRatio); REG_SUB_EMPTY(libmixer, "surmxUti", cellSurMixerUtilNoteToRatio);
} }

34
rpcs3/Emu/SysCalls/Modules/libsynth2.cpp
View file

@ -112,7 +112,7 @@ u16 cellSoundSynth2Pitch2Note(u16 center_note, u16 center_fine, u16 pitch)
void libsynth2_init() void libsynth2_init()
{ {
REG_SUB(libsynth2, "synth2", cellSoundSynth2Init, REG_SUB_EMPTY(libsynth2, "synth2", cellSoundSynth2Init,
/* /*
0xffffffff7d800026, 0xffffffff7d800026,
0xfffffffff821ff41, 0xfffffffff821ff41,
@ -140,20 +140,20 @@ void libsynth2_init()
0xffffffff3ba00000, 0xffffffff3ba00000,
*/ */
); );
REG_SUB(libsynth2, "synth2", cellSoundSynth2Exit); REG_SUB_EMPTY(libsynth2, "synth2", cellSoundSynth2Exit);
REG_SUB(libsynth2, "synth2", cellSoundSynth2Config); REG_SUB_EMPTY(libsynth2, "synth2", cellSoundSynth2Config);
REG_SUB(libsynth2, "synth2", cellSoundSynth2GetAddr); REG_SUB_EMPTY(libsynth2, "synth2", cellSoundSynth2GetAddr);
REG_SUB(libsynth2, "synth2", cellSoundSynth2GetParam); REG_SUB_EMPTY(libsynth2, "synth2", cellSoundSynth2GetParam);
REG_SUB(libsynth2, "synth2", cellSoundSynth2GetSwitch); REG_SUB_EMPTY(libsynth2, "synth2", cellSoundSynth2GetSwitch);
REG_SUB(libsynth2, "synth2", cellSoundSynth2SetAddr); REG_SUB_EMPTY(libsynth2, "synth2", cellSoundSynth2SetAddr);
REG_SUB(libsynth2, "synth2", cellSoundSynth2SetParam); REG_SUB_EMPTY(libsynth2, "synth2", cellSoundSynth2SetParam);
REG_SUB(libsynth2, "synth2", cellSoundSynth2SetSwitch); REG_SUB_EMPTY(libsynth2, "synth2", cellSoundSynth2SetSwitch);
REG_SUB(libsynth2, "synth2", cellSoundSynth2SetEffectMode); REG_SUB_EMPTY(libsynth2, "synth2", cellSoundSynth2SetEffectMode);
REG_SUB(libsynth2, "synth2", cellSoundSynth2SetEffectAttr); REG_SUB_EMPTY(libsynth2, "synth2", cellSoundSynth2SetEffectAttr);
REG_SUB(libsynth2, "synth2", cellSoundSynth2Note2Pitch); REG_SUB_EMPTY(libsynth2, "synth2", cellSoundSynth2Note2Pitch);
REG_SUB(libsynth2, "synth2", cellSoundSynth2Pitch2Note); REG_SUB_EMPTY(libsynth2, "synth2", cellSoundSynth2Pitch2Note);
REG_SUB(libsynth2, "synth2", cellSoundSynth2VoiceTrans); REG_SUB_EMPTY(libsynth2, "synth2", cellSoundSynth2VoiceTrans);
REG_SUB(libsynth2, "synth2", cellSoundSynth2VoiceTransStatus); REG_SUB_EMPTY(libsynth2, "synth2", cellSoundSynth2VoiceTransStatus);
REG_SUB(libsynth2, "synth2", cellSoundSynth2SetCoreAttr); REG_SUB_EMPTY(libsynth2, "synth2", cellSoundSynth2SetCoreAttr);
REG_SUB(libsynth2, "synth2", cellSoundSynth2Generate); REG_SUB_EMPTY(libsynth2, "synth2", cellSoundSynth2Generate);
} }

8
rpcs3/Emu/SysCalls/SysCalls.h
View file

@ -470,8 +470,12 @@ void StaticAnalyse(void* ptr, u32 size, u32 base);
void StaticExecute(u32 code); void StaticExecute(u32 code);
void StaticFinalize(); void StaticFinalize();
#define REG_SUB(module, group, name,...) \ #define REG_SUB(module, group, name, args...) \
static const u64 name ## _table[] = {__VA_ARGS__ ## 0}; \ static const u64 name ## _table[] = {args, 0}; \
module.AddFuncSub(group, name ## _table, #name, name)
#define REG_SUB_EMPTY(module, group, name,...) \
static const u64 name ## _table[] = {0}; \
module.AddFuncSub(group, name ## _table, #name, name) module.AddFuncSub(group, name ## _table, #name, name)
extern u64 get_system_time(); extern u64 get_system_time();

6
rpcs3/Gui/PADManager.cpp
View file

@ -554,10 +554,10 @@ void PADManager::RunTimer(const u32 seconds, const u32 id)
{ {
m_seconds = seconds; m_seconds = seconds;
clock_t t1, t2; clock_t t1, t2;
t1 = t2 = clock() / CLK_TCK; t1 = t2 = clock() / CLOCKS_PER_SEC;
while (m_seconds) while (m_seconds)
{ {
if (t1 / CLK_TCK + 1 <= (t2 = clock()) / CLK_TCK) if (t1 / CLOCKS_PER_SEC + 1 <= (t2 = clock()) / CLOCKS_PER_SEC)
{ {
UpdateTimerLabel(id); UpdateTimerLabel(id);
m_seconds--; m_seconds--;
@ -570,4 +570,4 @@ void PADManager::RunTimer(const u32 seconds, const u32 id)
break; break;
} }
} }
} }