Skip to content

Move weak inlines to xBase and xFile headers #744

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bluisblu wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Move weak inlines to xBase and xFile headers #744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,8 +409,8 @@ def MatchingFor(*versions):
"progress_category": "game",
"objects": [
Object(NonMatching, "SB/Core/x/xAnim.cpp", extra_cflags=["-sym on"]),
Object(Matching, "SB/Core/x/xBase.cpp"),
Object(Matching, "SB/Core/x/xbinio.cpp"),
Object(Matching, "SB/Core/x/xBase.cpp", extra_cflags=["-sym on"]),
Object(Matching, "SB/Core/x/xbinio.cpp", extra_cflags=["-sym on"]),
Object(NonMatching, "SB/Core/x/xBound.cpp"),
Object(NonMatching, "SB/Core/x/xCamera.cpp"),
Object(NonMatching, "SB/Core/x/xClimate.cpp"),
Expand Down Expand Up @@ -502,7 +502,7 @@ def MatchingFor(*versions):
Object(NonMatching, "SB/Game/zLOD.cpp"),
Object(NonMatching, "SB/Game/zMain.cpp"),
Object(Equivalent, "SB/Game/zMenu.cpp"),
Object(Matching, "SB/Game/zMovePoint.cpp"),
Object(Matching, "SB/Game/zMovePoint.cpp", extra_cflags=["-sym on"]),
Object(NonMatching, "SB/Game/zMusic.cpp"),
Object(Equivalent, "SB/Game/zParCmd.cpp"),
Object(Matching, "SB/Game/zParEmitter.cpp"),
Expand Down
20 changes: 0 additions & 20 deletions src/SB/Core/x/xBase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,23 +49,3 @@ void xBaseReset(xBase* xb, xBaseAsset* asset)

xBaseValidate(xb);
}

void xBaseValidate(xBase* xb)
{
xb->baseFlags |= 0x4;
}

bool xBaseIsEnabled(const xBase* xb)
{
return (xb->baseFlags & 0x1);
}

void xBaseDisable(xBase* xb)
{
xb->baseFlags &= ~0x1;
}

void xBaseEnable(xBase* xb)
{
xb->baseFlags |= 0x1;
}
23 changes: 19 additions & 4 deletions src/SB/Core/x/xBase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,24 @@ void xBaseSave(xBase* ent, xSerial* s);
void xBaseLoad(xBase* ent, xSerial* s);
void xBaseReset(xBase* xb, xBaseAsset* asset);
U32 xBaseIsValid(xBase* xb);
void xBaseValidate(xBase* xb);
bool xBaseIsEnabled(const xBase* xb);
void xBaseDisable(xBase* xb);
void xBaseEnable(xBase* xb);
inline void xBaseValidate(xBase* xb)
{
xb->baseFlags |= 0x4;
}

inline bool xBaseIsEnabled(const xBase* xb)
{
return (xb->baseFlags & 0x1);
}

inline void xBaseDisable(xBase* xb)
{
xb->baseFlags &= ~0x1;
}

inline void xBaseEnable(xBase* xb)
{
xb->baseFlags |= 0x1;
}

#endif
11 changes: 9 additions & 2 deletions src/SB/Core/x/xFile.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,14 @@ struct tag_xFile
void* user_data;
};

void xFileSetUserData(tag_xFile* file, void* userdata);
XFILE_READSECTOR_STATUS xFileReadAsyncStatus(S32 key, S32* amtToFar);
inline void xFileSetUserData(tag_xFile* file, void* userdata)
{
file->user_data = userdata;
}

inline XFILE_READSECTOR_STATUS xFileReadAsyncStatus(S32 key, S32* amtToFar)
{
return (XFILE_READSECTOR_STATUS)iFileReadAsyncStatus(key, amtToFar);
}

#endif
22 changes: 4 additions & 18 deletions src/SB/Core/x/xbinio.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,16 +57,14 @@ static en_BIO_ASYNC_ERRCODES AsyncReadStatus(st_FILELOADINFO* fli);
static void Swap2(char* d, S32 n);
static void Swap4(char* d, S32 n);
static void Swap8(char* d, S32 n);
static tag_xFile* BFD_open(const char* filename, const char* mode, U32 lockid, S32,
void* xtradata);
static tag_xFile* BFD_open(const char* filename, const char* mode, U32 lockid, S32, void* xtradata);
static void BFD_close(tag_xFile* bffp, void* xtradata);
static S32 BFD_read(void* data, S32 elesize, S32 elecnt, tag_xFile* bffp, void* xtradata);
static S32 BFD_seek(tag_xFile* bffp, S32 offset, S32 whence, void* xtradata);
static S32 BFD_getLength(tag_xFile* bffp, void* xtradata);
static S32 BFD_startSector(const char* filename);
static void BFD_cb_GCP2_readasync(tag_xFile* bffp);
static S32 BFD_AsyncRead(st_FILELOADINFO* fli, S32 pos, void* data, S32 size, S32 n,
S32 endian);
static S32 BFD_AsyncRead(st_FILELOADINFO* fli, S32 pos, void* data, S32 size, S32 n, S32 endian);
static en_BIO_ASYNC_ERRCODES BFD_AsyncReadStatus(st_FILELOADINFO* fli);

st_FILELOADINFO* xBinioLoadCreate(const char* filename)
Expand Down Expand Up @@ -433,8 +431,7 @@ static void Swap8(char* d, S32 n)
}
}

static tag_xFile* BFD_open(const char* filename, const char* mode, U32 lockid, S32,
void* xtradata)
static tag_xFile* BFD_open(const char* filename, const char* mode, U32 lockid, S32, void* xtradata)
{
tag_xFile* bffp;
U32 orc; // open return code
Expand Down Expand Up @@ -617,8 +614,7 @@ static void BFD_cb_GCP2_readasync(tag_xFile* bffp)
{
}

static S32 BFD_AsyncRead(st_FILELOADINFO* fli, S32 pos, void* data, S32 size, S32 n,
S32 endian)
static S32 BFD_AsyncRead(st_FILELOADINFO* fli, S32 pos, void* data, S32 size, S32 n, S32 endian)
{
tag_xFile* file = (tag_xFile*)fli->privdata;
st_BINIO_XTRADATA* xtra = (st_BINIO_XTRADATA*)fli->xtradata;
Expand Down Expand Up @@ -722,13 +718,3 @@ static en_BIO_ASYNC_ERRCODES BFD_AsyncReadStatus(st_FILELOADINFO* fli)

return status;
}

WEAK void xFileSetUserData(tag_xFile* file, void* userdata)
{
file->user_data = userdata;
}

WEAK XFILE_READSECTOR_STATUS xFileReadAsyncStatus(S32 key, S32* amtToFar)
{
return (XFILE_READSECTOR_STATUS)iFileReadAsyncStatus(key, amtToFar);
}
Loading