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

Add a "void return" instruction.

Browse source 
I got fed up with always having to explicty return something.
This commit is contained in:
Bill Currie 2011-01-13 00:29:56 +09:00
parent 9ce9b70484
commit 3c9991364b
7 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/QF/pr_comp.h
View file

@ -290,6 +290,8 @@ typedef enum {
OP_RCALL6,
OP_RCALL7,
OP_RCALL8,
OP_RETURN_V,
} pr_opcode_e;
typedef struct opcode_s {
@ -358,7 +360,7 @@ typedef struct pr_va_list_s {
|(((0x##b) & 0xfff) << 12) \
|(((0x##c) & 0xfff) << 0) )
#define PROG_ID_VERSION 6
#define PROG_VERSION PROG_VERSION_ENCODE(0,fff,006)
#define PROG_VERSION PROG_VERSION_ENCODE(0,fff,007)
typedef struct dprograms_s {
pr_uint_t version;

2
libs/gamecode/engine/pr_exec.c
View file

@ -923,6 +923,8 @@ op_call:
else if (&R_INT (pr) != &OPA.integer_var)
memcpy (&R_INT (pr), &OPA,
pr->pr_param_size * sizeof (OPA));
// fallthrough
case OP_RETURN_V:
pr->pr_xfunction->profile += profile - startprofile;
startprofile = profile;
PR_LeaveFunction (pr);

6
libs/gamecode/engine/pr_opcode.c
View file

@ -655,6 +655,12 @@ VISIBLE opcode_t pr_opcodes[] = {
"%Ra",
},
{"<RETURN_V>", "return", OP_RETURN_V, false,
ev_invalid, ev_invalid, ev_invalid,
PROG_VERSION,
"",
},
{"!", "not.f", OP_NOT_F, false,
ev_float, ev_invalid, ev_integer,
PROG_ID_VERSION,

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

@ -34,6 +34,7 @@
extern struct opcode_s *op_done;
extern struct opcode_s *op_return;
extern struct opcode_s *op_return_v;
extern struct opcode_s *op_if;
extern struct opcode_s *op_ifnot;
extern struct opcode_s *op_ifbe;

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

@ -877,7 +877,10 @@ emit_expr (expr_t *e)
def = 0;
if (e->e.expr.e1)
def = emit_sub_expr (e->e.expr.e1, 0);
emit_statement (e, op_return, def, 0, 0);
if (!def && op_return_v)
emit_statement (e, op_return_v, 0, 0, 0);
else
emit_statement (e, op_return, def, 0, 0);
break;
case 'g':
emit_branch (e, op_goto, 0, e->e.expr.e1);

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

@ -55,6 +55,7 @@ hashtab_t *opcode_type_table_abc;
opcode_t *op_done;
opcode_t *op_return;
opcode_t *op_return_v;
opcode_t *op_if;
opcode_t *op_ifnot;
opcode_t *op_ifbe;
@ -152,6 +153,8 @@ opcode_init (void)
op_done = op;
} else if (!strcmp (op->name, "<RETURN>")) {
op_return = op;
} else if (!strcmp (op->name, "<RETURN_V>")) {
op_return_v = op;
} else if (!strcmp (op->name, "<IF>")) {
op_if = op;
} else if (!strcmp (op->name, "<IFNOT>")) {

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

@ -258,13 +258,12 @@ subprogram_declaration
}
declarations compound_statement ';'
{
type_t *ret_type = $1->type->t.func.type;
current_scope = current_scope->parent;
//current_storage = st_global;
//FIXME want a true void return
if (ret_type)
append_expr ($5, return_expr (current_func,
new_ret_expr (ret_type)));
// functions in pascal are always effectively void
// but their type is needed for checking func := retval
// so bypass the checks
append_expr ($5, new_unary_expr ('r', 0));
build_code_function (current_func, 0, $5);
current_func = 0;
}