qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-04-06 01:11:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

[qfcc] Use rua_loc_t for most location information

Browse source 
This gets rid of the simple source_file and source_line in pr_info_t, so
all expressions, and many other things have full location information.
This commit is contained in:
Bill Currie 2023-11-06 13:41:17 +09:00
parent bd2bc16767
commit d21260d9f6
32 changed files with 340 additions and 265 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
tools/qfcc/include/Makemodule.am
View file

@ -28,6 +28,7 @@ EXTRA_DIST += \
tools/qfcc/include/qfcc.h \
tools/qfcc/include/qfprogs.h \
tools/qfcc/include/reloc.h \
tools/qfcc/include/specifier.h \
tools/qfcc/include/shared.h \
tools/qfcc/include/statements.h \
tools/qfcc/include/strpool.h \

2
tools/qfcc/include/debug.h
View file

@ -36,8 +36,6 @@
typedef struct expr_s expr_t;
void set_line_file (int line, const char *file, int flags);
void line_info (const expr_t *line_expr, const char *text,
const expr_t *flags_epxr);
pr_lineno_t *new_lineno (void);
void add_source_file (const char *file);
void debug_finish_module (const char *modname);

18
tools/qfcc/include/def.h
View file

@ -34,6 +34,9 @@
#include "QF/progs/pr_comp.h"
#include "QF/progs/pr_debug.h"
#include "rua-lang.h"
#include "specifier.h"
/** \defgroup qfcc_def Def handling
\ingroup qfcc
*/
@ -101,8 +104,7 @@ typedef struct def_s {
unsigned system:1; ///< system def
unsigned nosave:1; ///< don't set DEF_SAVEGLOBAL
pr_string_t file; ///< declaring/defining source file
int line; ///< declaring/defining source line
rua_loc_t loc; ///< declaring/defining source location
int qfo_def; ///< index to def in qfo defs
@ -110,18 +112,6 @@ typedef struct def_s {
void *free_addr; ///< who freed this
} def_t;
/** Specify the storage class of a def.
*/
typedef enum storage_class_e {
sc_global, ///< def is globally visible across units
sc_system, ///< def may be redefined once
sc_extern, ///< def is externally allocated
sc_static, ///< def is private to the current unit
sc_param, ///< def is an incoming function parameter
sc_local, ///< def is local to the current function
sc_argument, ///< def is a function argument
} storage_class_t;
/** Create a new def.
Defs may be unnamed.

5
tools/qfcc/include/expr.h
View file

@ -33,6 +33,8 @@
#include "QF/progs/pr_comp.h"
#include "rua-lang.h"
typedef struct type_s type_t;
typedef struct expr_s expr_t;
typedef struct algebra_s algebra_t;
@ -311,9 +313,8 @@ typedef struct {
typedef struct expr_s {
expr_t *next;
rua_loc_t loc; ///< source location of expression
expr_type type; ///< the type of the result of this expression
int line; ///< source line that generated this expression
pr_string_t file; ///< source file that generated this expression
int printid; ///< avoid duplicate output when printing
unsigned paren:1; ///< the expression is enclosed in ()
unsigned rvalue:1; ///< the expression is on the right side of =

3
tools/qfcc/include/function.h
View file

@ -56,8 +56,7 @@ typedef struct overloaded_function_s {
///< encoding
const struct type_s *type; ///< type of this function
int overloaded; ///< is this function overloaded
pr_string_t file; ///< source file of the function
int line; ///< source line of this function
rua_loc_t loc; ///< source location of the function
} overloaded_function_t;
/** Internal representation of a function.

8
tools/qfcc/include/qfcc.h
View file

@ -37,6 +37,8 @@
#include "QF/darray.h"
#include "QF/progs/pr_comp.h"
#include "rua-lang.h"
/** \defgroup qfcc_general General functions
\ingroup qfcc
*/
@ -45,8 +47,7 @@
typedef struct srcline_s srcline_t;
struct srcline_s {
srcline_t *next;
pr_string_t source_file;
int source_line;
rua_loc_t loc;
};
/** Output generated by prog parsing.
@ -79,8 +80,7 @@ typedef struct pr_info_s {
struct symtab_s *entity_fields;
srcline_t *srcline_stack;
pr_string_t source_file;
int source_line;
rua_loc_t loc;
int error_count;
struct reloc_s *relocs;

9
tools/qfcc/include/rua-lang.h
View file

@ -28,14 +28,15 @@
#ifndef __rua_lang_h
#define __rua_lang_h
#include "tools/qfcc/source/qc-parse.h"
typedef struct rua_loc_s {
int first_line, first_column;
int line, column;
int last_line, last_column;
int file;
} rua_loc_t;
#include "tools/qfcc/source/qc-parse.h"
typedef struct expr_s expr_t;
typedef struct symtab_s symtab_t;
typedef struct rua_expr_s {
@ -106,6 +107,8 @@ void rua_undefine (const char *sym, void *scanner);
void rua_include_file (const char *name, void *scanner);
void rua_embed_file (const char *name, void *scanner);
int rua_parse_define (const char *def);
void rua_line_info (const expr_t *line_expr, const char *text,
const expr_t *flags_epxr, void *scanner);
void rua_macro_file (rua_macro_t *macro, void *scanner);
void rua_macro_line (rua_macro_t *macro, void *scanner);

72
tools/qfcc/include/specifier.h Normal file
View file

@ -0,0 +1,72 @@
/*
specifier.h
type system
Copyright (C) 2001 Bill Currie <bill@taniwha.org>
Author: Bill Currie <bill@taniwha.org>
Date: 2001/12/11
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to:
Free Software Foundation, Inc.
59 Temple Place - Suite 330
Boston, MA 02111-1307, USA
*/
#ifndef __specifier_h
#define __specifier_h
typedef struct type_s type_t;
/** Specify the storage class of a def.
*/
typedef enum storage_class_e {
sc_global, ///< def is globally visible across units
sc_system, ///< def may be redefined once
sc_extern, ///< def is externally allocated
sc_static, ///< def is private to the current unit
sc_param, ///< def is an incoming function parameter
sc_local, ///< def is local to the current function
sc_argument, ///< def is a function argument
} storage_class_t;
typedef struct specifier_s {
type_t *type;
struct param_s *params;
struct symbol_s *sym;
storage_class_t storage;
union {
struct {
unsigned multi_type:1;
unsigned multi_store:1;
unsigned is_signed:1;
unsigned is_unsigned:1;
unsigned is_short:1;
unsigned is_long:1;
unsigned is_typedef:1;
unsigned is_overload:1;
unsigned is_function:1;//FIXME do proper void(*)() -> ev_func
unsigned nosave:1;
unsigned no_va_list:1;
unsigned void_return:1;
};
unsigned spec_bits;
};
} specifier_t;
#endif//__type_h

26
tools/qfcc/include/type.h
View file

@ -33,7 +33,7 @@
#include "QF/progs/pr_type.h"
#include "def.h"
#include "specifier.h"
typedef struct ty_func_s {
struct type_s *type;
@ -92,30 +92,6 @@ typedef struct type_s {
struct def_s *type_def; ///< offset of qfo encodoing
} type_t;
typedef struct specifier_s {
type_t *type;
struct param_s *params;
struct symbol_s *sym;
storage_class_t storage;
union {
struct {
unsigned multi_type:1;
unsigned multi_store:1;
unsigned is_signed:1;
unsigned is_unsigned:1;
unsigned is_short:1;
unsigned is_long:1;
unsigned is_typedef:1;
unsigned is_overload:1;
unsigned is_function:1;//FIXME do proper void(*)() -> ev_func
unsigned nosave:1;
unsigned no_va_list:1;
unsigned void_return:1;
};
unsigned spec_bits;
};
} specifier_t;
#define EV_TYPE(type) extern type_t type_##type;
#include "QF/progs/pr_type_names.h"

1
tools/qfcc/include/value.h
View file

@ -71,6 +71,7 @@ struct ex_value_s *offset_alias_value (struct ex_value_s *value,
struct type_s *type, int offset);
struct ex_value_s *alias_value (struct ex_value_s *value, struct type_s *type);
struct def_s *emit_value (struct ex_value_s *value, struct def_s *def);
struct defspace_s;
struct def_s *emit_value_core (struct ex_value_s *value, struct def_s *def,
struct defspace_s *defspace);

2
tools/qfcc/source/class.c
View file

@ -1620,7 +1620,7 @@ class_finish_module (void)
module = &D_STRUCT (pr_module_t, module_sym->s.def);
module->size = type_size (&type_module);
EMIT_STRING (module_sym->s.def->space, module->name,
GETSTR (pr.source_file));
GETSTR (pr.loc.file));
EMIT_DEF (module_sym->s.def->space, module->symtab, symtab_def);
exec_class_sym = symtab_lookup (pr.symtab, "__obj_exec_class");

35
tools/qfcc/source/debug.c
View file

@ -66,8 +66,7 @@ push_source_file (void)
{
srcline_t *srcline;
ALLOC (16, srcline_t, srclines, srcline);
srcline->source_file = pr.source_file;
srcline->source_line = pr.source_line;
srcline->loc = pr.loc;
srcline->next = pr.srcline_stack;
pr.srcline_stack = srcline;
}
@ -82,8 +81,7 @@ pop_source_file (void)
return;
}
tmp = pr.srcline_stack;
pr.source_file = tmp->source_file;
pr.source_line = tmp->source_line;
pr.loc = tmp->loc;
pr.srcline_stack = tmp->next;
FREE (srclines, tmp);
}
@ -92,7 +90,7 @@ pop_source_file (void)
void
add_source_file (const char *file)
{
pr.source_file = ReuseString (file);
pr.loc.file = ReuseString (file);
if (!strpool_findstr (pr.comp_file_set, file)) {
strpool_addstr (pr.comp_file_set, file);
DARRAY_APPEND (&pr.comp_files, save_string (file));
@ -108,33 +106,22 @@ set_line_file (int line, const char *file, int flags)
break;
case 2:
pop_source_file ();
file = GETSTR (pr.source_file);
line = pr.source_line;
file = GETSTR (pr.loc.file);
line = pr.loc.line;
break;
}
pr.source_line = line;
pr.loc = (rua_loc_t) {
.line = line,
.column = 1,
.last_line = line,
.last_column = 1,
};
if (file) {
add_source_file (file);
cpp_set_quote_file (file);
}
}
void
line_info (const expr_t *line_expr, const char *file, const expr_t *flags_expr)
{
int line = expr_long (line_expr);
int flags = flags_expr ? expr_long (flags_expr) : 0;
if (file) {
if (*file != '"') {
error (0, "\"%s\" is not a valid filename", file);
return;
}
file = make_string (file, 0);
}
set_line_file (line, file, flags);
}
pr_lineno_t *
new_lineno (void)
{

15
tools/qfcc/source/def.c
View file

@ -131,8 +131,7 @@ new_def (const char *name, type_t *type, defspace_t *space,
def->name = name ? save_string (name) : 0;
def->type = type;
def->file = pr.source_file;
def->line = pr.source_line;
def->loc = pr.loc;
set_storage_bits (def, storage);
@ -196,8 +195,7 @@ cover_alias_def (def_t *def, type_t *type, int offset)
alias->offset_reloc = 1;
alias->type = type;
alias->alias = def;
alias->line = pr.source_line;
alias->file = pr.source_file;
alias->loc = pr.loc;
alias->next = def->alias_defs;
alias->reg = def->reg;
def->alias_defs = alias;
@ -208,9 +206,9 @@ def_t *
alias_def (def_t *def, type_t *type, int offset)
{
if (def->alias) {
expr_t e;
e.file = def->file;
e.line = def->line;
expr_t e = {
.loc = def->loc,
};
internal_error (&e, "aliasing an alias def");
}
if (type_size (type) > type_size (def->type))
@ -246,8 +244,7 @@ temp_def (type_t *type)
}
temp->return_addr = __builtin_return_address (0);
temp->type = type;
temp->file = pr.source_file;
temp->line = pr.source_line;
temp->loc = pr.loc;
set_storage_bits (temp, sc_local);
temp->space = space;
temp->reg = current_func->temp_reg;

25
tools/qfcc/source/diagnostic.c
View file

@ -51,16 +51,17 @@ report_function (const expr_t *e)
{
static function_t *last_func = (function_t *)-1L;
static pr_string_t last_file;
pr_string_t file = pr.source_file;
pr_string_t file = pr.loc.file;
srcline_t *srcline;
if (e)
file = e->file;
if (e) {
file = e->loc.file;
}
if (file != last_file) {
for (srcline = pr.srcline_stack; srcline; srcline = srcline->next)
fprintf (stderr, "In file included from %s:%d:\n",
GETSTR (srcline->source_file), srcline->source_line);
GETSTR (srcline->loc.file), srcline->loc.line);
}
last_file = file;
if (!options.preprocess_only && current_func != last_func) {
@ -80,11 +81,11 @@ report_function (const expr_t *e)
void
print_srcline (int rep, const expr_t *e)
{
pr_string_t file = pr.source_file;
int line = pr.source_line;
pr_string_t file = pr.loc.file;
int line = pr.loc.line;
if (e) {
file = e->file;
line = e->line;
file = e->loc.file;
line = e->loc.line;
}
if (rep) {
report_function (e);
@ -96,13 +97,13 @@ static __attribute__((format(PRINTF, 4, 0))) void
format_message (dstring_t *message, const char *msg_type, const expr_t *e,
const char *fmt, va_list args)
{
pr_string_t file = pr.source_file;
int line = pr.source_line;
pr_string_t file = pr.loc.file;
int line = pr.loc.line;
const char *colon = fmt ? ": " : "";
if (e) {
file = e->file;
line = e->line;
file = e->loc.file;
line = e->loc.line;
}
dsprintf (message, "%s:%d: %s%s", GETSTR (file), line, msg_type, colon);
if (fmt) {

60
tools/qfcc/source/dot_expr.c
View file

@ -115,7 +115,7 @@ print_error (dstring_t *dstr, const expr_t *e, int level, int id, const expr_t *
int indent = level * 2 + 2;
dasprintf (dstr, "%*se_%p [label=\"(error)\\n%d\"];\n", indent, "", e,
e->line);
e->loc.line);
}
static void
@ -152,7 +152,7 @@ print_bool (dstring_t *dstr, const expr_t *e, int level, int id, const expr_t *n
"cellspacing=\"0\">\n",
indent + 2, "");
dasprintf (dstr, "%*s<tr><td colspan=\"2\">&lt;boolean&gt;(%d)</td></tr>\n",
indent + 4, "", e->line);
indent + 4, "", e->loc.line);
dasprintf (dstr, "%*s<tr><td>true</td><td>false</td></tr>\n",
indent + 4, "");
if (boolean->true_list)
@ -197,7 +197,7 @@ print_label (dstring_t *dstr, const expr_t *e, int level, int id, const expr_t *
dasprintf (dstr, "%*se_%p -> e_%p [constraint=true,style=dashed];\n",
indent, "", e, next);
dasprintf (dstr, "%*se_%p [label=\"%s\\n%d\"];\n", indent, "", e,
e->label.name, e->line);
e->label.name, e->loc.line);
}
static void
@ -209,7 +209,7 @@ print_labelref (dstring_t *dstr, const expr_t *e, int level, int id, const expr_
dasprintf (dstr, "%*se_%p -> e_%p [constraint=true,style=dashed];\n",
indent, "", e, next);
dasprintf (dstr, "%*se_%p [label=\"&%s\\n%d\"];\n", indent, "", e,
e->label.name, e->line);
e->label.name, e->loc.line);
}
static void
@ -229,7 +229,7 @@ print_block (dstring_t *dstr, const expr_t *e, int level, int id,
dasprintf (dstr, "%*s<table border=\"0\" cellborder=\"1\" "
"cellspacing=\"0\">\n", indent + 2, "");
dasprintf (dstr, "%*s<tr><td colspan=\"%d\">&lt;block&gt;(%d)%s</td>"
"</tr>\n", indent + 4, "", colspan, e->line,
"</tr>\n", indent + 4, "", colspan, e->loc.line,
e->block.is_call ? "c" : "");
if (e->block.result)
dasprintf (dstr, "%*s<tr><td colspan=\"%d\" port=\"result\">=</td>"
@ -238,7 +238,7 @@ print_block (dstring_t *dstr, const expr_t *e, int level, int id,
dasprintf (dstr, "%*s<tr>\n", indent + 4, "");
for (int i = 0; i < num_exprs; i++) {
dasprintf (dstr, "%*s<td>%d</td>\n", indent + 8, "",
exprs[i]->line);
exprs[i]->loc.line);
}
dasprintf (dstr, "%*s</tr>\n", indent + 4, "");
dasprintf (dstr, "%*s<tr>\n", indent + 4, "");
@ -280,12 +280,12 @@ print_list (dstring_t *dstr, const expr_t *e, int level, int id,
dasprintf (dstr, "%*s<table border=\"0\" cellborder=\"1\" "
"cellspacing=\"0\">\n", indent + 2, "");
dasprintf (dstr, "%*s<tr><td colspan=\"%d\">&lt;list&gt;(%d)</td>"
"</tr>\n", indent + 4, "", colspan, e->line);
"</tr>\n", indent + 4, "", colspan, e->loc.line);
if (num_exprs) {
dasprintf (dstr, "%*s<tr>\n", indent + 4, "");
for (int i = 0; i < num_exprs; i++) {
dasprintf (dstr, "%*s<td>%d</td>\n", indent + 8, "",
exprs[i]->line);
exprs[i]->loc.line);
}
dasprintf (dstr, "%*s</tr>\n", indent + 4, "");
dasprintf (dstr, "%*s<tr>\n", indent + 4, "");
@ -317,7 +317,7 @@ print_subexpr (dstring_t *dstr, const expr_t *e, int level, int id, const expr_t
dasprintf (dstr, "%*se_%p -> \"e_%p\" [label=\"r\"];\n", indent, "", e,
e->expr.e2);
dasprintf (dstr, "%*se_%p [label=\"%s\\n%d\"];\n", indent, "", e,
get_op_string (e->expr.op), e->line);
get_op_string (e->expr.op), e->loc.line);
}
static void
@ -337,7 +337,7 @@ print_alias (dstring_t *dstr, const expr_t *e, int level, int id, const expr_t *
dstring_t *typestr = dstring_newstr();
print_type_str (typestr, e->alias.type);
dasprintf (dstr, "%*se_%p [label=\"%s (%s)\\n%d\"];\n", indent, "", e,
"<alias>", typestr->str, e->line);
"<alias>", typestr->str, e->loc.line);
dstring_delete (typestr);
}
@ -358,7 +358,7 @@ print_address (dstring_t *dstr, const expr_t *e, int level, int id, const expr_t
dstring_t *typestr = dstring_newstr();
print_type_str (typestr, e->address.type);
dasprintf (dstr, "%*se_%p [label=\"%s (%s)\\n%d\"];\n", indent, "", e,
"&", typestr->str, e->line);
"&", typestr->str, e->loc.line);
dstring_delete (typestr);
}
@ -375,7 +375,7 @@ print_assign (dstring_t *dstr, const expr_t *e, int level, int id, const expr_t
e->assign.src);
dasprintf (dstr, "%*se_%p [label=\"%s\\n%d\"];\n", indent, "", e,
"=", e->line);
"=", e->loc.line);
}
static void
@ -396,7 +396,7 @@ print_conditional (dstring_t *dstr, const expr_t *e, int level, int id, const ex
"style=dashed];\n", indent, "", e, next);
}
dasprintf (dstr, "%*se_%p [label=\"%s\\n%d\"];\n", indent, "", e,
condition [e->branch.type], e->line);
condition [e->branch.type], e->loc.line);
}
static void
@ -406,7 +406,7 @@ print_jump (dstring_t *dstr, const expr_t *e, int level, int id, const expr_t *n
_print_expr (dstr, e->branch.target, level, id, next);
dasprintf (dstr, "%*se_%p [label=\"%s\\n%d\"];\n", indent, "", e,
"jump", e->line);
"jump", e->loc.line);
dasprintf (dstr, "%*se_%p -> \"e_%p\";\n", indent, "", e,
e->branch.target);
}
@ -465,7 +465,7 @@ print_return (dstring_t *dstr, const expr_t *e, int level, int id, const expr_t
e->retrn.ret_val);
}
dasprintf (dstr, "%*se_%p [label=\"%s\\n%d\"];\n", indent, "", e,
"return", e->line);
"return", e->loc.line);
}
static void
@ -476,7 +476,7 @@ print_uexpr (dstring_t *dstr, const expr_t *e, int level, int id, const expr_t *
_print_expr (dstr, e->expr.e1, level, id, next);
dasprintf (dstr, "%*se_%p -> \"e_%p\";\n", indent, "", e, e->expr.e1);
dasprintf (dstr, "%*se_%p [label=\"%s\\n%d\"];\n", indent, "", e,
get_op_string (e->expr.op), e->line);
get_op_string (e->expr.op), e->loc.line);
}
static void
@ -485,7 +485,7 @@ print_def (dstring_t *dstr, const expr_t *e, int level, int id, const expr_t *ne
int indent = level * 2 + 2;
dasprintf (dstr, "%*se_%p [label=\"d %s\\n%d\"];\n", indent, "", e,
e->def->name, e->line);
e->def->name, e->loc.line);
}
static void
@ -494,7 +494,7 @@ print_symbol (dstring_t *dstr, const expr_t *e, int level, int id, const expr_t
int indent = level * 2 + 2;
dasprintf (dstr, "%*se_%p [label=\"%s\\n%d\"];\n", indent, "", e,
e->symbol->name, e->line);
e->symbol->name, e->loc.line);
}
static void
@ -503,7 +503,7 @@ print_temp (dstring_t *dstr, const expr_t *e, int level, int id, const expr_t *n
int indent = level * 2 + 2;
dasprintf (dstr, "%*se_%p [label=\"tmp_%p\\n%d\"];\n", indent, "", e, e,
e->line);
e->loc.line);
}
static void
@ -517,7 +517,7 @@ print_vector (dstring_t *dstr, const expr_t *e, int level, int id, const expr_t
dasprintf (dstr, "%*se_%p -> \"e_%p\";\n", indent, "", e, ele);
}
dasprintf (dstr, "%*se_%p [label=\"vector %d\"];\n", indent, "", e,
e->line);
e->loc.line);
}
static void
@ -535,7 +535,7 @@ print_nil (dstring_t *dstr, const expr_t *e, int level, int id, const expr_t *ne
int indent = level * 2 + 2;
dasprintf (dstr, "%*se_%p [label=\"nil\\n%d\"];\n", indent, "", e,
e->line);
e->loc.line);
}
static void
@ -549,7 +549,7 @@ print_value (dstring_t *dstr, const expr_t *e, int level, int id, const expr_t *
label = quote_string (html_string (label));
}
dasprintf (dstr, "%*se_%p [label=\"%s\\n%d\"];\n", indent, "", e, label,
e->line);
e->loc.line);
}
static void
@ -581,7 +581,7 @@ print_adjstk (dstring_t *dstr, const expr_t *e, int level, int id, const expr_t
int indent = level * 2 + 2;
dasprintf (dstr, "%*se_%p [label=\"adjstk %d:%d\\n%d\"];\n", indent, "", e,
e->adjstk.mode, e->adjstk.offset, e->line);
e->adjstk.mode, e->adjstk.offset, e->loc.line);
}
static void
@ -593,7 +593,7 @@ print_with (dstring_t *dstr, const expr_t *e, int level, int id, const expr_t *n
_print_expr (dstr, with, level, id, next);
dasprintf (dstr, "%*se_%p -> \"e_%p\";\n", indent, "", e, with);
dasprintf (dstr, "%*se_%p [label=\"with %d:%d\\n%d\"];\n", indent, "", e,
e->with.mode, e->with.reg, e->line);
e->with.mode, e->with.reg, e->loc.line);
}
static void
@ -602,7 +602,7 @@ print_args (dstring_t *dstr, const expr_t *e, int level, int id, const expr_t *n
int indent = level * 2 + 2;
dasprintf (dstr, "%*se_%p [label=\"...\\n%d\"];\n", indent, "", e,
e->line);
e->loc.line);
}
static void
@ -613,7 +613,7 @@ print_horizontal (dstring_t *dstr, const expr_t *e, int level, int id, const exp
_print_expr (dstr, e->hop.vec, level, id, next);
dasprintf (dstr, "%*se_%p -> \"e_%p\";\n", indent, "", e, e->hop.vec);
dasprintf (dstr, "%*se_%p [label=\"hop %s\\n%d\"];\n", indent, "", e,
get_op_string (e->hop.op), e->line);
get_op_string (e->hop.op), e->loc.line);
}
static void
@ -637,7 +637,7 @@ print_swizzle (dstring_t *dstr, const expr_t *e, int level, int id, const expr_t
_print_expr (dstr, swiz.src, level, id, next);
dasprintf (dstr, "%*se_%p -> \"e_%p\";\n", indent, "", e, swiz.src);
dasprintf (dstr, "%*se_%p [label=\"swizzle %s\\n%d\"];\n", indent, "", e,
swizzle, e->line);
swizzle, e->loc.line);
}
static void
@ -657,7 +657,7 @@ print_extend (dstring_t *dstr, const expr_t *e, int level, int id, const expr_t
type_width (get_type (extend.src)), type_width (extend.type),
extend.reverse ? ":r" : "",
((const char *[]){"0", "1", "c", "-1", "?"})[ext],
e->line);
e->loc.line);
}
static void
@ -682,7 +682,7 @@ print_multivec (dstring_t *dstr, const expr_t *e, int level, int id,
dasprintf (dstr, "%*s<table border=\"0\" cellborder=\"1\" "
"cellspacing=\"0\">\n", indent + 2, "");
dasprintf (dstr, "%*s<tr><td colspan=\"%d\">&lt;multivec&gt;(%d)</td>"
"</tr>\n", indent + 4, "", colspan, e->line);
"</tr>\n", indent + 4, "", colspan, e->loc.line);
dstring_t *typestr = dstring_newstr();
print_type_str (typestr, e->multivec.type);
dasprintf (dstr, "%*s<tr><td colspan=\"%d\">%s</td></tr>\n",
@ -754,7 +754,7 @@ _print_expr (dstring_t *dstr, const expr_t *e, int level, int id,
type = expr_names[e->type];
}
dasprintf (dstr, "%*se_%p [label=\"(bad expr type: %s)\\n%d\"];\n",
indent, "", e, type, e->line);
indent, "", e, type, e->loc.line);
return;
}
print_funcs[e->type] (dstr, e, level, id, next);

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

