FWGS/xash3d-fwgs
2
0
Fork 0
mirror of https://github.com/FWGS/xash3d-fwgs synced 2024-12-22 17:01:14 +01:00
Code Issues 2 Projects Releases Wiki Activity

common: add macro for simultaneously checking data type size for ILP32 and LP64

Browse Source
This commit is contained in:
Alibek Omarov 2024-08-21 11:59:02 +03:00
parent 7fc9ee154a
commit 842e494fa6
9 changed files with 39 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/com_model.h
View File

@ -543,14 +543,8 @@ typedef struct
#define MAX_CLIENT_SPRITES 512 // SpriteTextures (0-256 hud, 256-512 client) #define MAX_CLIENT_SPRITES 512 // SpriteTextures (0-256 hud, 256-512 client)
#define MAX_REQUESTS 64 #define MAX_REQUESTS 64
#if ! XASH_64BIT STATIC_CHECK_SIZEOF( mextrasurf_t, 324, 496 );
STATIC_ASSERT( sizeof( mextrasurf_t ) == 324, "mextrasurf_t unexpected size" ); STATIC_CHECK_SIZEOF( decal_t, 60, 88 );
STATIC_ASSERT( sizeof( decal_t ) == 60, "decal_t unexpected size"); STATIC_CHECK_SIZEOF( mfaceinfo_t, 176, 304 );
STATIC_ASSERT( sizeof( mfaceinfo_t ) == 176, "mfaceinfo_t unexpected size");
#else
STATIC_ASSERT( sizeof( mextrasurf_t) == 496, "mextrasurf_t unexpected size");
STATIC_ASSERT( sizeof( decal_t ) == 88, "decal_t unexpected size");
STATIC_ASSERT( sizeof( mfaceinfo_t ) == 304, "mfaceinfo_t unexpected size");
#endif
#endif//COM_MODEL_H #endif//COM_MODEL_H

2
common/kbutton.h
View File

@ -30,6 +30,6 @@ typedef struct
int state; // low bit is down state int state; // low bit is down state
} kbutton_t; } kbutton_t;
STATIC_ASSERT( sizeof( kbutton_t ) == 12, "kbutton_t isn't 12 bytes!" ); STATIC_CHECK_SIZEOF( kbutton_t, 12, 12 );
#endif // KBUTTON_H #endif // KBUTTON_H

2
common/netadr.h
View File

@ -69,6 +69,6 @@ typedef struct netadr_s
} netadr_t; } netadr_t;
#pragma pack( pop ) #pragma pack( pop )
STATIC_ASSERT( sizeof( netadr_t ) == 20, "netadr_t isn't 20 bytes!" ); STATIC_CHECK_SIZEOF( netadr_t, 20, 20 );
#endif // NET_ADR_H #endif // NET_ADR_H

9
common/xash3d_types.h
View File

