fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 00:00:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

intel/decoder: add gen_spec_init method

Browse source 
Initialize gen_spec instance properly when loading hardware xml
description from specifc directory to avoid segmentation fault.

v2: correct function definition (Lionel Landwerlin)

Signed-off-by: Sagar Ghuge <sagar.ghuge@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
This commit is contained in:
Sagar Ghuge 2018-09-05 21:05:21 -07:00 • committed by Lionel Landwerlin
parent 2b34985d93
commit ba3304e764
1 changed files with 35 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
src/intel/common/gen_decoder.c
View file

@ -526,6 +526,30 @@ static uint32_t _hash_uint32(const void *key)
return (uint32_t) (uintptr_t) key;
}
static struct gen_spec *
gen_spec_init(void)
{
struct gen_spec *spec;
spec = rzalloc(NULL, struct gen_spec);
if (spec == NULL)
return NULL;
spec->commands =
_mesa_hash_table_create(spec, _mesa_hash_string, _mesa_key_string_equal);
spec->structs =
_mesa_hash_table_create(spec, _mesa_hash_string, _mesa_key_string_equal);
spec->registers_by_name =
_mesa_hash_table_create(spec, _mesa_hash_string, _mesa_key_string_equal);
spec->registers_by_offset =
_mesa_hash_table_create(spec, _hash_uint32, _mesa_key_pointer_equal);
spec->enums =
_mesa_hash_table_create(spec, _mesa_hash_string, _mesa_key_string_equal);
spec->access_cache =
_mesa_hash_table_create(spec, _mesa_hash_string, _mesa_key_string_equal);
return spec;
}
struct gen_spec *
gen_spec_load(const struct gen_device_info *devinfo)
{
@ -560,21 +584,11 @@ gen_spec_load(const struct gen_device_info *devinfo)
XML_SetElementHandler(ctx.parser, start_element, end_element);
XML_SetCharacterDataHandler(ctx.parser, character_data);
ctx.spec = rzalloc(NULL, struct gen_spec);
ctx.spec->commands =
_mesa_hash_table_create(ctx.spec, _mesa_hash_string, _mesa_key_string_equal);
ctx.spec->structs =
_mesa_hash_table_create(ctx.spec, _mesa_hash_string, _mesa_key_string_equal);
ctx.spec->registers_by_name =
_mesa_hash_table_create(ctx.spec, _mesa_hash_string, _mesa_key_string_equal);
ctx.spec->registers_by_offset =
_mesa_hash_table_create(ctx.spec, _hash_uint32, _mesa_key_pointer_equal);
ctx.spec->enums =
_mesa_hash_table_create(ctx.spec, _mesa_hash_string, _mesa_key_string_equal);
ctx.spec->access_cache =
_mesa_hash_table_create(ctx.spec, _mesa_hash_string, _mesa_key_string_equal);
ctx.spec = gen_spec_init();
if (ctx.spec == NULL) {
fprintf(stderr, "Failed to create gen_spec\n");
return NULL;
}
total_length = zlib_inflate(compress_genxmls,
sizeof(compress_genxmls),
@ -636,7 +650,12 @@ gen_spec_load_from_path(const struct gen_device_info *devinfo,
XML_SetElementHandler(ctx.parser, start_element, end_element);
XML_SetCharacterDataHandler(ctx.parser, character_data);
ctx.loc.filename = filename;
ctx.spec = rzalloc(NULL, struct gen_spec);
ctx.spec = gen_spec_init();
if (ctx.spec == NULL) {
fprintf(stderr, "Failed to create gen_spec\n");
return NULL;
}
do {
buf = XML_GetBuffer(ctx.parser, XML_BUFFER_SIZE);