mirror of
https://git.code.sf.net/p/quake/quakeforge
synced 2025-05-31 08:41:11 +00:00
new opcode: state.f. same as state, but takes a 3rd float operand to
specify the step for calculating nextthink. accessed using [frame, think, step] (state is [frame, think])
This commit is contained in:
Bill Currie
parent
1fc517f7db
commit
c3f41e3e69
9 changed files with 94 additions and 23 deletions
|
|
@ -36,6 +36,7 @@
|
|||
|
||||
typedef enum {
|
||||
ex_error,
|
||||
ex_state,
|
||||
ex_bool,
|
||||
ex_label,
|
||||
ex_block,
|
||||
|
|
@ -97,6 +98,12 @@ typedef struct {
|
|||
struct expr_s *e;
|
||||
} ex_bool_t;
|
||||
|
||||
typedef struct {
|
||||
struct expr_s *frame;
|
||||
struct expr_s *think;
|
||||
struct expr_s *step;
|
||||
} ex_state_t;
|
||||
|
||||
#define POINTER_VAL(p) (((p).def ? (p).def->ofs : 0) + (p).val)
|
||||
|
||||
typedef struct expr_s {
|
||||
|
|
@ -108,6 +115,7 @@ typedef struct expr_s {
|
|||
unsigned rvalue:1;
|
||||
union {
|
||||
ex_label_t label;
|
||||
ex_state_t state;
|
||||
ex_bool_t bool;
|
||||
ex_block_t block;
|
||||
struct {
|
||||
|
|
@ -149,6 +157,7 @@ expr_t *new_expr (void);
|
|||
const char *new_label_name (void);
|
||||
|
||||
expr_t *new_label_expr (void);
|
||||
expr_t *new_state_expr (expr_t *frame, expr_t *think, expr_t *step);
|
||||
expr_t *new_bool_expr (ex_list_t *true_list, ex_list_t *false_list, expr_t *e);
|
||||
expr_t *new_block_expr (void);
|
||||
expr_t *new_binary_expr (int op, expr_t *e1, expr_t *e2);
|
||||
|
|
|
|||
|
|
@ -41,6 +41,7 @@ extern struct opcode_s *op_ifb;
|
|||
extern struct opcode_s *op_ifae;
|
||||
extern struct opcode_s *op_ifa;
|
||||
extern struct opcode_s *op_state;
|
||||
extern struct opcode_s *op_state_f;
|
||||
extern struct opcode_s *op_goto;
|
||||
extern struct opcode_s *op_jump;
|
||||
extern struct opcode_s *op_jumpb;
|
||||
|
|
|
|||
|
|
@ -577,6 +577,7 @@ emit_sub_expr (expr_t *e, def_t *dest)
|
|||
d = emit_sub_expr (res, dest);
|
||||
}
|
||||
break;
|
||||
case ex_state:
|
||||
case ex_bool:
|
||||
case ex_name:
|
||||
case ex_nil:
|
||||
|
|
@ -764,7 +765,9 @@ emit_expr (expr_t *e)
|
|||
def_t *def;
|
||||
def_t *def_a;
|
||||
def_t *def_b;
|
||||
def_t *def_c;
|
||||
ex_label_t *label;
|
||||
opcode_t *op;
|
||||
|
||||
//printf ("%d ", e->line);
|
||||
//print_expr (e);
|
||||
|
|
@ -772,14 +775,26 @@ emit_expr (expr_t *e)
|
|||
switch (e->type) {
|
||||
case ex_error:
|
||||
break;
|
||||
case ex_state:
|
||||
def_a = emit_sub_expr (e->e.state.frame, 0);
|
||||
def_b = emit_sub_expr (e->e.state.think, 0);
|
||||
if (e->e.state.step) {
|
||||
def_c = emit_sub_expr (e->e.state.step, 0);
|
||||
op = op_state_f;
|
||||
} else {
|
||||
def_c = 0;
|
||||
op = op_state;
|
||||
}
|
||||
emit_statement (e, op, def_a, def_b, def_c);
|
||||
break;
|
||||
case ex_bool:
|
||||
emit_bool_expr (e);
|
||||
break;
|
||||
case ex_label:
|
||||
label = &e->e.label;
|
||||
label->ofs = pr.code->size;
|
||||
relocate_refs (label->refs, label->ofs);
|
||||
break;
|
||||
case ex_bool:
|
||||
emit_bool_expr (e);
|
||||
break;
|
||||
case ex_block:
|
||||
for (e = e->e.block.head; e; e = e->next)
|
||||
emit_expr (e);
|
||||
|
|
@ -814,11 +829,6 @@ emit_expr (expr_t *e)
|
|||
case 'c':
|
||||
emit_function_call (e, 0);
|
||||
break;
|
||||
case 's':
|
||||
def_a = emit_sub_expr (e->e.expr.e1, 0);
|
||||
def_b = emit_sub_expr (e->e.expr.e2, 0);
|
||||
emit_statement (e, op_state, def_a, def_b, 0);
|
||||
break;
|
||||
case 'b':
|
||||
emit_bind_expr (e->e.expr.e1, e->e.expr.e2);
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -68,8 +68,9 @@ int lineno_base;
|
|||
|
||||
etype_t qc_types[] = {
|
||||
ev_void, // ex_error
|
||||
ev_void, // ex_label
|
||||
ev_void, // ex_state
|
||||
ev_void, // ex_bool
|
||||
ev_void, // ex_label
|
||||
ev_void, // ex_block
|
||||
ev_void, // ex_expr
|
||||
ev_void, // ex_uexpr
|
||||
|
|
@ -185,6 +186,7 @@ get_type (expr_t *e)
|
|||
return &type_float;
|
||||
return &type_integer;
|
||||
case ex_nil:
|
||||
case ex_state:
|
||||
return &type_void;
|
||||
case ex_block:
|
||||
if (e->e.block.result)
|
||||
|
|
@ -345,16 +347,15 @@ new_error_expr (void)
|
|||
}
|
||||
|
||||
expr_t *
|
||||
new_label_expr (void)
|
||||
new_state_expr (expr_t *frame, expr_t *think, expr_t *step)
|
||||
{
|
||||
expr_t *s = new_expr ();
|
||||
|
||||
expr_t *l = new_expr ();
|
||||
|
||||
l->type = ex_label;
|
||||
l->e.label.name = new_label_name ();
|
||||
l->e.label.next = pr.labels;
|
||||
pr.labels = &l->e.label;
|
||||
return l;
|
||||
s->type = ex_state;
|
||||
s->e.state.frame = frame;
|
||||
s->e.state.think = think;
|
||||
s->e.state.step = step;
|
||||
return s;
|
||||
}
|
||||
|
||||
expr_t *
|
||||
|
|
@ -369,6 +370,19 @@ new_bool_expr (ex_list_t *true_list, ex_list_t *false_list, expr_t *e)
|
|||
return b;
|
||||
}
|
||||
|
||||
expr_t *
|
||||
new_label_expr (void)
|
||||
{
|
||||
|
||||
expr_t *l = new_expr ();
|
||||
|
||||
l->type = ex_label;
|
||||
l->e.label.name = new_label_name ();
|
||||
l->e.label.next = pr.labels;
|
||||
pr.labels = &l->e.label;
|
||||
return l;
|
||||
}
|
||||
|
||||
expr_t *
|
||||
new_block_expr (void)
|
||||
{
|
||||
|
|
@ -677,6 +691,15 @@ print_expr (expr_t *e)
|
|||
case ex_error:
|
||||
printf ("(error)");
|
||||
break;
|
||||
case ex_state:
|
||||
printf ("[");
|
||||
print_expr (e->e.state.frame);
|
||||
printf (",");
|
||||
print_expr (e->e.state.think);
|
||||
printf (",");
|
||||
print_expr (e->e.state.step);
|
||||
printf ("]");
|
||||
break;
|
||||
case ex_bool:
|
||||
printf ("bool"); //FIXME
|
||||
break;
|
||||
|
|
@ -1598,6 +1621,7 @@ unary_expr (int op, expr_t *e)
|
|||
case ex_error:
|
||||
case ex_label:
|
||||
case ex_name:
|
||||
case ex_state:
|
||||
error (e, "internal error");
|
||||
abort ();
|
||||
case ex_uexpr:
|
||||
|
|
@ -1652,6 +1676,7 @@ unary_expr (int op, expr_t *e)
|
|||
case ex_error:
|
||||
case ex_label:
|
||||
case ex_name:
|
||||
case ex_state:
|
||||
error (e, "internal error");
|
||||
abort ();
|
||||
case ex_bool:
|
||||
|
|
@ -1716,6 +1741,7 @@ unary_expr (int op, expr_t *e)
|
|||
case ex_error:
|
||||
case ex_label:
|
||||
case ex_name:
|
||||
case ex_state:
|
||||
error (e, "internal error");
|
||||
abort ();
|
||||
case ex_uexpr:
|
||||
|
|
|
|||
|
|
@ -62,6 +62,7 @@ opcode_t *op_ifb;
|
|||
opcode_t *op_ifae;
|
||||
opcode_t *op_ifa;
|
||||
opcode_t *op_state;
|
||||
opcode_t *op_state_f;
|
||||
opcode_t *op_goto;
|
||||
opcode_t *op_jump;
|
||||
opcode_t *op_jumpb;
|
||||
|
|
@ -164,7 +165,10 @@ opcode_init (void)
|
|||
} else if (!strcmp (op->name, "<IFA>")) {
|
||||
op_ifa = op;
|
||||
} else if (!strcmp (op->name, "<STATE>")) {
|
||||
op_state = op;
|
||||
if (op->type_c == ev_float)
|
||||
op_state_f = op;
|
||||
else
|
||||
op_state = op;
|
||||
} else if (!strcmp (op->name, "<GOTO>")) {
|
||||
op_goto = op;
|
||||
} else if (!strcmp (op->name, "<JUMP>")) {
|
||||
|
|
|
|||
|
|
@ -160,7 +160,7 @@ expr_t *argv_expr (void);
|
|||
%type <param> param param_list
|
||||
%type <def> def_name opt_initializer methoddef var_initializer
|
||||
%type <expr> const opt_expr fexpr expr element_list element_list1 element
|
||||
%type <expr> string_val opt_state_expr array_decl
|
||||
%type <expr> string_val opt_state_expr opt_step array_decl
|
||||
%type <expr> statement statements statement_block
|
||||
%type <expr> label break_label continue_label enum_list enum
|
||||
%type <expr> unary_expr primary cast_expr opt_arg_list arg_list
|
||||
|
|
@ -554,7 +554,7 @@ opt_state_expr
|
|||
{
|
||||
$$ = 0;
|
||||
}
|
||||
| '[' const ',' { $<type>$ = &type_function; } def_name ']'
|
||||
| '[' const ',' { $<type>$ = &type_function; } def_name opt_step ']'
|
||||
{
|
||||
if ($2->type == ex_integer)
|
||||
convert_int ($2);
|
||||
|
|
@ -565,10 +565,15 @@ opt_state_expr
|
|||
if ($5->type->type != ev_func)
|
||||
error ($2, "invalid type for think");
|
||||
|
||||
$$ = new_binary_expr ('s', $2, new_def_expr ($5));
|
||||
$$ = new_state_expr ($2, new_def_expr ($5), $6);
|
||||
}
|
||||
;
|
||||
|
||||
opt_step
|
||||
: ',' fexpr { $$ = $2; }
|
||||
| /* empty */ { $$ = 0; }
|
||||
;
|
||||
|
||||
element_list
|
||||
: /* empty */
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue