}
static int
-devinfo_to_gen(const struct gen_device_info *devinfo)
+devinfo_to_gen(const struct gen_device_info *devinfo, bool x10)
{
- int value = 10 * devinfo->gen;
-
- if (devinfo->is_baytrail || devinfo->is_haswell)
- value += 5;
+ if (devinfo->is_baytrail || devinfo->is_haswell) {
+ return devinfo->gen * 10 + 5;
+ }
- return value;
+ return x10 ? devinfo->gen * 10 : devinfo->gen;
}
static uint32_t zlib_inflate(const void *compressed_data,
uint8_t *text_data = NULL;
uint32_t text_offset = 0, text_length = 0;
MAYBE_UNUSED uint32_t total_length;
- uint32_t gen_10 = devinfo_to_gen(devinfo);
+ uint32_t gen_10 = devinfo_to_gen(devinfo, true);
for (int i = 0; i < ARRAY_SIZE(genxml_files_table); i++) {
if (genxml_files_table[i].gen_10 == gen_10) {
FILE *input;
len = snprintf(filename, filename_len, "%s/gen%i.xml",
- path, devinfo_to_gen(devinfo));
+ path, devinfo_to_gen(devinfo, false));
assert(len < filename_len);
input = fopen(filename, "r");
ctx.spec = gen_spec_init();
if (ctx.spec == NULL) {
fprintf(stderr, "Failed to create gen_spec\n");
- return NULL;
+ goto end;
}
do {
buf = XML_GetBuffer(ctx.parser, XML_BUFFER_SIZE);
len = fread(buf, 1, XML_BUFFER_SIZE, input);
- if (len == 0) {
+ if (ferror(input)) {
fprintf(stderr, "fread: %m\n");
- free(ctx.spec);
+ gen_spec_destroy(ctx.spec);
ctx.spec = NULL;
goto end;
- }
+ } else if (feof(input))
+ goto end;
+
if (XML_ParseBuffer(ctx.parser, len, len == 0) == 0) {
fprintf(stderr,
"Error parsing XML at line %ld col %ld: %s\n",
XML_GetCurrentLineNumber(ctx.parser),
XML_GetCurrentColumnNumber(ctx.parser),
XML_ErrorString(XML_GetErrorCode(ctx.parser)));
- free(ctx.spec);
+ gen_spec_destroy(ctx.spec);
ctx.spec = NULL;
goto end;
}
fclose(input);
free(filename);
+ /* free ctx.spec if genxml is empty */
+ if (ctx.spec && _mesa_hash_table_num_entries(ctx.spec->commands) == 0) {
+ gen_spec_destroy(ctx.spec);
+ return NULL;
+ }
+
return ctx.spec;
}
struct gen_group *
gen_spec_find_instruction(struct gen_spec *spec, const uint32_t *p)
{
- struct hash_entry *entry;
-
hash_table_foreach(spec->commands, entry) {
struct gen_group *command = entry->data;
uint32_t opcode = *p & command->opcode_mask;