@ -130,6 +130,15 @@ typedef uint64_t longtime_t;
#define STATIC_ASSERT( x, y ) STATIC_ASSERT_2( __LINE__, x, y ) #define STATIC_ASSERT( x, y ) STATIC_ASSERT_2( __LINE__, x, y )
#endif #endif
// at least, statically check size of some public structures
#if XASH_64BIT
#define STATIC_CHECK_SIZEOF( type, size32, size64 ) \
STATIC_ASSERT( sizeof( type ) == size64, #type " unexpected size" )
#else
#define STATIC_CHECK_SIZEOF( type, size32, size64 ) \
STATIC_ASSERT( sizeof( type ) == size32, #type " unexpected size" )
#endif
#if !defined( __cplusplus ) && __STDC_VERSION__ >= 199101L // not C++ and C99 or newer #if !defined( __cplusplus ) && __STDC_VERSION__ >= 199101L // not C++ and C99 or newer
#define XASH_RESTRICT restrict #define XASH_RESTRICT restrict
#elif _MSC_VER || __GNUC__ || __clang__ // compiler-specific extensions #elif _MSC_VER || __GNUC__ || __clang__ // compiler-specific extensions

20
engine/alias.h
View File

@ -74,7 +74,7 @@ typedef struct
float size; float size;
} daliashdr_t; } daliashdr_t;
STATIC_ASSERT( sizeof( daliashdr_t ) == 84, "invalid daliashdr_t size" ); STATIC_CHECK_SIZEOF( daliashdr_t, 84, 84 );
typedef struct typedef struct
{ {
@ -83,7 +83,7 @@ typedef struct
int32_t t; int32_t t;
} stvert_t; } stvert_t;
STATIC_ASSERT( sizeof( stvert_t ) == 12, "invalid stvert_t size" ); STATIC_CHECK_SIZEOF( stvert_t, 12, 12 );
typedef struct dtriangle_s typedef struct dtriangle_s
{ {
@ -91,7 +91,7 @@ typedef struct dtriangle_s
int32_t vertindex[3]; int32_t vertindex[3];
} dtriangle_t; } dtriangle_t;
STATIC_ASSERT( sizeof( dtriangle_t ) == 16, "invalid dtriangle_t size" ); STATIC_CHECK_SIZEOF( dtriangle_t, 16, 16 );
#define DT_FACES_FRONT 0x0010 #define DT_FACES_FRONT 0x0010
#define ALIAS_ONSEAM 0x0020 #define ALIAS_ONSEAM 0x0020
@ -103,7 +103,7 @@ typedef struct
char name[16]; // frame name from grabbing char name[16]; // frame name from grabbing
} daliasframe_t; } daliasframe_t;
STATIC_ASSERT( sizeof( daliasframe_t ) == 24, "invalid daliasframe_t size" ); STATIC_CHECK_SIZEOF( daliasframe_t, 24, 24 );
typedef struct typedef struct
{ {
@ -112,41 +112,41 @@ typedef struct
trivertex_t bboxmax; // lightnormal isn't used trivertex_t bboxmax; // lightnormal isn't used
} daliasgroup_t; } daliasgroup_t;
STATIC_ASSERT( sizeof( daliasgroup_t ) == 12, "invalid daliasgrou_t size" ); STATIC_CHECK_SIZEOF( daliasgroup_t, 12, 12 );
typedef struct typedef struct
{ {
int32_t numskins; int32_t numskins;
} daliasskingroup_t; } daliasskingroup_t;
STATIC_ASSERT( sizeof( daliasskingroup_t ) == 4, "invalid daliasskingroup_t size" ); STATIC_CHECK_SIZEOF( daliasskingroup_t, 4, 4 );
typedef struct typedef struct
{ {
float interval; float interval;
} daliasinterval_t; } daliasinterval_t;
STATIC_ASSERT( sizeof( daliasinterval_t ) == 4, "invalid daliasinterval_t size" ); STATIC_CHECK_SIZEOF( daliasinterval_t, 4, 4 );
typedef struct typedef struct
{ {
float interval; float interval;
} daliasskininterval_t; } daliasskininterval_t;
STATIC_ASSERT( sizeof( daliasskininterval_t ) == 4, "invalid daliasskininterval_t size" ); STATIC_CHECK_SIZEOF( daliasskininterval_t, 4, 4 );
typedef struct typedef struct
{ {
uint32_t type; // was aliasframetype_t uint32_t type; // was aliasframetype_t
} daliasframetype_t; } daliasframetype_t;
STATIC_ASSERT( sizeof( daliasframetype_t ) == 4, "invalid daliasframetype_t size" ); STATIC_CHECK_SIZEOF( daliasframetype_t, 4, 4 );
typedef struct typedef struct
{ {
uint32_t type; // was aliasskintype_t uint32_t type; // was aliasskintype_t
} daliasskintype_t; } daliasskintype_t;
STATIC_ASSERT( sizeof( daliasskintype_t ) == 4, "invalid daliasskintype_t size" ); STATIC_CHECK_SIZEOF( daliasskintype_t, 4, 4 );
#endif//ALIAS_H #endif//ALIAS_H

6
engine/common/hpak.h
View File

@ -67,7 +67,7 @@ typedef struct dresource_s
} dresource_t; } dresource_t;
#pragma pack( pop ) #pragma pack( pop )
STATIC_ASSERT( sizeof( dresource_t ) == 136, "invalid dresource_t size, HPAKs won't be compatible (no custom logo in multiplayer!)" ); STATIC_CHECK_SIZEOF( dresource_t, 136, 136 );
typedef struct typedef struct
{ {
@ -76,7 +76,7 @@ typedef struct
int infotableofs; int infotableofs;
} hpak_header_t; } hpak_header_t;
STATIC_ASSERT( sizeof( hpak_header_t ) == 12, "invalid hpak_header_t size" ); STATIC_CHECK_SIZEOF( hpak_header_t, 12, 12 );
typedef struct typedef struct
{ {
@ -85,7 +85,7 @@ typedef struct
int disksize; int disksize;
} hpak_lump_t; } hpak_lump_t;
STATIC_ASSERT( sizeof( hpak_lump_t ) == 144, "invalid hpak_lump_t size" ); STATIC_CHECK_SIZEOF( hpak_lump_t, 144, 144 );
typedef struct typedef struct
{ {

9
engine/common/soundlib/snd_mp3.c
View File

@ -25,8 +25,7 @@ typedef struct did3v2_header_s
uint8_t flags; uint8_t flags;
uint32_t length; // size of extended header, padding and frames uint32_t length; // size of extended header, padding and frames
} did3v2_header_t; } did3v2_header_t;
STATIC_ASSERT( sizeof( did3v2_header_t ) == 10, STATIC_CHECK_SIZEOF( did3v2_header_t, 10, 10 );
"invalid did3v2_header_t size" );
typedef struct did3v2_extended_header_s typedef struct did3v2_extended_header_s
{ {
@ -34,8 +33,7 @@ typedef struct did3v2_extended_header_s
uint8_t flags_length; uint8_t flags_length;
uint8_t flags[1]; uint8_t flags[1];
} did3v2_extended_header_t; } did3v2_extended_header_t;
STATIC_ASSERT( sizeof( did3v2_extended_header_t ) == 6, STATIC_CHECK_SIZEOF( did3v2_extended_header_t, 6, 6 );
"invalid did3v2_extended_header_t size" );
typedef struct did3v2_frame_s typedef struct did3v2_frame_s
{ {
@ -43,8 +41,7 @@ typedef struct did3v2_frame_s
uint32_t length; uint32_t length;
uint8_t flags[2]; uint8_t flags[2];
} did3v2_frame_t; } did3v2_frame_t;
STATIC_ASSERT( sizeof( did3v2_frame_t ) == 10, STATIC_CHECK_SIZEOF( did3v2_frame_t, 10, 10 );
"invalid did3v2_frame_t size" );
#pragma pack( pop ) #pragma pack( pop )
typedef enum did3v2_header_flags_e typedef enum did3v2_header_flags_e

