OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Conver IR structures to use exec_list instead of simple_node

Browse Source
This commit is contained in:
Ian Romanick
2010-03-08 23:44:00 -08:00
parent 7e4ce71923
commit 0044e7edce
6 changed files with 48 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ast.h
View File

@@ -26,6 +26,7 @@
#define AST_H #define AST_H
#include "main/simple_list.h" #include "main/simple_list.h"
#include "list.h"
#include "glsl_parser_extras.h" #include "glsl_parser_extras.h"
struct ir_instruction; struct ir_instruction;
@@ -37,7 +38,7 @@ class ast_node : public simple_node {
public: public:
virtual ~ast_node(); virtual ~ast_node();
virtual void print(void) const; virtual void print(void) const;
virtual ir_instruction *hir(struct simple_node *instructions, virtual ir_instruction *hir(exec_list *instructions,
struct _mesa_glsl_parse_state *state); struct _mesa_glsl_parse_state *state);
/** /**
@@ -151,7 +152,7 @@ public:
static const char *operator_string(enum ast_operators op); static const char *operator_string(enum ast_operators op);
virtual ir_instruction *hir(struct simple_node *instructions, virtual ir_instruction *hir(exec_list *instructions,
struct _mesa_glsl_parse_state *state); struct _mesa_glsl_parse_state *state);
virtual void print(void) const; virtual void print(void) const;
@@ -198,7 +199,7 @@ public:
ast_compound_statement(int new_scope, ast_node *statements); ast_compound_statement(int new_scope, ast_node *statements);
virtual void print(void) const; virtual void print(void) const;
virtual ir_instruction *hir(struct simple_node *instructions, virtual ir_instruction *hir(exec_list *instructions,
struct _mesa_glsl_parse_state *state); struct _mesa_glsl_parse_state *state);
int new_scope; int new_scope;
@@ -338,7 +339,7 @@ public:
ast_declarator_list(ast_fully_specified_type *); ast_declarator_list(ast_fully_specified_type *);
virtual void print(void) const; virtual void print(void) const;
virtual ir_instruction *hir(struct simple_node *instructions, virtual ir_instruction *hir(exec_list *instructions,
struct _mesa_glsl_parse_state *state); struct _mesa_glsl_parse_state *state);
ast_fully_specified_type *type; ast_fully_specified_type *type;
@@ -359,7 +360,7 @@ class ast_parameter_declarator : public ast_node {
public: public:
virtual void print(void) const; virtual void print(void) const;
virtual ir_instruction *hir(struct simple_node *instructions, virtual ir_instruction *hir(exec_list *instructions,
struct _mesa_glsl_parse_state *state); struct _mesa_glsl_parse_state *state);
ast_fully_specified_type *type; ast_fully_specified_type *type;
@@ -406,7 +407,7 @@ public:
ast_expression_statement(ast_expression *); ast_expression_statement(ast_expression *);
virtual void print(void) const; virtual void print(void) const;
virtual ir_instruction *hir(struct simple_node *instructions, virtual ir_instruction *hir(exec_list *instructions,
struct _mesa_glsl_parse_state *state); struct _mesa_glsl_parse_state *state);
ast_expression *expression; ast_expression *expression;
@@ -483,7 +484,7 @@ class ast_function_definition : public ast_node {
public: public:
virtual void print(void) const; virtual void print(void) const;
virtual ir_instruction *hir(struct simple_node *instructions, virtual ir_instruction *hir(exec_list *instructions,
struct _mesa_glsl_parse_state *state); struct _mesa_glsl_parse_state *state);
ast_function *prototype; ast_function *prototype;
@@ -493,7 +494,7 @@ public:
extern struct ir_instruction * extern struct ir_instruction *
_mesa_ast_field_selection_to_hir(const struct ast_expression *expr, _mesa_ast_field_selection_to_hir(const struct ast_expression *expr,
struct simple_node *instructions, exec_list *instructions,
struct _mesa_glsl_parse_state *state); struct _mesa_glsl_parse_state *state);
#endif /* AST_H */ #endif /* AST_H */

63
ast_to_hir.cpp
View File

@@ -330,7 +330,7 @@ relational_result_type(const struct glsl_type *type_a,
ir_instruction * ir_instruction *
ast_node::hir(struct simple_node *instructions, ast_node::hir(exec_list *instructions,
struct _mesa_glsl_parse_state *state) struct _mesa_glsl_parse_state *state)
{ {
(void) instructions; (void) instructions;
@@ -341,7 +341,7 @@ ast_node::hir(struct simple_node *instructions,
ir_instruction * ir_instruction *
ast_expression::hir(struct simple_node *instructions, ast_expression::hir(exec_list *instructions,
struct _mesa_glsl_parse_state *state) struct _mesa_glsl_parse_state *state)
{ {
static const int operations[AST_NUM_OPERATORS] = { static const int operations[AST_NUM_OPERATORS] = {
@@ -717,7 +717,7 @@ ast_expression::hir(struct simple_node *instructions,
ir_instruction * ir_instruction *
ast_expression_statement::hir(struct simple_node *instructions, ast_expression_statement::hir(exec_list *instructions,
struct _mesa_glsl_parse_state *state) struct _mesa_glsl_parse_state *state)
{ {
/* It is possible to have expression statements that don't have an /* It is possible to have expression statements that don't have an
@@ -739,7 +739,7 @@ ast_expression_statement::hir(struct simple_node *instructions,
ir_instruction * ir_instruction *
ast_compound_statement::hir(struct simple_node *instructions, ast_compound_statement::hir(exec_list *instructions,
struct _mesa_glsl_parse_state *state) struct _mesa_glsl_parse_state *state)
{ {
struct simple_node *ptr; struct simple_node *ptr;
@@ -880,7 +880,7 @@ apply_type_qualifier_to_variable(const struct ast_type_qualifier *qual,
ir_instruction * ir_instruction *
ast_declarator_list::hir(struct simple_node *instructions, ast_declarator_list::hir(exec_list *instructions,
struct _mesa_glsl_parse_state *state) struct _mesa_glsl_parse_state *state)
{ {
struct simple_node *ptr; struct simple_node *ptr;
@@ -953,7 +953,7 @@ ast_declarator_list::hir(struct simple_node *instructions,
continue; continue;
} }
insert_at_tail(instructions, (struct simple_node *) var); instructions->push_tail(var);
/* FINISHME: Process the declaration initializer. */ /* FINISHME: Process the declaration initializer. */
} }
@@ -965,7 +965,7 @@ ast_declarator_list::hir(struct simple_node *instructions,
ir_instruction * ir_instruction *
ast_parameter_declarator::hir(struct simple_node *instructions, ast_parameter_declarator::hir(exec_list *instructions,
struct _mesa_glsl_parse_state *state) struct _mesa_glsl_parse_state *state)
{ {
const struct glsl_type *type; const struct glsl_type *type;
@@ -997,7 +997,7 @@ ast_parameter_declarator::hir(struct simple_node *instructions,
apply_type_qualifier_to_variable(& this->type->qualifier, var, state); apply_type_qualifier_to_variable(& this->type->qualifier, var, state);
insert_at_tail(instructions, var); instructions->push_tail(var);
/* Parameter declarations do not have r-values. /* Parameter declarations do not have r-values.
*/ */
@@ -1007,7 +1007,7 @@ ast_parameter_declarator::hir(struct simple_node *instructions,
static void static void
ast_function_parameters_to_hir(struct simple_node *ast_parameters, ast_function_parameters_to_hir(struct simple_node *ast_parameters,
struct simple_node *ir_parameters, exec_list *ir_parameters,
struct _mesa_glsl_parse_state *state) struct _mesa_glsl_parse_state *state)
{ {
struct simple_node *ptr; struct simple_node *ptr;
@@ -1019,18 +1019,17 @@ ast_function_parameters_to_hir(struct simple_node *ast_parameters,
static bool static bool
parameter_lists_match(struct simple_node *list_a, struct simple_node *list_b) parameter_lists_match(exec_list *list_a, exec_list *list_b)
{ {
struct simple_node *node_a; exec_list_iterator iter_a = list_a->iterator();
struct simple_node *node_b; exec_list_iterator iter_b = list_b->iterator();
node_b = first_elem(list_b); while (iter_a.has_next()) {
foreach (node_a, list_a) {
/* If all of the parameters from the other parameter list have been /* If all of the parameters from the other parameter list have been
* exhausted, the lists have different length and, by definition, * exhausted, the lists have different length and, by definition,
* do not match. * do not match.
*/ */
if (at_end(list_b, node_b)) if (!iter_b.has_next())
return false; return false;
/* If the types of the parameters do not match, the parameters lists /* If the types of the parameters do not match, the parameters lists
@@ -1039,7 +1038,8 @@ parameter_lists_match(struct simple_node *list_a, struct simple_node *list_b)
/* FINISHME */ /* FINISHME */
node_b = next_elem(node_b); iter_a.next();
iter_b.next();
} }
return true; return true;
@@ -1047,22 +1047,19 @@ parameter_lists_match(struct simple_node *list_a, struct simple_node *list_b)
ir_instruction * ir_instruction *
ast_function_definition::hir(struct simple_node *instructions, ast_function_definition::hir(exec_list *instructions,
struct _mesa_glsl_parse_state *state) struct _mesa_glsl_parse_state *state)
{ {
ir_label *label; ir_label *label;
struct simple_node *ptr;
struct simple_node *tmp;
ir_function_signature *signature = NULL; ir_function_signature *signature = NULL;
ir_function *f = NULL; ir_function *f = NULL;
struct simple_node parameters; exec_list parameters;
/* Convert the list of function parameters to HIR now so that they can be /* Convert the list of function parameters to HIR now so that they can be
* used below to compare this function's signature with previously seen * used below to compare this function's signature with previously seen
* signatures for functions with the same name. * signatures for functions with the same name.
*/ */
make_empty_list(& parameters);
ast_function_parameters_to_hir(& this->prototype->parameters, & parameters, ast_function_parameters_to_hir(& this->prototype->parameters, & parameters,
state); state);
@@ -1075,8 +1072,8 @@ ast_function_definition::hir(struct simple_node *instructions,
_mesa_symbol_table_find_symbol(state->symbols, 0, _mesa_symbol_table_find_symbol(state->symbols, 0,
this->prototype->identifier); this->prototype->identifier);
if (f != NULL) { if (f != NULL) {
foreach (ptr, & f->signatures) { foreach_iter(exec_list_iterator, iter, f->signatures) {
signature = (struct ir_function_signature *) ptr; signature = (struct ir_function_signature *) iter.get();
/* Compare the parameter list of the function being defined to the /* Compare the parameter list of the function being defined to the
* existing function. If the parameter lists match, then the return * existing function. If the parameter lists match, then the return
@@ -1111,17 +1108,17 @@ ast_function_definition::hir(struct simple_node *instructions,
*/ */
if (signature == NULL) { if (signature == NULL) {
signature = new ir_function_signature(); signature = new ir_function_signature();
insert_at_tail(& f->signatures, (struct simple_node *) signature); f->signatures.push_tail(signature);
} else { } else {
/* Destroy all of the previous parameter information. The previous /* Destroy all of the previous parameter information. The previous
* parameter information comes from the function prototype, and it can * parameter information comes from the function prototype, and it can
* either include invalid parameter names or may not have names at all. * either include invalid parameter names or may not have names at all.
*/ */
foreach_s(ptr, tmp, & signature->parameters) { foreach_iter(exec_list_iterator, iter, signature->parameters) {
assert(((struct ir_instruction *)ptr)->mode == ir_op_var_decl); assert(((struct ir_instruction *)iter.get())->mode == ir_op_var_decl);
remove_from_list(ptr); iter.remove();
free(ptr); delete iter.get();
} }
} }
@@ -1135,7 +1132,7 @@ ast_function_definition::hir(struct simple_node *instructions,
if (signature->definition == NULL) { if (signature->definition == NULL) {
signature->definition = label; signature->definition = label;
} }
insert_at_tail(instructions, label); instructions->push_tail(label);
/* Add the function parameters to the symbol table. During this step the /* Add the function parameters to the symbol table. During this step the
* parameter declarations are also moved from the temporary "parameters" list * parameter declarations are also moved from the temporary "parameters" list
@@ -1143,13 +1140,13 @@ ast_function_definition::hir(struct simple_node *instructions,
* but they involve ugly linked-list gymnastics. * but they involve ugly linked-list gymnastics.
*/ */
_mesa_symbol_table_push_scope(state->symbols); _mesa_symbol_table_push_scope(state->symbols);
foreach_s(ptr, tmp, & parameters) { foreach_iter(exec_list_iterator, iter, parameters) {
struct ir_variable *const var = (struct ir_variable *) ptr; ir_variable *const var = (ir_variable *) iter.get();
assert(var->mode == ir_op_var_decl); assert(var->mode == ir_op_var_decl);
remove_from_list(ptr); iter.remove();
insert_at_tail(instructions, ptr); instructions->push_tail(var);
_mesa_symbol_table_add_symbol(state->symbols, 0, var->name, var); _mesa_symbol_table_add_symbol(state->symbols, 0, var->name, var);
} }

3
glsl_parser_extras.cpp
View File

@@ -681,7 +681,7 @@ main(int argc, char **argv)
char *shader; char *shader;
size_t shader_len; size_t shader_len;
struct simple_node *ptr; struct simple_node *ptr;
struct simple_node instructions; exec_list instructions;
(void) argc; (void) argc;
shader = load_text_file(argv[1], & shader_len); shader = load_text_file(argv[1], & shader_len);
@@ -698,7 +698,6 @@ main(int argc, char **argv)
((ast_node *)ptr)->print(); ((ast_node *)ptr)->print();
} }
make_empty_list(& instructions);
foreach (ptr, & state.translation_unit) { foreach (ptr, & state.translation_unit) {
((ast_node *)ptr)->hir(&instructions, &state); ((ast_node *)ptr)->hir(&instructions, &state);
} }

2
hir_field_selection.cpp
View File

@@ -127,7 +127,7 @@ generate_swizzle(const char *str, struct ir_swizzle_mask *swiz,
struct ir_instruction * struct ir_instruction *
_mesa_ast_field_selection_to_hir(const ast_expression *expr, _mesa_ast_field_selection_to_hir(const ast_expression *expr,
simple_node *instructions, exec_list *instructions,
struct _mesa_glsl_parse_state *state) struct _mesa_glsl_parse_state *state)
{ {
ir_instruction *op; ir_instruction *op;

4
ir.cpp
View File

@@ -105,12 +105,12 @@ ir_variable::ir_variable(const struct glsl_type *type, const char *name)
ir_function_signature::ir_function_signature(void) ir_function_signature::ir_function_signature(void)
: ir_instruction(ir_op_func_sig) : ir_instruction(ir_op_func_sig)
{ {
make_empty_list(& parameters); /* empty */
} }
ir_function::ir_function(void) ir_function::ir_function(void)
: ir_instruction(ir_op_func) : ir_instruction(ir_op_func)
{ {
make_empty_list(& signatures); /* empty */
} }

8
ir.h
View File

@@ -21,6 +21,8 @@
* DEALINGS IN THE SOFTWARE. * DEALINGS IN THE SOFTWARE.
*/ */
#include "list.h"
struct ir_program { struct ir_program {
void *bong_hits; void *bong_hits;
}; };
@@ -41,7 +43,7 @@ enum ir_opcodes {
/** /**
* Base class of all IR instructions * Base class of all IR instructions
*/ */
class ir_instruction : public simple_node { class ir_instruction : public exec_node {
public: public:
unsigned mode; unsigned mode;
const struct glsl_type *type; const struct glsl_type *type;
@@ -113,7 +115,7 @@ public:
/** /**
* List of function parameters stored as ir_variable objects. * List of function parameters stored as ir_variable objects.
*/ */
struct simple_node parameters; struct exec_list parameters;
/** /**
* Pointer to the label that begins the function definition. * Pointer to the label that begins the function definition.
@@ -134,7 +136,7 @@ public:
*/ */
const char *name; const char *name;
struct simple_node signatures; struct exec_list signatures;
}; };
/*@}*/ /*@}*/