nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Remove magic members from instance globals.

Browse Source 
We ought to trust compiler and we have other
tools to check oob access.
This commit is contained in:
Mika Kuoppala
2024-10-23 23:41:24 +03:00
parent 5eefeaf009
commit 25061dbce4
2 changed files with 0 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
include/decl.h
View File

@@ -181,7 +181,6 @@ struct instance_globals_a {
struct h2o_ctx acid_ctx; struct h2o_ctx acid_ctx;
boolean havestate; boolean havestate;
unsigned long magic; /* validate that structure layout is preserved */
}; };
struct instance_globals_b { struct instance_globals_b {
@@ -219,7 +218,6 @@ struct instance_globals_b {
boolean bot_disabled; boolean bot_disabled;
boolean havestate; boolean havestate;
unsigned long magic; /* validate that structure layout is preserved */
}; };
struct instance_globals_c { struct instance_globals_c {
@@ -299,7 +297,6 @@ struct instance_globals_c {
/* zap.c */ /* zap.c */
boolean havestate; boolean havestate;
unsigned long magic; /* validate that structure layout is preserved */
}; };
struct instance_globals_d { struct instance_globals_d {
@@ -341,7 +338,6 @@ struct instance_globals_d {
boolean decor_levitate_override; boolean decor_levitate_override;
boolean havestate; boolean havestate;
unsigned long magic; /* validate that structure layout is preserved */
}; };
struct instance_globals_e { struct instance_globals_e {
@@ -362,7 +358,6 @@ struct instance_globals_e {
to gb.beyond_savefile_load */ to gb.beyond_savefile_load */
boolean havestate; boolean havestate;
unsigned long magic; /* validate that structure layout is preserved */
}; };
struct instance_globals_f { struct instance_globals_f {
@@ -387,7 +382,6 @@ struct instance_globals_f {
long int followmsg; /* last time of follow message */ long int followmsg; /* last time of follow message */
boolean havestate; boolean havestate;
unsigned long magic; /* validate that structure layout is preserved */
}; };
struct instance_globals_g { struct instance_globals_g {
@@ -435,7 +429,6 @@ struct instance_globals_g {
long glyphmap_perlevel_flags; long glyphmap_perlevel_flags;
boolean havestate; boolean havestate;
unsigned long magic; /* validate that structure layout is preserved */
}; };
struct instance_globals_h { struct instance_globals_h {
@@ -456,7 +449,6 @@ struct instance_globals_h {
struct attack *hitmsg_prev; struct attack *hitmsg_prev;
boolean havestate; boolean havestate;
unsigned long magic; /* validate that structure layout is preserved */
}; };
struct instance_globals_i { struct instance_globals_i {
@@ -490,7 +482,6 @@ struct instance_globals_i {
/* new */ /* new */
boolean havestate; boolean havestate;
unsigned long magic; /* validate that structure layout is preserved */
}; };
struct instance_globals_j { struct instance_globals_j {
@@ -499,7 +490,6 @@ struct instance_globals_j {
int jumping_is_magic; /* current jump result of magic */ int jumping_is_magic; /* current jump result of magic */
boolean havestate; boolean havestate;
unsigned long magic; /* validate that structure layout is preserved */
}; };
struct instance_globals_k { struct instance_globals_k {
@@ -513,7 +503,6 @@ struct instance_globals_k {
boolean known; boolean known;
boolean havestate; boolean havestate;
unsigned long magic; /* validate that structure layout is preserved */
}; };
struct instance_globals_l { struct instance_globals_l {
@@ -579,7 +568,6 @@ struct instance_globals_l {
char lua_copyright[LUA_COPYRIGHT_BUFSIZ]; char lua_copyright[LUA_COPYRIGHT_BUFSIZ];
boolean havestate; boolean havestate;
unsigned long magic; /* validate that structure layout is preserved */
}; };
struct instance_globals_m { struct instance_globals_m {
@@ -646,7 +634,6 @@ struct instance_globals_m {
* POT_WATER should become discovered */ * POT_WATER should become discovered */
boolean havestate; boolean havestate;
unsigned long magic; /* validate that structure layout is preserved */
}; };
struct instance_globals_n { struct instance_globals_n {
@@ -696,7 +683,6 @@ struct instance_globals_n {
short nocreate4; short nocreate4;
boolean havestate; boolean havestate;
unsigned long magic; /* validate that structure layout is preserved */
}; };
struct instance_globals_o { struct instance_globals_o {
@@ -755,7 +741,6 @@ struct instance_globals_o {
boolean obj_zapped; boolean obj_zapped;
boolean havestate; boolean havestate;
unsigned long magic; /* validate that structure layout is preserved */
}; };
struct instance_globals_p { struct instance_globals_p {
@@ -806,13 +791,11 @@ struct instance_globals_p {
/* new stuff */ /* new stuff */
boolean havestate; boolean havestate;
unsigned long magic; /* validate that structure layout is preserved */
}; };
struct instance_globals_q { struct instance_globals_q {
boolean havestate; boolean havestate;
unsigned long magic; /* validate that structure layout is preserved */
}; };
struct instance_globals_r { struct instance_globals_r {
@@ -841,7 +824,6 @@ struct instance_globals_r {
struct repo repo; struct repo repo;
boolean havestate; boolean havestate;
unsigned long magic; /* validate that structure layout is preserved */
}; };
struct instance_globals_s { struct instance_globals_s {
@@ -923,7 +905,6 @@ struct instance_globals_s {
int seethru; /* 'bubble' debugging: clouds and water don't block light */ int seethru; /* 'bubble' debugging: clouds and water don't block light */
boolean havestate; boolean havestate;
unsigned long magic; /* validate that structure layout is preserved */
}; };
struct instance_globals_t { struct instance_globals_t {
@@ -974,7 +955,6 @@ struct instance_globals_t {
int twohits; /* 0: single hit; 1: first of 2; 2: second of 2 */ int twohits; /* 0: single hit; 1: first of 2; 2: second of 2 */
boolean havestate; boolean havestate;
unsigned long magic; /* validate that structure layout is preserved */
}; };
struct instance_globals_u { struct instance_globals_u {
@@ -994,7 +974,6 @@ struct instance_globals_u {
/* new stuff */ /* new stuff */
boolean havestate; boolean havestate;
unsigned long magic; /* validate that structure layout is preserved */
}; };
struct instance_globals_v { struct instance_globals_v {
@@ -1031,7 +1010,6 @@ struct instance_globals_v {
struct sound_voice voice; struct sound_voice voice;
boolean havestate; boolean havestate;
unsigned long magic; /* validate that structure layout is preserved */
}; };
struct instance_globals_w { struct instance_globals_w {
@@ -1056,7 +1034,6 @@ struct instance_globals_w {
struct win_settings wsettings; /* wintype.h */ struct win_settings wsettings; /* wintype.h */
boolean havestate; boolean havestate;
unsigned long magic; /* validate that structure layout is preserved */
}; };
struct instance_globals_x { struct instance_globals_x {
@@ -1077,7 +1054,6 @@ struct instance_globals_x {
coordxy xstart, xsize; coordxy xstart, xsize;
boolean havestate; boolean havestate;
unsigned long magic; /* validate that structure layout is preserved */
}; };
struct instance_globals_y { struct instance_globals_y {
@@ -1095,7 +1071,6 @@ struct instance_globals_y {
coordxy ystart, ysize; coordxy ystart, ysize;
boolean havestate; boolean havestate;
unsigned long magic; /* validate that structure layout is preserved */
}; };
struct instance_globals_z { struct instance_globals_z {
@@ -1112,7 +1087,6 @@ struct instance_globals_z {
* remember who zapped the wand. */ * remember who zapped the wand. */
boolean havestate; boolean havestate;
unsigned long magic; /* validate that structure layout is preserved */
}; };
struct instance_globals_saved_b { struct instance_globals_saved_b {

34
src/decl.c
View File

@@ -146,8 +146,6 @@ NEARDATA long yn_number = 0L;
const char *ARGV0; const char *ARGV0;
#endif #endif
#define IVMAGIC 0xdeadbeef
static const struct Role urole_init_data = { static const struct Role urole_init_data = {
{ "Undefined", 0 }, { "Undefined", 0 },
{ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
@@ -228,7 +226,6 @@ static const struct instance_globals_a g_init_a = {
/* trap.c */ /* trap.c */
{ 0, 0, FALSE }, /* acid_ctx */ { 0, 0, FALSE }, /* acid_ctx */
TRUE, /* havestate*/ TRUE, /* havestate*/
IVMAGIC /* a_magic to validate that structure layout has been preserved */
}; };
static const struct instance_globals_b g_init_b = { static const struct instance_globals_b g_init_b = {
@@ -261,7 +258,6 @@ static const struct instance_globals_b g_init_b = {
FALSE, /* bot_disabled */ FALSE, /* bot_disabled */
TRUE, /* havestate*/ TRUE, /* havestate*/
IVMAGIC /* b_magic to validate that structure layout has been preserved */
}; };
static const struct instance_globals_c g_init_c = { static const struct instance_globals_c g_init_c = {
@@ -312,7 +308,6 @@ static const struct instance_globals_c g_init_c = {
/* uhitm.c */ /* uhitm.c */
NON_PM, /* corpsenm_digested */ NON_PM, /* corpsenm_digested */
TRUE, /* havestate*/ TRUE, /* havestate*/
IVMAGIC /* c_magic to validate that structure layout has been preserved */
}; };
static const struct instance_globals_d g_init_d = { static const struct instance_globals_d g_init_d = {
@@ -340,7 +335,6 @@ static const struct instance_globals_d g_init_d = {
FALSE, /* decor_fumble_override */ FALSE, /* decor_fumble_override */
FALSE, /* decor_levitate_override */ FALSE, /* decor_levitate_override */
TRUE, /* havestate*/ TRUE, /* havestate*/
IVMAGIC /* d_magic to validate that structure layout has been preserved */
}; };
static const struct instance_globals_e g_init_e = { static const struct instance_globals_e g_init_e = {
@@ -355,7 +349,6 @@ static const struct instance_globals_e g_init_e = {
/* new */ /* new */
0, /* early_raw_messages */ 0, /* early_raw_messages */
TRUE, /* havestate*/ TRUE, /* havestate*/
IVMAGIC /* e_magic to validate that structure layout has been preserved */
}; };
static const struct instance_globals_f g_init_f = { static const struct instance_globals_f g_init_f = {
@@ -374,7 +367,6 @@ static const struct instance_globals_f g_init_f = {
/* shk.c */ /* shk.c */
0L, /* followmsg */ 0L, /* followmsg */
TRUE, /* havestate*/ TRUE, /* havestate*/
IVMAGIC /* f_magic to validate that structure layout has been preserved */
}; };
static const struct instance_globals_g g_init_g = { static const struct instance_globals_g g_init_g = {
@@ -411,7 +403,6 @@ static const struct instance_globals_g g_init_g = {
/* per-level glyph mapping flags */ /* per-level glyph mapping flags */
0L, /* glyphmap_perlevel_flags */ 0L, /* glyphmap_perlevel_flags */
TRUE, /* havestate*/ TRUE, /* havestate*/
IVMAGIC /* g_magic to validate that structure layout has been preserved */
}; };
static const struct instance_globals_h g_init_h = { static const struct instance_globals_h g_init_h = {
@@ -430,7 +421,6 @@ static const struct instance_globals_h g_init_h = {
NULL, /* hitmsg_prev */ NULL, /* hitmsg_prev */
/* save.c */ /* save.c */
TRUE, /* havestate*/ TRUE, /* havestate*/
IVMAGIC /* h_magic to validate that structure layout has been preserved */
}; };
static const struct instance_globals_i g_init_i = { static const struct instance_globals_i g_init_i = {
@@ -453,14 +443,12 @@ static const struct instance_globals_i g_init_i = {
FALSE, /* in_mk_themerooms */ FALSE, /* in_mk_themerooms */
TRUE, /* havestate*/ TRUE, /* havestate*/
IVMAGIC /* i_magic to validate that structure layout has been preserved */
}; };
static const struct instance_globals_j g_init_j = { static const struct instance_globals_j g_init_j = {
/* apply.c */ /* apply.c */
0, /* jumping_is_magic */ 0, /* jumping_is_magic */
TRUE, /* havestate*/ TRUE, /* havestate*/
IVMAGIC /* j_magic to validate that structure layout has been preserved */
}; };
static const struct instance_globals_k g_init_k = { static const struct instance_globals_k g_init_k = {
@@ -470,7 +458,6 @@ static const struct instance_globals_k g_init_k = {
/* read.c */ /* read.c */
UNDEFINED_VALUE, /* known */ UNDEFINED_VALUE, /* known */
TRUE, /* havestate*/ TRUE, /* havestate*/
IVMAGIC /* k_magic to validate that structure layout has been preserved */
}; };
static const struct instance_globals_l g_init_l = { static const struct instance_globals_l g_init_l = {
@@ -520,7 +507,6 @@ static const struct instance_globals_l g_init_l = {
DUMMY, /* lua_ver[LUA_VER_BUFSIZ] */ DUMMY, /* lua_ver[LUA_VER_BUFSIZ] */
DUMMY, /* lua_copyright[LUA_COPYRIGHT_BUFSIZ] */ DUMMY, /* lua_copyright[LUA_COPYRIGHT_BUFSIZ] */
TRUE, /* havestate*/ TRUE, /* havestate*/
IVMAGIC /* l_magic to validate that structure layout has been preserved */
}; };
static const struct instance_globals_m g_init_m = { static const struct instance_globals_m g_init_m = {
@@ -569,7 +555,6 @@ static const struct instance_globals_m g_init_m = {
/* trap.c */ /* trap.c */
FALSE, /* mentioned_water */ FALSE, /* mentioned_water */
TRUE, /* havestate*/ TRUE, /* havestate*/
IVMAGIC /* m_magic to validate that structure layout has been preserved */
}; };
static const struct instance_globals_n g_init_n = { static const struct instance_globals_n g_init_n = {
@@ -604,7 +589,6 @@ static const struct instance_globals_n g_init_n = {
STRANGE_OBJECT, /* nocreate3 */ STRANGE_OBJECT, /* nocreate3 */
STRANGE_OBJECT, /* nocreate4 */ STRANGE_OBJECT, /* nocreate4 */
TRUE, /* havestate*/ TRUE, /* havestate*/
IVMAGIC /* n_magic to validate that structure layout has been preserved */
}; };
static const struct instance_globals_o g_init_o = { static const struct instance_globals_o g_init_o = {
@@ -648,7 +632,6 @@ static const struct instance_globals_o g_init_o = {
/* zap.c */ /* zap.c */
FALSE, /* obj_zapped */ FALSE, /* obj_zapped */
TRUE, /* havestate*/ TRUE, /* havestate*/
IVMAGIC /* o_magic to validate that structure layout has been preserved */
}; };
static const struct instance_globals_p g_init_p = { static const struct instance_globals_p g_init_p = {
@@ -684,12 +667,10 @@ static const struct instance_globals_p g_init_p = {
/* zap.c */ /* zap.c */
UNDEFINED_VALUE, /* poly_zap */ UNDEFINED_VALUE, /* poly_zap */
TRUE, /* havestate*/ TRUE, /* havestate*/
IVMAGIC /* p_magic to validate that structure layout has been preserved */
}; };
static const struct instance_globals_q g_init_q = { static const struct instance_globals_q g_init_q = {
TRUE, /* havestate*/ TRUE, /* havestate*/
IVMAGIC /* q_magic to validate that structure layout has been preserved */
}; };
static const struct instance_globals_r g_init_r = { static const struct instance_globals_r g_init_r = {
@@ -710,7 +691,6 @@ static const struct instance_globals_r g_init_r = {
/* shk.c */ /* shk.c */
UNDEFINED_VALUES, /* repo */ UNDEFINED_VALUES, /* repo */
TRUE, /* havestate*/ TRUE, /* havestate*/
IVMAGIC /* r_magic to validate that structure layout has been preserved */
}; };
static const struct instance_globals_s g_init_s = { static const struct instance_globals_s g_init_s = {
@@ -767,7 +747,6 @@ static const struct instance_globals_s g_init_s = {
/* vision.c */ /* vision.c */
0, /* seethru */ 0, /* seethru */
TRUE, /* havestate*/ TRUE, /* havestate*/
IVMAGIC /* s_magic to validate that structure layout has been preserved */
}; };
static const struct instance_globals_t g_init_t = { static const struct instance_globals_t g_init_t = {
@@ -802,7 +781,6 @@ static const struct instance_globals_t g_init_t = {
0, /* twohits */ 0, /* twohits */
/**/ /**/
TRUE, /* havestate*/ TRUE, /* havestate*/
IVMAGIC /* t_magic to validate that structure layout has been preserved */
}; };
static const struct instance_globals_u g_init_u = { static const struct instance_globals_u g_init_u = {
@@ -816,7 +794,6 @@ static const struct instance_globals_u g_init_u = {
/* save.c */ /* save.c */
{ 0, 0 }, /* uz_save */ { 0, 0 }, /* uz_save */
TRUE, /* havestate*/ TRUE, /* havestate*/
IVMAGIC /* u_magic to validate that structure layout has been preserved */
}; };
static const struct instance_globals_v g_init_v = { static const struct instance_globals_v g_init_v = {
@@ -842,7 +819,6 @@ static const struct instance_globals_v g_init_v = {
FALSE, /* vision_full_recalc */ FALSE, /* vision_full_recalc */
UNDEFINED_VALUES, /* voice */ UNDEFINED_VALUES, /* voice */
TRUE, /* havestate*/ TRUE, /* havestate*/
IVMAGIC /* v_magic to validate that structure layout has been preserved */
}; };
static const struct instance_globals_w g_init_w = { static const struct instance_globals_w g_init_w = {
@@ -860,7 +836,6 @@ static const struct instance_globals_w g_init_w = {
/* new */ /* new */
{ wdmode_traditional, NO_COLOR }, /* wsettings */ { wdmode_traditional, NO_COLOR }, /* wsettings */
TRUE, /* havestate*/ TRUE, /* havestate*/
IVMAGIC /* w_magic to validate that structure layout has been preserved */
}; };
static const struct instance_globals_x g_init_x = { static const struct instance_globals_x g_init_x = {
@@ -874,7 +849,6 @@ static const struct instance_globals_x g_init_x = {
UNDEFINED_VALUE, /* xstart */ UNDEFINED_VALUE, /* xstart */
UNDEFINED_VALUE, /* xsize */ UNDEFINED_VALUE, /* xsize */
TRUE, /* havestate*/ TRUE, /* havestate*/
IVMAGIC /* x_magic to validate that structure layout has been preserved */
}; };
static const struct instance_globals_y g_init_y = { static const struct instance_globals_y g_init_y = {
@@ -888,7 +862,6 @@ static const struct instance_globals_y g_init_y = {
UNDEFINED_VALUE, /* ystart */ UNDEFINED_VALUE, /* ystart */
UNDEFINED_VALUE, /* ysize */ UNDEFINED_VALUE, /* ysize */
TRUE, /* havestate*/ TRUE, /* havestate*/
IVMAGIC /* y_magic to validate that structure layout has been preserved */
}; };
static const struct instance_globals_z g_init_z = { static const struct instance_globals_z g_init_z = {
@@ -897,7 +870,6 @@ static const struct instance_globals_z g_init_z = {
/* muse.c */ /* muse.c */
FALSE, /* zap_oseen */ FALSE, /* zap_oseen */
TRUE, /* havestate*/ TRUE, /* havestate*/
IVMAGIC /* z_magic to validate that structure layout has been preserved */
}; };
static const struct instance_globals_saved_b init_svb = { static const struct instance_globals_saved_b init_svb = {
@@ -1092,12 +1064,6 @@ const struct const_globals cg = {
#define MAGICCHECK(xx) \ #define MAGICCHECK(xx) \
do { \ do { \
if ((xx).magic != IVMAGIC) { \
raw_printf( \
"decl_globals_init: %s.magic in unexpected state (%lx).", \
#xx, (xx).magic); \
exit(1); \
} \
if ((xx).havestate != TRUE) { \ if ((xx).havestate != TRUE) { \
raw_printf( \ raw_printf( \
"decl_globals_init: %s.havestate not True.", #xx); \ "decl_globals_init: %s.havestate not True.", #xx); \