@ -60,7 +60,8 @@ static void
flow_statement (dstring_t *dstr, statement_t *s)
{
dasprintf (dstr, " <tr>");
dasprintf (dstr, "<td>%d:%d</td>", s->number, s->expr ? s->expr->line : -1);
dasprintf (dstr, "<td>%d:%d</td>", s->number,
s->expr ? s->expr->loc.line : -1);
dasprintf (dstr, "<td>%s</td>", html_string(quote_string (s->opcode)));
dasprintf (dstr, "<td>%s</td>", html_string(operand_string (s->opa)));
dasprintf (dstr, "<td>%s</td>", html_string(operand_string (s->opb)));

9
tools/qfcc/source/emit.c
View file

@ -134,10 +134,10 @@ add_statement_def_ref (def_t *def, dstatement_t *st, int field)
int st_ofs = st - pr.code->code;
int offset_reloc = 0;
int alias_depth = 0;
expr_t alias_depth_expr;
expr_t alias_depth_expr = {
.loc = def->loc,
};
alias_depth_expr.file = def->file;
alias_depth_expr.line = def->line;
while (def->alias) {
alias_depth++;
offset_reloc |= def->offset_reloc;
@ -228,7 +228,8 @@ emit_statement (statement_t *statement)
}
if (options.code.debug) {
const expr_t *e = statement->expr;
pr_uint_t line = (e ? e->line : pr.source_line) - lineno_base;
auto loc = e ? e->loc : pr.loc;
pr_uint_t line = loc.line - lineno_base;
if (line != pr.linenos[pr.num_linenos - 1].line) {
pr_lineno_t *lineno = new_lineno ();

1
tools/qfcc/source/evaluate.c
View file

@ -39,6 +39,7 @@
#include "QF/simd/types.h"
#include "tools/qfcc/include/codespace.h"
#include "tools/qfcc/include/def.h"
#include "tools/qfcc/include/defspace.h"
#include "tools/qfcc/include/evaluate.h"
#include "tools/qfcc/include/diagnostic.h"

56
tools/qfcc/source/expr.c
View file

@ -89,7 +89,7 @@ convert_name (const expr_t *e)
}
if (!strcmp (sym->name, "__LINE__")
&& current_func) {
return new_int_expr (e->line, false);
return new_int_expr (e->loc.line, false);
}
if (!strcmp (sym->name, "__INFINITY__")
&& current_func) {
@ -97,7 +97,7 @@ convert_name (const expr_t *e)
}
if (!strcmp (sym->name, "__FILE__")
&& current_func) {
return new_string_expr (GETSTR (e->file));
return new_string_expr (GETSTR (e->loc.file));
}
if (!sym->table) {
error (e, "%s undefined", sym->name);
@ -253,8 +253,7 @@ new_expr (void)
ALLOC (16384, expr_t, exprs, e);
e->line = pr.source_line;
e->file = pr.source_file;
e->loc = pr.loc;
return e;
}
@ -396,8 +395,7 @@ list_gather (ex_list_t *list, const expr_t **exprs, int count)
expr_t *
expr_file_line (expr_t *dst, const expr_t *src)
{
dst->file = src->file;
dst->line = src->line;
dst->loc = src->loc;
return dst;
}
@ -1267,8 +1265,7 @@ new_alias_expr (type_t *type, const expr_t *expr)
alias->type = ex_alias;
alias->alias.type = type;
alias->alias.expr = expr;
alias->file = expr->file;
alias->line = expr->line;
alias->loc = expr->loc;
return edag_add_expr (alias);
}
@ -1293,8 +1290,7 @@ new_offset_alias_expr (type_t *type, const expr_t *expr, int offset)
alias->alias.type = type;
alias->alias.expr = edag_add_expr (expr);
alias->alias.offset = edag_add_expr (new_int_expr (offset, false));
alias->file = expr->file;
alias->line = expr->line;
alias->loc = expr->loc;
return edag_add_expr (alias);
}
@ -2770,8 +2766,6 @@ address_expr (const expr_t *e1, type_t *t)
const expr_t *
build_if_statement (int not, const expr_t *test, const expr_t *s1, const expr_t *els, const expr_t *s2)
{
int line = pr.source_line;
pr_string_t file = pr.source_file;
expr_t *if_expr;
expr_t *tl = new_label_expr ();
expr_t *fl = new_label_expr ();
@ -2784,8 +2778,9 @@ build_if_statement (int not, const expr_t *test, const expr_t *s1, const expr_t
warning (test,
"suggest braces around empty body in an ‘if’ statement");
}
pr.source_line = test->line;
pr.source_file = test->file;
auto saved_loc = pr.loc;
pr.loc = test->loc;
if_expr = new_block_expr (0);
@ -2804,8 +2799,7 @@ build_if_statement (int not, const expr_t *test, const expr_t *s1, const expr_t
append_expr (if_expr, s1);
if (els) {
pr.source_line = els->line;
pr.source_file = els->file;
pr.loc = els->loc;
}
if (s2) {
@ -2819,8 +2813,7 @@ build_if_statement (int not, const expr_t *test, const expr_t *s1, const expr_t
append_expr (if_expr, fl);
}
pr.source_line = line;
pr.source_file = file;
pr.loc = saved_loc;
return if_expr;
}
@ -2829,14 +2822,12 @@ const expr_t *
build_while_statement (int not, const expr_t *test, const expr_t *statement,
const expr_t *break_label, const expr_t *continue_label)
{
int line = pr.source_line;
pr_string_t file = pr.source_file;
const expr_t *l1 = new_label_expr ();
const expr_t *l2 = break_label;
expr_t *while_expr;
pr.source_line = test->line;
pr.source_file = test->file;
auto saved_loc = pr.loc;
pr.loc = test->loc;
while_expr = new_block_expr (0);
@ -2858,8 +2849,7 @@ build_while_statement (int not, const expr_t *test, const expr_t *statement,
append_expr (while_expr, test);
}
pr.source_line = line;
pr.source_file = file;
pr.loc = saved_loc;
return while_expr;
}
@ -2870,8 +2860,7 @@ build_do_while_statement (const expr_t *statement, int not, const expr_t *test,
const expr_t *continue_label)
{
expr_t *l1 = new_label_expr ();
int line = pr.source_line;
pr_string_t file = pr.source_file;
auto saved_loc = pr.loc;
expr_t *do_while_expr;
if (!statement) {
@ -2879,8 +2868,7 @@ build_do_while_statement (const expr_t *statement, int not, const expr_t *test,
"suggest braces around empty body in a ‘do’ statement");
}
pr.source_line = test->line;
pr.source_file = test->file;
pr.loc = test->loc;
do_while_expr = new_block_expr (0);
@ -2901,8 +2889,7 @@ build_do_while_statement (const expr_t *statement, int not, const expr_t *test,
append_expr (do_while_expr, test);
}
pr.source_line = line;
pr.source_file = file;
pr.loc = saved_loc;
return do_while_expr;
}
@ -2916,8 +2903,7 @@ build_for_statement (const expr_t *init, const expr_t *test, const expr_t *next,
const expr_t *fl = break_label;
expr_t *l1 = 0;
const expr_t *t;
int line = pr.source_line;
pr_string_t file = pr.source_file;
auto saved_loc = pr.loc;
expr_t *for_expr;
if (next)
@ -2928,8 +2914,7 @@ build_for_statement (const expr_t *init, const expr_t *test, const expr_t *next,
t = init;
else
t = continue_label;
pr.source_line = t->line;
pr.source_file = t->file;
pr.loc = t->loc;
for_expr = new_block_expr (0);
@ -2956,8 +2941,7 @@ build_for_statement (const expr_t *init, const expr_t *test, const expr_t *next,
append_expr (for_expr, fl);
}
pr.source_line = line;
pr.source_file = file;
pr.loc = saved_loc;
return for_expr;
}

29
tools/qfcc/source/function.c
View file

@ -274,12 +274,12 @@ get_function (const char *name, const type_t *type, int overload, int create)
func = Hash_Find (function_map, name);
if (func) {
if (!overload && !func->overloaded) {
expr_t *e = new_expr ();
e->line = func->line;
e->file = func->file;
expr_t e = {
.loc = func->loc,
};
warning (0, "creating overloaded function %s without @overload",
full_name);
warning (e, "(previous function is %s)", func->full_name);
warning (&e, "(previous function is %s)", func->full_name);
}
overload = 1;
}
@ -289,8 +289,7 @@ get_function (const char *name, const type_t *type, int overload, int create)
func->full_name = full_name;
func->type = type;
func->overloaded = overload;
func->file = pr.source_file;
func->line = pr.source_line;
func->loc = pr.loc;
Hash_Add (overloaded_functions, func);
Hash_Add (function_map, func);
@ -631,7 +630,7 @@ new_function (const char *name, const char *nice_name)
ALLOC (1024, function_t, functions, f);
f->s_name = ReuseString (name);
f->s_file = pr.source_file;
f->s_file = pr.loc.file;
if (!(f->name = nice_name))
f->name = name;
return f;
@ -699,12 +698,11 @@ begin_function (symbol_t *sym, const char *nicename, symtab_t *parent,
add_function (sym->s.func);
reloc_def_func (sym->s.func, sym->s.func->def);
sym->s.func->def->file = pr.source_file;
sym->s.func->def->line = pr.source_line;
sym->s.func->def->loc = pr.loc;
}
sym->s.func->code = pr.code->size;
sym->s.func->s_file = pr.source_file;
sym->s.func->s_file = pr.loc.file;
if (options.code.debug) {
pr_lineno_t *lineno = new_lineno ();
sym->s.func->line_info = lineno - pr.linenos;
@ -768,17 +766,14 @@ build_code_function (symbol_t *fsym, const expr_t *state_expr,
*/
expr_t *e;
expr_t *entry = new_block_expr (0);
entry->file = func->def->file;
entry->line = func->def->line;
entry->loc = func->def->loc;
e = new_adjstk_expr (0, 0);
e->file = func->def->file;
e->line = func->def->line;
e->loc = entry->loc;
append_expr (entry, e);
e = new_with_expr (2, LOCALS_REG, new_short_expr (0));
e->file = func->def->file;
e->line = func->def->line;
e->loc = entry->loc;
append_expr (entry, e);
append_expr (entry, statements);
@ -905,7 +900,7 @@ emit_function (function_t *f, expr_t *e)
if (pr.error_count)
return;
f->code = pr.code->size;
lineno_base = f->def->line;
lineno_base = f->def->loc.line;
f->sblock = make_statements (e);
if (options.code.optimize) {
flow_data_flow (f);

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

@ -1447,8 +1447,13 @@ def_error (qfo_def_t *def, const char *fmt, ...)
dvsprintf (string, fmt, args);
va_end (args);
pr.source_file = def->file;
pr.source_line = def->line;
pr.loc = (rua_loc_t) {
.line = def->line,
.column = 1,
.last_line = def->line,
.last_column = 1,
.file = def->file,
};
error (0, "%s", string->str);
}
@ -1465,8 +1470,13 @@ def_warning (qfo_def_t *def, const char *fmt, ...)
dvsprintf (string, fmt, args);
va_end (args);
pr.source_file = def->file;
pr.source_line = def->line;
pr.loc = (rua_loc_t) {
.line = def->line,
.column = 1,
.last_line = def->line,
.last_column = 1,
.file = def->file,
};
warning (0, "%s", string->str);
}

6
tools/qfcc/source/obj_file.c
View file

@ -144,8 +144,8 @@ qfo_encode_defs (qfo_t *qfo, def_t *defs, qfo_def_t **qfo_defs,
q->num_relocs = qfo_encode_relocs (d->relocs, qfo_relocs,
q - qfo->defs);
q->flags = qfo_def_flags (d);
q->file = d->file;
q->line = d->line;
q->file = d->loc.file;
q->line = d->loc.line;
}
return count;
}
@ -301,7 +301,7 @@ qfo_encode_functions (qfo_t *qfo, qfo_def_t **defs, qfo_reloc_t **relocs,
q->name = f->s_name;
q->type = f->def->type->type_def->offset;
q->file = f->s_file;
q->line = f->def->line;
q->line = f->def->loc.line;
q->code = f->code;
if (f->builtin) // FIXME redundant
q->code = -f->builtin;

19
tools/qfcc/source/pre-parse.y
View file

@ -43,6 +43,10 @@
#include "QF/dstring.h"
#define PRE_YYDEBUG 1
#define PRE_YYERROR_VERBOSE 1
#undef PRE_YYERROR_VERBOSE
#include "tools/qfcc/include/debug.h"
#include "tools/qfcc/include/diagnostic.h"
#include "tools/qfcc/include/expr.h"
@ -50,10 +54,6 @@
#include "tools/qfcc/include/strpool.h"
#include "tools/qfcc/include/type.h"
#define YYDEBUG 1
#define YYERROR_VERBOSE 1
#undef YYERROR_VERBOSE
#include "tools/qfcc/source/pre-parse.h"
#define pre_yytext qc_yyget_text (scanner)
@ -64,7 +64,7 @@ yyerror (YYLTYPE *yylloc, void *scanner, const char *s)
{
const char *text = quote_string (pre_yytext);
#ifdef YYERROR_VERBOSE
error (0, "%d:%s before '%s'\n", yylloc->first_column, s, text);
error (0, "%d:%s before '%s'\n", yylloc->column, s, text);
#else
error (0, "%s before '%s'", s, text);
#endif
@ -79,6 +79,9 @@ parse_error (void *scanner)
#define PARSE_ERROR do { parse_error (scanner); YYERROR; } while (0)
#endif
#define first_line line
#define first_column column
%}
%code requires {
@ -200,8 +203,10 @@ directive
| PRAGMA expand { rua_start_pragma (scanner); }
pragma_params { pragma_process (); }
eod
| LINE expand expr extra_warn { line_info ($3, 0, 0); }
| LINE expand expr string line_expr extra_warn { line_info ($3, $4, $5); }
| LINE expand expr extra_warn
{ rua_line_info ($3, 0, 0, scanner); }
| LINE expand expr string line_expr extra_warn
{ rua_line_info ($3, $4, $5, scanner); }
| IF { rua_start_if (true, scanner); }
expr { rua_if (expr_long ($3), scanner); }
eod

87
tools/qfcc/source/qc-lex.l
View file

@ -100,6 +100,7 @@ typedef struct DARRAY_TYPE (rua_cond_t) rua_cond_stack_t;
typedef struct {
YY_BUFFER_STATE buffer;
rua_cond_stack_t cond_stack;
rua_loc_t location;
} rua_incl_t;
typedef struct DARRAY_TYPE (rua_macro_t *) rua_macro_list_t;
@ -122,6 +123,7 @@ typedef struct rua_extra_s {
rua_macro_t *pending_macro; // function-type waiting for args
rua_macro_t *macro; // macro being expanded
yyscan_t subscanner;
rua_loc_t location;
} rua_extra_t;
#define YY_EXTRA_TYPE rua_extra_t *
@ -366,7 +368,7 @@ pp_vnumber '({s}*{m}?{pp_number}){2,4}{s}*'{ULFD}?
<*>. {
error (0, "all your typo are belong to us:%d %d-%d",
yystart(),
yylloc->first_column, yylloc->last_column);
yylloc->column, yylloc->last_column);
}
%%
@ -902,7 +904,7 @@ parse_vector (rua_tok_t *tok, yyscan_t scanner)
int token;
rua_tok_t vtok = { .location = tok->location, };
vtok.location.first_column++;
vtok.location.column++;
const expr_t *components[4+1] = {}; // currently, max of 4
bool negate[4] = {};
int width = 0;
@ -1056,11 +1058,10 @@ static void
next_line (rua_loc_t *loc, yyscan_t scanner)
{
auto extra = qc_yyget_extra (scanner);
loc->first_line = loc->last_line;
loc->first_column = loc->last_column;
loc->line = loc->last_line;
loc->column = loc->last_column;
loc->last_column = 1;
loc->last_line++;
pr.source_line++;
if (!extra->recording && options.preprocess_output) {
puts ("");
}
@ -1069,8 +1070,8 @@ next_line (rua_loc_t *loc, yyscan_t scanner)
static void
update_loc (rua_loc_t *loc, size_t textlen)
{
loc->first_line = loc->last_line;
loc->first_column = loc->last_column;
loc->line = loc->last_line;
loc->column = loc->last_column;
// \n handling rules will take care of the column and line
loc->last_column += textlen;
}
@ -1349,6 +1350,8 @@ qc_process (rua_extra_t *extra, int token, rua_tok_t *tok, yyscan_t scanner)
return YYPUSH_MORE;
}
pr.loc = *loc;
rua_macro_t *macro = 0;
if (extra->pending_macro) {
if (extra->recording) {
@ -1630,7 +1633,8 @@ rescan:
*tok = expr_token (&e);
token = tok->token;
} else {
token = yylex (tok, &tok->location, scanner);
token = yylex (tok, &extra->location, scanner);
tok->location = extra->location;
}
return token;
}
@ -1646,15 +1650,16 @@ qc_yyparse (FILE *in)
.include_stack = DARRAY_STATIC_INIT (8),
.dstr = dstring_new (),
.macro_tab = cpp_macros ? cpp_macros : new_symtab (0, stab_global),
.location = { 1, 1, 1, 1, pr.loc.file },
};
yyscan_t scanner;
yyscan_t scanner;
yylex_init_extra (&extra, &scanner);
yylex_init (&extra.subscanner);
yyset_in (in, scanner);
int status;
rua_tok_t tok = { .location = { 1, 1, 1, 1, pr.source_file }, };
rua_tok_t tok = {};
do {
int token = next_token (&tok, scanner);
if (!token && extra.cond_stack.size) {
@ -1665,6 +1670,7 @@ qc_yyparse (FILE *in)
if (!token && extra.include_stack.size) {
//printf ("*** pop include %d\n", (int) extra.include_stack.size);
auto incl = DARRAY_REMOVE (&extra.include_stack);
extra.location = incl.location;
struct yyguts_t * yyg = (struct yyguts_t*)scanner;//FIXME
yy_delete_buffer (YY_CURRENT_BUFFER, scanner);
set_line_file (-1, 0, 2);
@ -1961,14 +1967,14 @@ dump_state_stack (void *scanner)
extra ? extra->recording ? "true" : "false" : "n/a",
extra ? extra->expand ? "true" : "false" : "n/a",
extra ? extra->params ? "true" : "false" : "n/a",
pr.strings ? GETSTR(pr.source_file) : "", pr.source_line);
pr.strings ? GETSTR(pr.loc.file) : "", pr.loc.line);
}
static void
dump_token (rua_tok_t *tok, rua_loc_t *loc, int state)
{
printf ("start: %2d [%3d %3d] [%3d %3d] '%s'\n", state,
loc->first_line, loc->first_column,
loc->line, loc->column,
loc->last_line, loc->last_column,
quote_string (tok->text));
}
@ -1982,7 +1988,7 @@ rua_start_if (bool expand, void *scanner)
.saw_else = false,
.own_state = true,
.enabled = false,
.line = pr.source_line,
.line = pr.loc.line,
};
if (extra->cond_stack.size) {
auto c = extra->cond_stack.a[extra->cond_stack.size - 1];
@ -2019,7 +2025,7 @@ rua_if (bool pass, void *scanner)
if (cond->own_state && !cond->enabled) {
extra->suppressed = true;
}
//printf ("#if on %s:%d %d\n", GETSTR(pr.source_file),
//printf ("#if on %s:%d %d\n", GETSTR(pr.loc.file),
// cond->line, extra->suppressed);
// put PREEXPR on the stack for EOD to pop
//yy_push_state (PREEXPR, scanner);
@ -2047,9 +2053,9 @@ rua_else (bool pass, const char *tok, void *scanner)
cond->enabled = pass;
cond->saw_true |= pass;
cond->saw_else = strcmp (tok, "else") == 0;
//printf ("#else on %s:%d for %d %d\n", GETSTR(pr.source_file),
// pr.source_line, cond->line, extra->suppressed);
cond->line = pr.source_line;
//printf ("#else on %s:%d for %d %d\n", GETSTR(pr.loc.file),
// pr.loc.line, cond->line, extra->suppressed);
cond->line = pr.loc.line;
if (cond->own_state && !cond->enabled) {
extra->suppressed = true;
}
@ -2067,8 +2073,8 @@ rua_endif (void *scanner)
}
//yy_pop_state (scanner); // remove DIRECTIVE state
auto cond = DARRAY_REMOVE (&extra->cond_stack);
//printf ("#endif on %s:%d for %d %d\n", GETSTR(pr.source_file),
// pr.source_line, cond.line, extra->suppressed);
//printf ("#endif on %s:%d for %d %d\n", GETSTR(pr.loc.file),
// pr.loc.line, cond.line, extra->suppressed);
if (cond.own_state && !cond.enabled) {
extra->suppressed = false;
//yy_pop_state (scanner);
@ -2120,9 +2126,18 @@ rua_include_file (const char *name, void *scanner)
DARRAY_APPEND (&extra->include_stack, ((rua_incl_t) {
.buffer = YY_CURRENT_BUFFER,
.cond_stack = extra->cond_stack,
.location = extra->location,
}));
extra->cond_stack = (rua_cond_stack_t) DARRAY_STATIC_INIT (8);
yy_switch_to_buffer (yy_create_buffer (yyin, YY_BUF_SIZE, scanner), scanner);
auto buffer = yy_create_buffer (yyin, YY_BUF_SIZE, scanner);
yy_switch_to_buffer (buffer, scanner);
extra->location = (rua_loc_t) {
.line = 1,
.column = 1,
.last_line = 1,
.last_column = 1,
.file = ReuseString (found),
};
}
void
@ -2182,10 +2197,31 @@ rua_parse_define (const char *def)
return status;
}
void
rua_line_info (const expr_t *line_expr, const char *file,
const expr_t *flags_expr, void *scanner)
{
auto extra = qc_yyget_extra (scanner);
int line = expr_long (line_expr);
int flags = flags_expr ? expr_long (flags_expr) : 0;
if (file) {
if (*file != '"') {
error (0, "\"%s\" is not a valid filename", file);
return;
}
file = make_string (file, 0);
}
set_line_file (line, file, flags);
extra->location = pr.loc;
}
void
rua_macro_file (rua_macro_t *macro, void *scanner)
{
int file = pr.source_file;
auto extra = qc_yyget_extra (scanner);
int file = extra->location.file;
if (macro->tokens && macro->tokens->location.file == file) {
return;
}
@ -2198,7 +2234,7 @@ rua_macro_file (rua_macro_t *macro, void *scanner)
const char *file_str = save_string (va (0, "\"%s\"",
quote_string (GETSTR (file))));
*expr = (rua_expr_t) {
.location = { .file = file },
.location = extra->location,
.textlen = strlen (file_str),
.token = -rua_string,
.text = file_str,
@ -2210,9 +2246,10 @@ rua_macro_file (rua_macro_t *macro, void *scanner)
void
rua_macro_line (rua_macro_t *macro, void *scanner)
{
int line = pr.source_line;
auto extra = qc_yyget_extra (scanner);
int line = extra->location.line;
if (macro->tokens && macro->tokens->location.first_line == line) {
if (macro->tokens && macro->tokens->location.line == line) {
return;
}
macro->tokens = 0;
@ -2223,7 +2260,7 @@ rua_macro_line (rua_macro_t *macro, void *scanner)
macro->num_tokens++;
const char *line_str = save_string (va (0, "%d", line));
*expr = (rua_expr_t) {
.location = { .first_line = line },
.location = extra->location,
.textlen = strlen (line_str),
.token = -rua_number,
.text = line_str,

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

@ -100,6 +100,9 @@ parse_error (void *scanner)
#define PARSE_ERROR do { parse_error (scanner); YYERROR; } while (0)
#define first_line line
#define first_column column
int yylex (YYSTYPE *yylval, YYLTYPE *yylloc);
%}

14
tools/qfcc/source/qfcc.c
View file

@ -152,7 +152,12 @@ InitData (void)
}
memset (&pr, 0, sizeof (pr));
pr.source_line = 1;
pr.loc = (rua_loc_t) {
.line = 1,
.column = 1,
.last_line = 1,
.last_column = 1,
};
pr.error_count = 0;
pr.code = codespace_new ();
memset (codespace_newstatement (pr.code), 0, sizeof (dstatement_t));
@ -668,8 +673,13 @@ compile_file (const char *filename)
if (options.preprocess_only || !yyin)
return !options.preprocess_only;
pr.loc = (rua_loc_t) {
.line = 1,
.column = 1,
.last_line = 1,
.last_column = 1,
};
add_source_file (filename);
pr.source_line = 1;
clear_frame_macros ();
err = yyparse (yyin) || pr.error_count;
fclose (yyin);

41
tools/qfcc/source/qp-lex.l
View file

@ -82,23 +82,10 @@ FILE *yyget_out (yyscan_t yyscanner) __attribute__((pure));
static int keyword_or_id (YYSTYPE *lval, const char *token);
static int convert_relop (const char *relop) __attribute__((pure));
static void update_loc (rua_loc_t *loc, size_t textlen);
static void next_line (rua_loc_t *loc, yyscan_t scanner);
static void
update_yylloc (YYLTYPE *lloc, const char *text)
{
lloc->first_line = lloc->last_line;
lloc->first_column = lloc->last_column;
for(int i = 0; text[i] != '\0'; i++) {
if(text[i] == '\n') {
lloc->last_line++;
lloc->last_column = 1;
} else {
lloc->last_column++;
}
}
}
#define YY_USER_ACTION update_yylloc (yylloc, yytext);
#define YY_USER_ACTION update_loc (yylloc, yyleng);
%}
@ -130,7 +117,7 @@ FRAMEID {ID}(\.{ID})*
"(*" { BEGIN (COMMENT); }
<COMMENT>"(*" { warning (0, "nested (* in comment"); }
<COMMENT>"*)" { BEGIN (INITIAL); }
<COMMENT>\r*\n { pr.source_line++; }
<COMMENT>\r*\n { next_line (yylloc, yyscanner); }
<COMMENT>. /* nothing to do, with people like you */
<COMMENT><<EOF>> { error (0, "EOF in comment"); return 0; }
"//".* /* nothing to do, with people like you */
@ -213,7 +200,7 @@ FRAMEID {ID}(\.{ID})*
<GRAB_OTHER>[^\r\n]* /* skip */
<*>\r*\n {
pr.source_line++;
next_line (yylloc, yyscanner);
BEGIN (INITIAL);
}
@ -346,3 +333,21 @@ qp_yyparse (FILE *in)
qp_yypstate_delete (ps);
return status;
}
static void
update_loc (rua_loc_t *loc, size_t textlen)
{
loc->line = loc->last_line;
loc->column = loc->last_column;
// \n handling rules will take care of the column and line
loc->last_column += textlen;
}
static void
next_line (rua_loc_t *loc, yyscan_t scanner)
{
loc->line = loc->last_line;
loc->column = loc->last_column;
loc->last_column = 1;
loc->last_line++;
}

5
tools/qfcc/source/qp-parse.y
View file

@ -84,10 +84,15 @@ parse_error (void *scanner)
#define PARSE_ERROR do { parse_error (scanner); YYERROR; } while (0)
#define first_line line
#define first_column column
int yylex (void);
%}
%define api.location.type {struct rua_loc_s}
%union {
int op;
struct def_s *def;

4
tools/qfcc/source/reloc.c
View file

@ -185,8 +185,8 @@ new_reloc (defspace_t *space, int offset, reloc_type type)
ref->space = space;
ref->offset = offset;
ref->type = type;
ref->line = pr.source_line;
ref->file = pr.source_file;
ref->line = pr.loc.line;
ref->file = pr.loc.file;
ref->return_address = __builtin_return_address (0);
return ref;
}

15
tools/qfcc/source/statements.c
View file

@ -1729,13 +1729,11 @@ expr_negate (sblock_t *sblock, const expr_t *e, operand_t **op)
expr_t *zero;
zero = new_nil_expr ();
zero->file = e->file;
zero->line = e->line;
zero->loc = e->loc;
zero = (expr_t *) convert_nil (zero, e->expr.type);
neg = new_binary_expr ('-', zero, e->expr.e1);
neg->expr.type = e->expr.type;
neg->file = e->file;
neg->line = e->line;
neg->loc = e->loc;
return statement_subexpr (sblock, neg, op);
}
@ -1947,17 +1945,14 @@ expr_vector_e (sblock_t *sblock, const expr_t *e, operand_t **op)
{
const expr_t *tmp;
type_t *vec_type = get_type (e);
int file = pr.source_file;
int line = pr.source_line;
pr.source_file = e->file;
pr.source_line = e->line;
auto loc = pr.loc;
pr.loc = e->loc;
tmp = new_temp_def_expr (vec_type);
statement_copy_elements (&sblock, tmp, e, 0);
pr.source_file = file;
pr.source_line = line;
pr.loc = loc;
sblock = statement_subexpr (sblock, tmp, op);
return sblock;
}

4
tools/qfcc/source/struct.c
View file

@ -73,11 +73,11 @@ find_tag (ty_meta_e meta, symbol_t *tag, type_t *type)
if (tag) {
tag_name = va (0, "tag %s", tag->name);
} else {
const char *path = GETSTR (pr.source_file);
const char *path = GETSTR (pr.loc.file);
const char *file = strrchr (path, '/');
if (!file++)
file = path;
tag_name = va (0, "tag .%s.%d", file, pr.source_line);
tag_name = va (0, "tag .%s.%d", file, pr.loc.line);
}
sym = symtab_lookup (current_symtab, tag_name);
if (sym) {

9
tools/qfcc/source/switch.c
View file

@ -401,10 +401,8 @@ switch_expr (switch_block_t *switch_block, const expr_t *break_label,
return switch_block->test;
}
int saved_line = pr.source_line;
pr_string_t saved_file = pr.source_file;
pr.source_line = switch_block->test->line;
pr.source_file = switch_block->test->file;
auto saved_loc = pr.loc;
pr.loc = switch_block->test->loc;
case_label_t **labels, **l;
case_label_t _default_label;
@ -457,8 +455,7 @@ switch_expr (switch_block_t *switch_block, const expr_t *break_label,
op = QC_NE;
build_switch (sw, case_tree, op, sw_val, temp, default_label->label);
}
pr.source_line = saved_line;
pr.source_file = saved_file;
pr.loc = saved_loc;
append_expr (sw, statements);
append_expr (sw, break_label);
return sw;