9
engine/custom.h
View File

@ -95,12 +95,7 @@ typedef struct customization_s
#define FCUST_WIPEDATA ( 1<<1 ) #define FCUST_WIPEDATA ( 1<<1 )
#define FCUST_IGNOREINIT ( 1<<2 ) #define FCUST_IGNOREINIT ( 1<<2 )
#if !XASH_64BIT STATIC_CHECK_SIZEOF( customization_t, 164, 192 );
STATIC_ASSERT( sizeof( customization_t ) == 164, "invalid customization_t size, broken API" ); STATIC_CHECK_SIZEOF( resource_t, 136, 144 );
STATIC_ASSERT( sizeof( resource_t ) == 136, "invalid resource_t size, broken API" );
#else
STATIC_ASSERT( sizeof( customization_t ) == 192, "invalid customization_t size, broken API" );
STATIC_ASSERT( sizeof( resource_t ) == 144, "invalid resource_t size, broken API" );
#endif
#endif // CUSTOM_H #endif // CUSTOM_H

14
engine/sprite.h
View File

@ -72,7 +72,7 @@ typedef struct
int32_t version; // current version 2 int32_t version; // current version 2
} dsprite_t; } dsprite_t;
STATIC_ASSERT( sizeof( dsprite_t ) == 8, "invalid dsprite_t size" ); STATIC_CHECK_SIZEOF( dsprite_t, 8, 8 );
typedef struct typedef struct
{ {
@ -86,7 +86,7 @@ typedef struct
uint32_t synctype; // animation synctype, was synctype_t uint32_t synctype; // animation synctype, was synctype_t
} dsprite_q1_t; } dsprite_q1_t;
STATIC_ASSERT( sizeof( dsprite_q1_t ) == 36, "invalid dsprite_q1_t size" ); STATIC_CHECK_SIZEOF( dsprite_q1_t, 36, 36 );
typedef struct typedef struct
{ {
@ -101,7 +101,7 @@ typedef struct
uint32_t synctype; // animation synctype, was synctype_t uint32_t synctype; // animation synctype, was synctype_t
} dsprite_hl_t; } dsprite_hl_t;
STATIC_ASSERT( sizeof( dsprite_hl_t ) == 40, "invalid dsprite_hl_t size" ); STATIC_CHECK_SIZEOF( dsprite_hl_t, 40, 40 );
typedef struct typedef struct
{ {
@ -110,27 +110,27 @@ typedef struct
int32_t height; int32_t height;
} dspriteframe_t; } dspriteframe_t;
STATIC_ASSERT( sizeof( dspriteframe_t ) == 16, "invalid dspriteframe_t size" ); STATIC_CHECK_SIZEOF( dspriteframe_t, 16, 16 );
typedef struct typedef struct
{ {
int32_t numframes; int32_t numframes;
} dspritegroup_t; } dspritegroup_t;
STATIC_ASSERT( sizeof( dspritegroup_t ) == 4, "invalid dspritegroup_t size" ); STATIC_CHECK_SIZEOF( dspritegroup_t, 4, 4 );
typedef struct typedef struct
{ {
float interval; float interval;
} dspriteinterval_t; } dspriteinterval_t;
STATIC_ASSERT( sizeof( dspriteinterval_t ) == 4, "invalid dspriteinterval_t size" ); STATIC_CHECK_SIZEOF( dspriteinterval_t, 4, 4 );
typedef struct typedef struct
{ {
uint32_t type; // was frametype_t uint32_t type; // was frametype_t
} dframetype_t; } dframetype_t;
STATIC_ASSERT( sizeof( dframetype_t ) == 4, "invalid dframetype_t size" ); STATIC_CHECK_SIZEOF( dframetype_t, 4, 4 );
#endif//SPRITE_H #endif//SPRITE_H