From acedc65de10e7f14d5d6566a5242b0430e716144 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Mon, 5 Nov 2012 15:21:40 +0900 Subject: [PATCH] Make an array of statements for the function. With this, sets can be used to represent statements. --- tools/qfcc/include/function.h | 2 ++ tools/qfcc/include/statements.h | 3 ++- tools/qfcc/source/flow.c | 29 +++++++++++++++++++---------- 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/tools/qfcc/include/function.h b/tools/qfcc/include/function.h index 443e36a8c..0f69577ac 100644 --- a/tools/qfcc/include/function.h +++ b/tools/qfcc/include/function.h @@ -88,6 +88,8 @@ typedef struct function_s { */ struct daglabel_s **vars; int num_vars; ///< total number of variables referenced + struct statement_s **statements; + int num_statements; } function_t; extern function_t *current_func; diff --git a/tools/qfcc/include/statements.h b/tools/qfcc/include/statements.h index 4a23861ec..97031442f 100644 --- a/tools/qfcc/include/statements.h +++ b/tools/qfcc/include/statements.h @@ -66,7 +66,8 @@ typedef struct statement_s { operand_t *opa; operand_t *opb; operand_t *opc; - struct expr_s *expr; ///< source expression for this statement + struct expr_s *expr; ///< source expression for this statement + int number; ///< number of this statement in function } statement_t; typedef struct sblock_s { diff --git a/tools/qfcc/source/flow.c b/tools/qfcc/source/flow.c index 8abf1735e..b2caa4e0c 100644 --- a/tools/qfcc/source/flow.c +++ b/tools/qfcc/source/flow.c @@ -192,25 +192,34 @@ flow_build_vars (function_t *func) sblock_t *sblock; statement_t *s; int num_vars; + int num_statements = 0; for (num_vars = 0, sblock = func->sblock; sblock; sblock = sblock->next) { for (s = sblock->statements; s; s = s->next) { num_vars += count_operand (s->opa); num_vars += count_operand (s->opb); num_vars += count_operand (s->opc); + s->number = num_statements++; } } - if (!num_vars) - return; + if (num_vars) { + func->vars = malloc (num_vars * sizeof (daglabel_t *)); - func->vars = malloc (num_vars * sizeof (daglabel_t *)); - - func->num_vars = 0; // incremented by add_operand - for (sblock = func->sblock; sblock; sblock = sblock->next) { - for (s = sblock->statements; s; s = s->next) { - add_operand (func, s->opa); - add_operand (func, s->opb); - add_operand (func, s->opc); + func->num_vars = 0; // incremented by add_operand + for (sblock = func->sblock; sblock; sblock = sblock->next) { + for (s = sblock->statements; s; s = s->next) { + add_operand (func, s->opa); + add_operand (func, s->opb); + add_operand (func, s->opc); + } + } + } + if (num_statements) { + func->statements = malloc (num_statements * sizeof (statement_t *)); + func->num_statements = num_statements; + for (sblock = func->sblock; sblock; sblock = sblock->next) { + for (s = sblock->statements; s; s = s->next) + func->statements[s->number] = s; } } }