qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-10 15:22:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

[qfcc] Use a hidden local variable for pascal functions

Browse source 
This gets gcd.pas working nicely with the Ruamoko ISA, and keeps things
reasonably nice vor v6p (it will likely do better with global CSE).
This commit is contained in:
Bill Currie 2022-02-01 16:08:58 +09:00
parent fc56d1c6e2
commit c84fb3e6d3
1 changed files with 41 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -164,6 +164,32 @@ build_dotmain (symbol_t *program)
build_code_function (dotmain, 0, code);
}
static symbol_t *
function_value (function_t *func)
{
symbol_t *ret = 0;
if (func->type->t.func.type) {
ret = symtab_lookup (func->locals, ".ret");
if (!ret || ret->table != func->locals) {
ret = new_symbol_type (".ret", func->type->t.func.type);
initialize_def (ret, 0, func->locals->space, sc_local,
func->locals);
}
}
return ret;
}
static expr_t *
function_return (function_t *func)
{
symbol_t *ret = function_value (func);
expr_t *ret_val = 0;
if (ret) {
ret_val = new_symbol_expr (ret);
}
return ret_val;
}
%}
%%
@ -270,10 +296,11 @@ subprogram_declaration
current_storage);
current_symtab = current_func->locals;
current_storage = sc_local;
function_value (current_func);
}
declarations compound_statement ';'
{
append_expr ($5, new_return_expr (0));
append_expr ($5, new_return_expr (function_return (current_func)));
build_code_function ($1, 0, $5);
current_symtab = current_func->parameters->parent;
current_storage = $<storage>3;
@ -376,8 +403,18 @@ statement
: variable ASSIGNOP expression
{
$$ = $1;
if ($$->type == ex_symbol && extract_type ($$) == ev_func)
$$ = new_ret_expr ($$->e.symbol->type->t.func.type);
if ($$->type == ex_symbol && $$->e.symbol->sy_type == sy_func) {
if ($$->e.symbol->s.func != current_func) {
$$ = error ($$, "cannot assign to other function");
} else {
symbol_t *ret = function_value (current_func);
if (!ret) {
$$ = error ($$, "cannot assign to procedure");
} else {
$$ = new_symbol_expr (ret);
}
}
}
$$ = assign_expr ($$, $3);
}
| procedure_statement
@ -398,7 +435,7 @@ statement
}
| RETURN
{
$$ = return_expr (current_func, 0);
$$ = return_expr (current_func, function_return (current_func));
}
;