fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 18:18:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ir3/parser: Print the line where parsing error occurred

Browse source 
Super useful with rddecompiler, otherwise it's impossible to
determine the instruction which is failed to be parsed.

Signed-off-by: Danylo Piliaiev <dpiliaiev@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31954>
This commit is contained in:
Danylo Piliaiev 2024-11-04 12:38:08 +01:00 • committed by Marge Bot
parent 30d9166d80
commit 21359417ba
2 changed files with 38 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/freedreno/ir3/ir3_lexer.l
View file

@ -32,6 +32,39 @@
#define TOKEN(t) (ir3_yylval.tok = t)
extern YYSTYPE ir3_yylval;
extern void *ir3_parser_dead_ctx;
extern char *current_line;
const char *input_buffer = NULL;
size_t input_buffer_len = 256;
/**
* Return up to max_size chars from the current input_buffer. Reads a new
* line into the input_buffer if it is currently empty.
*/
static size_t yy_input(char *buf, size_t max_size)
{
if (!input_buffer)
current_line = malloc(input_buffer_len);
if (!input_buffer || !strlen(input_buffer)) {
if (getline(&current_line, &input_buffer_len, ir3_yyin) < 0) {
if (ferror(ir3_yyin))
fprintf(stderr, "Could not read input:\n");
} else {
input_buffer = current_line;
}
}
size_t to_copy = MIN2(max_size, strlen(input_buffer));
memcpy(buf, input_buffer, to_copy);
input_buffer += to_copy;
return to_copy;
}
#define YY_INPUT(buf, result, max_size) \
result = yy_input(buf, max_size);
void ir3_yyset_input(FILE *f);
@ -39,6 +72,8 @@ void ir3_yyset_input(FILE *f)
{
YY_FLUSH_BUFFER;
ir3_yyin = f;
if (input_buffer)
input_buffer = "";
}
static int parse_wrmask(const char *src)

4
src/freedreno/ir3/ir3_parser.y
View file

@ -72,6 +72,8 @@ static struct hash_table *labels;
void *ir3_parser_dead_ctx;
char* current_line;
static struct {
unsigned flags;
unsigned repeat;
@ -297,7 +299,7 @@ int yyparse(void);
static void yyerror(const char *error)
{
fprintf(stderr, "error at line %d: %s\n", ir3_yyget_lineno(), error);
fprintf(stderr, "error at line %d: %s\n%s\n", ir3_yyget_lineno(), error, current_line);
}
struct ir3 * ir3_parse(struct ir3_shader_variant *v,