Skip to content

Commit

Permalink
replace stk(#) to psh(#) per team votes
Browse files Browse the repository at this point in the history
  • Loading branch information
RadWolfie committed Sep 25, 2024
1 parent a1b1a5b commit 5b10dbe
Show file tree
Hide file tree
Showing 11 changed files with 855 additions and 855 deletions.
4 changes: 2 additions & 2 deletions include/libParamTypes.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

PARAM_TYPE_32(unk) // Unknown, intended to be used for "not a function" types and for "function" documentation when reverse-engineering efforts could not narrow it down to either the stack or one of the registers.
PARAM_TYPE__0(void) // 0 bits
PARAM_TYPE_64(stk2) // 64 bits (two pushes)
PARAM_TYPE_32(stk) // 32 bits (one push)
PARAM_TYPE_64(psh2) // 64 bits (two pushes)
PARAM_TYPE_32(psh) // 32 bits (one push)
PARAM_TYPE_32(eax) // 32 bits
PARAM_TYPE_16_(ax) // 16 bits
PARAM_TYPE__8_(ah) // 8 bits
Expand Down
282 changes: 141 additions & 141 deletions src/OOVPADatabase/D3D8LTCG_OOVPA.inl

Large diffs are not rendered by default.

432 changes: 216 additions & 216 deletions src/OOVPADatabase/D3D8_OOVPA.inl

Large diffs are not rendered by default.

642 changes: 321 additions & 321 deletions src/OOVPADatabase/DSound_OOVPA.inl

Large diffs are not rendered by default.

92 changes: 46 additions & 46 deletions src/OOVPADatabase/JVS_OOVPA.inl

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/OOVPADatabase/OOVPA.h
Original file line number Diff line number Diff line change
Expand Up @@ -304,8 +304,8 @@ typedef struct _OOVPATable {
#define PARAM1(Param) Param, ""
#define PARAM_TOKEN_unk(Index, Name) _unk##Index
#define PARAM_TOKEN_void(Index, Name) // No argument, do not append to symbol reference.
#define PARAM_TOKEN_stk2(Index, Name) // (Custom) argument is stored in call stack with two pushes, do not append to symbol reference.
#define PARAM_TOKEN_stk(Index, Name) // Argument is stored in call stack with one push, do not append to symbol reference.
#define PARAM_TOKEN_psh2(Index, Name) // (Custom) argument is stored in call stack with two pushes, do not append to symbol reference.
#define PARAM_TOKEN_psh(Index, Name) // Argument is stored in call stack with one push, do not append to symbol reference.
#define PARAM_TOKEN_eax(Index, Name) _eax##Index
#define PARAM_TOKEN__ax(Index, Name) _ax##Index
#define PARAM_TOKEN__ah(Index, Name) _ah##Index
Expand Down
44 changes: 22 additions & 22 deletions src/OOVPADatabase/XActEng_OOVPA.inl
Original file line number Diff line number Diff line change
Expand Up @@ -70,51 +70,51 @@
// ******************************************************************
OOVPATable XACTENG_OOVPA[] = {

REGISTER_OOVPAS(SYM_FUN(XACTEngineCreate, CALL(std), STACK(/*default*/), PARAMS(PARAM(stk, pParams), PARAM(stk, ppEngine))),
REGISTER_OOVPAS(SYM_FUN(XACTEngineCreate, CALL(std), STACK(/*default*/), PARAMS(PARAM(psh, pParams), PARAM(psh, ppEngine))),
SYM_SIG(4627, 4928, 5120)),
REGISTER_OOVPAS(SYM_FUN(XACTEngineDoWork, CALL(std), STACK(/*default*/), PARAMS(PARAM1(void))),
SYM_SIG(4627)),
REGISTER_OOVPAS(SYM_FUN(XACT_CEngine_CreateSoundBank, CALL(std), STACK(/*default*/), PARAMS(PARAM(stk, this), PARAM(stk, pvData), PARAM(stk, dwSize), PARAM(stk, ppSoundBank))),
REGISTER_OOVPAS(SYM_FUN(XACT_CEngine_CreateSoundBank, CALL(std), STACK(/*default*/), PARAMS(PARAM(psh, this), PARAM(psh, pvData), PARAM(psh, dwSize), PARAM(psh, ppSoundBank))),
SYM_SIG(4627, 4928)),
REGISTER_OOVPAS(SYM_FUN(XACT_CEngine_CreateSoundSource, CALL(std), STACK(/*default*/), PARAMS(PARAM(stk, this), PARAM(stk, dwSize), PARAM(stk, ppSoundSource))),
REGISTER_OOVPAS(SYM_FUN(XACT_CEngine_CreateSoundSource, CALL(std), STACK(/*default*/), PARAMS(PARAM(psh, this), PARAM(psh, dwSize), PARAM(psh, ppSoundSource))),
SYM_SIG(4627, 4928)),
REGISTER_OOVPAS(SYM_FUN(XACT_CEngine_DownloadEffectsImage, CALL(std), STACK(/*default*/), PARAMS(PARAM(stk, this), PARAM(stk, pvData), PARAM(stk, dwSize), PARAM(stk, pEffectLoc), PARAM(stk, ppImageDesc))),
REGISTER_OOVPAS(SYM_FUN(XACT_CEngine_DownloadEffectsImage, CALL(std), STACK(/*default*/), PARAMS(PARAM(psh, this), PARAM(psh, pvData), PARAM(psh, dwSize), PARAM(psh, pEffectLoc), PARAM(psh, ppImageDesc))),
SYM_SIG(4627, 5344)),
REGISTER_OOVPAS(SYM_FUN(XACT_CEngine_GetNotification, CALL(std), STACK(/*default*/), PARAMS(PARAM(stk, this), PARAM(stk, pNotificationDesc), PARAM(stk, pNotification))),
REGISTER_OOVPAS(SYM_FUN(XACT_CEngine_GetNotification, CALL(std), STACK(/*default*/), PARAMS(PARAM(psh, this), PARAM(psh, pNotificationDesc), PARAM(psh, pNotification))),
SYM_SIG(4627)),
REGISTER_OOVPAS(SYM_FUN(XACT_CEngine_RegisterNotification, CALL(std), STACK(/*default*/), PARAMS(PARAM(stk, this), PARAM(stk, pNotificationDesc))),
REGISTER_OOVPAS(SYM_FUN(XACT_CEngine_RegisterNotification, CALL(std), STACK(/*default*/), PARAMS(PARAM(psh, this), PARAM(psh, pNotificationDesc))),
SYM_SIG(4627)),
REGISTER_OOVPAS(SYM_FUN(XACT_CEngine_RegisterStreamedWaveBank, CALL(std), STACK(/*default*/), PARAMS(PARAM(stk, this), PARAM(stk, pParams), PARAM(stk, ppWaveBank))),
REGISTER_OOVPAS(SYM_FUN(XACT_CEngine_RegisterStreamedWaveBank, CALL(std), STACK(/*default*/), PARAMS(PARAM(psh, this), PARAM(psh, pParams), PARAM(psh, ppWaveBank))),
SYM_SIG(4627, 4928, 5233)),
REGISTER_OOVPAS(SYM_FUN(XACT_CEngine_RegisterWaveBank, CALL(std), STACK(/*default*/), PARAMS(PARAM(stk, this), PARAM(stk, pvData), PARAM(stk, dwSize), PARAM(stk, ppWaveBank))),
REGISTER_OOVPAS(SYM_FUN(XACT_CEngine_RegisterWaveBank, CALL(std), STACK(/*default*/), PARAMS(PARAM(psh, this), PARAM(psh, pvData), PARAM(psh, dwSize), PARAM(psh, ppWaveBank))),
SYM_SIG(4627, 5120, 5233)),
REGISTER_OOVPAS(SYM_FUN(XACT_CEngine_UnRegisterWaveBank, CALL(std), STACK(/*default*/), PARAMS(PARAM(stk, this), PARAM(stk, pWaveBank))),
REGISTER_OOVPAS(SYM_FUN(XACT_CEngine_UnRegisterWaveBank, CALL(std), STACK(/*default*/), PARAMS(PARAM(psh, this), PARAM(psh, pWaveBank))),
SYM_SIG(4627, 4928, 5120)),
REGISTER_OOVPAS(SYM_FUN(XACT_CSoundBank_GetSoundCueIndexFromFriendlyName, CALL(std), STACK(/*default*/), PARAMS(PARAM(stk, this), PARAM(stk, pFriendlyName), PARAM(stk, pdwSoundCueIndex))),
REGISTER_OOVPAS(SYM_FUN(XACT_CSoundBank_GetSoundCueIndexFromFriendlyName, CALL(std), STACK(/*default*/), PARAMS(PARAM(psh, this), PARAM(psh, pFriendlyName), PARAM(psh, pdwSoundCueIndex))),
SYM_SIG(4627, 4928)),
REGISTER_OOVPAS(SYM_FUN(XACT_CSoundBank_Play, CALL(std), STACK(/*default*/), PARAMS(PARAM(stk, this), PARAM(stk, pPrepareData), PARAM(stk, ppSoundCue))),
REGISTER_OOVPAS(SYM_FUN(XACT_CSoundBank_Play, CALL(std), STACK(/*default*/), PARAMS(PARAM(psh, this), PARAM(psh, pPrepareData), PARAM(psh, ppSoundCue))),
SYM_SIG(5344, 5558)),
REGISTER_OOVPAS(SYM_FUN(IXACTEngine_CreateSoundBank, CALL(std), STACK(/*default*/), PARAMS(PARAM(stk, pThis), PARAM(stk, pvData), PARAM(stk, dwSize), PARAM(stk, ppSoundBank))),
REGISTER_OOVPAS(SYM_FUN(IXACTEngine_CreateSoundBank, CALL(std), STACK(/*default*/), PARAMS(PARAM(psh, pThis), PARAM(psh, pvData), PARAM(psh, dwSize), PARAM(psh, ppSoundBank))),
SYM_SIG(4627, 4928)),
REGISTER_OOVPAS(SYM_FUN(IXACTEngine_CreateSoundSource, CALL(std), STACK(/*default*/), PARAMS(PARAM(stk, pThis), PARAM(stk, dwFlags), PARAM(stk, ppSoundSource))),
REGISTER_OOVPAS(SYM_FUN(IXACTEngine_CreateSoundSource, CALL(std), STACK(/*default*/), PARAMS(PARAM(psh, pThis), PARAM(psh, dwFlags), PARAM(psh, ppSoundSource))),
SYM_SIG(4627, 4928)),
REGISTER_OOVPAS(SYM_FUN(IXACTEngine_DownloadEffectsImage, CALL(std), STACK(/*default*/), PARAMS(PARAM(stk, pThis), PARAM(stk, pvData), PARAM(stk, dwSize), PARAM(stk, pEffectLoc), PARAM(stk, ppImageDesc))),
REGISTER_OOVPAS(SYM_FUN(IXACTEngine_DownloadEffectsImage, CALL(std), STACK(/*default*/), PARAMS(PARAM(psh, pThis), PARAM(psh, pvData), PARAM(psh, dwSize), PARAM(psh, pEffectLoc), PARAM(psh, ppImageDesc))),
SYM_SIG(4627, 5344)),
REGISTER_OOVPAS(SYM_FUN(IXACTEngine_GetNotification, CALL(std), STACK(/*default*/), PARAMS(PARAM(stk, pThis), PARAM(stk, pNotificationDesc), PARAM(stk, pNotification))),
REGISTER_OOVPAS(SYM_FUN(IXACTEngine_GetNotification, CALL(std), STACK(/*default*/), PARAMS(PARAM(psh, pThis), PARAM(psh, pNotificationDesc), PARAM(psh, pNotification))),
SYM_SIG(4627, 4928)),
REGISTER_OOVPAS(SYM_FUN(IXACTEngine_RegisterNotification, CALL(std), STACK(/*default*/), PARAMS(PARAM(stk, pThis), PARAM(stk, pNotificationDesc))),
REGISTER_OOVPAS(SYM_FUN(IXACTEngine_RegisterNotification, CALL(std), STACK(/*default*/), PARAMS(PARAM(psh, pThis), PARAM(psh, pNotificationDesc))),
SYM_SIG(4627, 4928)),
REGISTER_OOVPAS(SYM_FUN(IXACTEngine_RegisterStreamedWaveBank, CALL(std), STACK(/*default*/), PARAMS(PARAM(stk, pThis), PARAM(stk, pParams), PARAM(stk, ppWaveBank))),
REGISTER_OOVPAS(SYM_FUN(IXACTEngine_RegisterStreamedWaveBank, CALL(std), STACK(/*default*/), PARAMS(PARAM(psh, pThis), PARAM(psh, pParams), PARAM(psh, ppWaveBank))),
SYM_SIG(4627, 4928)),
REGISTER_OOVPAS(SYM_FUN(IXACTEngine_RegisterWaveBank, CALL(std), STACK(/*default*/), PARAMS(PARAM(stk, pThis), PARAM(stk, pvData), PARAM(stk, dwSize), PARAM(stk, ppWaveBank))),
REGISTER_OOVPAS(SYM_FUN(IXACTEngine_RegisterWaveBank, CALL(std), STACK(/*default*/), PARAMS(PARAM(psh, pThis), PARAM(psh, pvData), PARAM(psh, dwSize), PARAM(psh, ppWaveBank))),
SYM_SIG(4627, 5120)),
REGISTER_OOVPAS(SYM_FUN(IXACTEngine_UnRegisterWaveBank, CALL(std), STACK(/*default*/), PARAMS(PARAM(stk, pThis), PARAM(stk, pWaveBank))),
REGISTER_OOVPAS(SYM_FUN(IXACTEngine_UnRegisterWaveBank, CALL(std), STACK(/*default*/), PARAMS(PARAM(psh, pThis), PARAM(psh, pWaveBank))),
SYM_SIG(4627, 4928)),
REGISTER_OOVPAS(SYM_FUN(IXACTSoundBank_GetSoundCueIndexFromFriendlyName, CALL(std), STACK(/*default*/), PARAMS(PARAM(stk, pThis), PARAM(stk, pFriendlyName), PARAM(stk, pdwSoundCueIndex))),
REGISTER_OOVPAS(SYM_FUN(IXACTSoundBank_GetSoundCueIndexFromFriendlyName, CALL(std), STACK(/*default*/), PARAMS(PARAM(psh, pThis), PARAM(psh, pFriendlyName), PARAM(psh, pdwSoundCueIndex))),
SYM_SIG(4627, 4928)),
REGISTER_OOVPAS(SYM_FUN(IXACTSoundBank_Play, CALL(std), STACK(/*default*/), PARAMS(PARAM(stk, pThis), PARAM(stk, pdwSoundCueIndex), PARAM(stk, pSoundSource), PARAM(stk, dwFlags), PARAM(stk, ppSoundCue))),
REGISTER_OOVPAS(SYM_FUN(IXACTSoundBank_Play, CALL(std), STACK(/*default*/), PARAMS(PARAM(psh, pThis), PARAM(psh, pdwSoundCueIndex), PARAM(psh, pSoundSource), PARAM(psh, dwFlags), PARAM(psh, ppSoundCue))),
SYM_SIG(4627)),
REGISTER_OOVPAS(SYM_FUN(IXACTSoundBank_PlayEx, CALL(std), STACK(/*default*/), PARAMS(PARAM(stk, pThis), PARAM(stk, pPrepareData), PARAM(stk, ppSoundCue))),
REGISTER_OOVPAS(SYM_FUN(IXACTSoundBank_PlayEx, CALL(std), STACK(/*default*/), PARAMS(PARAM(psh, pThis), PARAM(psh, pPrepareData), PARAM(psh, ppSoundCue))),
SYM_SIG(5344)),
};

Expand Down
24 changes: 12 additions & 12 deletions src/OOVPADatabase/XGraphic_OOVPA.inl
Original file line number Diff line number Diff line change
Expand Up @@ -77,29 +77,29 @@
// ******************************************************************
OOVPATable XGRAPHC_OOVPA[] = {

REGISTER_OOVPAS(SYM_FUN(XFONT_OpenBitmapFontFromMemory, CALL(std), STACK(/*default*/), PARAMS(PARAM(stk, pFontData), PARAM(stk, uFontDataSize), PARAM(stk, ppFont))),
REGISTER_OOVPAS(SYM_FUN(XFONT_OpenBitmapFontFromMemory, CALL(std), STACK(/*default*/), PARAMS(PARAM(psh, pFontData), PARAM(psh, uFontDataSize), PARAM(psh, ppFont))),
SYM_SIG(4361)),
REGISTER_OOVPAS(SYM_FUN(XGCompressRect, CALL(std), STACK(/*default*/), PARAMS(PARAM(stk, pDestBuf), PARAM(stk, DestFormat), PARAM(stk, DestPitch), PARAM(stk, Width), PARAM(stk, Height), PARAM(stk, pSrcData), PARAM(stk, SrcFormat), PARAM(stk, SrcPitch), PARAM(stk, fAlphaRef), PARAM(stk, Flags))),
REGISTER_OOVPAS(SYM_FUN(XGCompressRect, CALL(std), STACK(/*default*/), PARAMS(PARAM(psh, pDestBuf), PARAM(psh, DestFormat), PARAM(psh, DestPitch), PARAM(psh, Width), PARAM(psh, Height), PARAM(psh, pSrcData), PARAM(psh, SrcFormat), PARAM(psh, SrcPitch), PARAM(psh, fAlphaRef), PARAM(psh, Flags))),
SYM_SIG(3911)),
REGISTER_OOVPAS(SYM_FUN(XGIsSwizzledFormat, CALL(std), STACK(/*default*/), PARAMS(PARAM(stk, Format))),
REGISTER_OOVPAS(SYM_FUN(XGIsSwizzledFormat, CALL(std), STACK(/*default*/), PARAMS(PARAM(psh, Format))),
SYM_SIG(3911)),
REGISTER_OOVPAS(SYM_FUN(XGSetIndexBufferHeader, CALL(std), STACK(/*default*/), PARAMS(PARAM(stk, Length), PARAM(stk, Usage), PARAM(stk, Format), PARAM(stk, Pool), PARAM(stk, pBuffer), PARAM(stk, Data))),
REGISTER_OOVPAS(SYM_FUN(XGSetIndexBufferHeader, CALL(std), STACK(/*default*/), PARAMS(PARAM(psh, Length), PARAM(psh, Usage), PARAM(psh, Format), PARAM(psh, Pool), PARAM(psh, pBuffer), PARAM(psh, Data))),
SYM_SIG(3911, 4134)),
REGISTER_OOVPAS(SYM_FUN(XGSetSurfaceHeader, CALL(std), STACK(/*default*/), PARAMS(PARAM(stk, Width), PARAM(stk, Height), PARAM(stk, Format), PARAM(stk, pSurface), PARAM(stk, Data), PARAM(stk, Pitch))),
REGISTER_OOVPAS(SYM_FUN(XGSetSurfaceHeader, CALL(std), STACK(/*default*/), PARAMS(PARAM(psh, Width), PARAM(psh, Height), PARAM(psh, Format), PARAM(psh, pSurface), PARAM(psh, Data), PARAM(psh, Pitch))),
SYM_SIG(3911)), // Final generic OOVPA: 3911; Removed: 0
REGISTER_OOVPAS(SYM_FUN(XGSetTextureHeader, CALL(std), STACK(/*default*/), PARAMS(PARAM(stk, Width), PARAM(stk, Height), PARAM(stk, Levels), PARAM(stk, Usage), PARAM(stk, Format), PARAM(stk, Pool), PARAM(stk, pTexture), PARAM(stk, Data), PARAM(stk, Pitch))),
REGISTER_OOVPAS(SYM_FUN(XGSetTextureHeader, CALL(std), STACK(/*default*/), PARAMS(PARAM(psh, Width), PARAM(psh, Height), PARAM(psh, Levels), PARAM(psh, Usage), PARAM(psh, Format), PARAM(psh, Pool), PARAM(psh, pTexture), PARAM(psh, Data), PARAM(psh, Pitch))),
SYM_SIG(3911)),
REGISTER_OOVPAS(SYM_FUN(XGSetVertexBufferHeader, CALL(std), STACK(/*default*/), PARAMS(PARAM(stk, Length), PARAM(stk, Usage), PARAM(stk, FVF), PARAM(stk, Pool), PARAM(stk, pBuffer), PARAM(stk, Data))),
REGISTER_OOVPAS(SYM_FUN(XGSetVertexBufferHeader, CALL(std), STACK(/*default*/), PARAMS(PARAM(psh, Length), PARAM(psh, Usage), PARAM(psh, FVF), PARAM(psh, Pool), PARAM(psh, pBuffer), PARAM(psh, Data))),
SYM_SIG(3911, 4134)),
REGISTER_OOVPAS(SYM_FUN(XGSwizzleBox, CALL(std), STACK(/*default*/), PARAMS(PARAM(stk, pSource), PARAM(stk, RowPitch), PARAM(stk, SlicePitch), PARAM(stk, pBox), PARAM(stk, pDest), PARAM(stk, Width), PARAM(stk, Height), PARAM(stk, Depth), PARAM(stk, pPoint), PARAM(stk, BytesPerPixel))),
REGISTER_OOVPAS(SYM_FUN(XGSwizzleBox, CALL(std), STACK(/*default*/), PARAMS(PARAM(psh, pSource), PARAM(psh, RowPitch), PARAM(psh, SlicePitch), PARAM(psh, pBox), PARAM(psh, pDest), PARAM(psh, Width), PARAM(psh, Height), PARAM(psh, Depth), PARAM(psh, pPoint), PARAM(psh, BytesPerPixel))),
SYM_SIG(3911)),
REGISTER_OOVPAS(SYM_FUN(XGSwizzleRect, CALL(std), STACK(/*default*/), PARAMS(PARAM(stk, pSource), PARAM(stk, Pitch), PARAM(stk, pRect), PARAM(stk, pDest), PARAM(stk, Width), PARAM(stk, Height), PARAM(stk, pPoint), PARAM(stk, BytesPerPixel))),
REGISTER_OOVPAS(SYM_FUN(XGSwizzleRect, CALL(std), STACK(/*default*/), PARAMS(PARAM(psh, pSource), PARAM(psh, Pitch), PARAM(psh, pRect), PARAM(psh, pDest), PARAM(psh, Width), PARAM(psh, Height), PARAM(psh, pPoint), PARAM(psh, BytesPerPixel))),
SYM_SIG(3911)),
REGISTER_OOVPAS(SYM_FUN(XGUnswizzleBox, CALL(std), STACK(/*default*/), PARAMS(PARAM(stk, pSource), PARAM(stk, Width), PARAM(stk, Height), PARAM(stk, Depth), PARAM(stk, pBox), PARAM(stk, pDest), PARAM(stk, RowPitch), PARAM(stk, SlicePitch), PARAM(stk, pPoint), PARAM(stk, BytesPerPixel))),
REGISTER_OOVPAS(SYM_FUN(XGUnswizzleBox, CALL(std), STACK(/*default*/), PARAMS(PARAM(psh, pSource), PARAM(psh, Width), PARAM(psh, Height), PARAM(psh, Depth), PARAM(psh, pBox), PARAM(psh, pDest), PARAM(psh, RowPitch), PARAM(psh, SlicePitch), PARAM(psh, pPoint), PARAM(psh, BytesPerPixel))),
SYM_SIG(3911)),
REGISTER_OOVPAS(SYM_FUN(XGUnswizzleRect, CALL(std), STACK(/*default*/), PARAMS(PARAM(stk, pSource), PARAM(stk, Width), PARAM(stk, Height), PARAM(stk, pRect), PARAM(stk, pDest), PARAM(stk, Pitch), PARAM(stk, pPoint), PARAM(stk, BytesPerPixel))),
REGISTER_OOVPAS(SYM_FUN(XGUnswizzleRect, CALL(std), STACK(/*default*/), PARAMS(PARAM(psh, pSource), PARAM(psh, Width), PARAM(psh, Height), PARAM(psh, pRect), PARAM(psh, pDest), PARAM(psh, Pitch), PARAM(psh, pPoint), PARAM(psh, BytesPerPixel))),
SYM_SIG(3911)),
REGISTER_OOVPAS(SYM_FUN(XGWriteSurfaceOrTextureToXPR, CALL(std), STACK(/*default*/), PARAMS(PARAM(stk, pResource), PARAM(stk, cPath), PARAM(stk, bWriteSurfaceAsTexture))),
REGISTER_OOVPAS(SYM_FUN(XGWriteSurfaceOrTextureToXPR, CALL(std), STACK(/*default*/), PARAMS(PARAM(psh, pResource), PARAM(psh, cPath), PARAM(psh, bWriteSurfaceAsTexture))),
SYM_SIG(3911)),
};

Expand Down
Loading

0 comments on commit 5b10dbe

Please sign in to comment.