qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-01-30 12:40:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

linker.c:

Browse source 
don't seg on uninitialized fields
qc-parse.y:
	support @extern and @static blocks (eg, @extern { ... };)
This commit is contained in:
Bill Currie 2002-09-12 17:13:19 +00:00
parent 774b0adc2b
commit 842a9d2eb0
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
tools/qfcc/source/linker.c
View file

@ -410,7 +410,8 @@ fixup_relocs ()
case rel_def_field: case rel_def_field:
field_def = Hash_Find (field_defs, field_def = Hash_Find (field_defs,
strings->strings + def->name); strings->strings + def->name);
data->data[reloc->ofs].integer_var = field_def->ofs; if (field_def) // null if not initialized
data->data[reloc->ofs].integer_var = field_def->ofs;
break; break;
} }
} }

16
tools/qfcc/source/qc-parse.y
View file

@ -193,7 +193,9 @@ defs
; ;
def def
: storage_class type { current_type = $2; } def_list : type { current_storage = st_global; current_type = $1; } def_list
| storage_class type { current_type = $2; } def_list
| storage_class '{' simple_defs '}'
| STRUCT NAME | STRUCT NAME
{ struct_type = new_struct ($2); } '=' '{' struct_defs '}' { struct_type = new_struct ($2); } '=' '{' struct_defs '}'
| UNION NAME | UNION NAME
@ -209,9 +211,17 @@ def
} }
; ;
simple_defs
: /* empty */
| simple_defs simple_def ';'
;
simple_def
: type { current_type = $1; } def_list
;
storage_class storage_class
: /* empty */ { current_storage = st_global; } : EXTERN { current_storage = st_extern; }
| EXTERN { current_storage = st_extern; }
| STATIC { current_storage = st_static; } | STATIC { current_storage = st_static; }
; ;