summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ast.h17
-rw-r--r--ast_to_hir.cpp63
-rw-r--r--glsl_parser_extras.cpp3
-rw-r--r--hir_field_selection.cpp2
-rw-r--r--ir.cpp4
-rw-r--r--ir.h8
6 files changed, 48 insertions, 49 deletions
diff --git a/ast.h b/ast.h
index 96f2e3bb039..fa84a915749 100644
--- a/ast.h
+++ b/ast.h
@@ -26,6 +26,7 @@
#define AST_H
#include "main/simple_list.h"
+#include "list.h"
#include "glsl_parser_extras.h"
struct ir_instruction;
@@ -37,7 +38,7 @@ class ast_node : public simple_node {
public:
virtual ~ast_node();
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);
/**
@@ -151,7 +152,7 @@ public:
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);
virtual void print(void) const;
@@ -198,7 +199,7 @@ public:
ast_compound_statement(int new_scope, ast_node *statements);
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);
int new_scope;
@@ -338,7 +339,7 @@ public:
ast_declarator_list(ast_fully_specified_type *);
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);
ast_fully_specified_type *type;
@@ -359,7 +360,7 @@ class ast_parameter_declarator : public ast_node {
public:
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);
ast_fully_specified_type *type;
@@ -406,7 +407,7 @@ public:
ast_expression_statement(ast_expression *);
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);
ast_expression *expression;
@@ -483,7 +484,7 @@ class ast_function_definition : public ast_node {
public:
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);
ast_function *prototype;
@@ -493,7 +494,7 @@ public:
extern struct ir_instruction *
_mesa_ast_field_selection_to_hir(const struct ast_expression *expr,
- struct simple_node *instructions,
+ exec_list *instructions,
struct _mesa_glsl_parse_state *state);
#endif /* AST_H */
diff --git a/ast_to_hir.cpp b/ast_to_hir.cpp
index e7f21ee2524..3342eae8c30 100644
--- a/ast_to_hir.cpp
+++ b/ast_to_hir.cpp
@@ -330,7 +330,7 @@ relational_result_type(const struct glsl_type *type_a,
ir_instruction *
-ast_node::hir(struct simple_node *instructions,
+ast_node::hir(exec_list *instructions,
struct _mesa_glsl_parse_state *state)
{
(void) instructions;
@@ -341,7 +341,7 @@ ast_node::hir(struct simple_node *instructions,
ir_instruction *
-ast_expression::hir(struct simple_node *instructions,
+ast_expression::hir(exec_list *instructions,
struct _mesa_glsl_parse_state *state)
{
static const int operations[AST_NUM_OPERATORS] = {
@@ -717,7 +717,7 @@ ast_expression::hir(struct simple_node *instructions,
ir_instruction *
-ast_expression_statement::hir(struct simple_node *instructions,
+ast_expression_statement::hir(exec_list *instructions,
struct _mesa_glsl_parse_state *state)
{
/* 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 *
-ast_compound_statement::hir(struct simple_node *instructions,
+ast_compound_statement::hir(exec_list *instructions,
struct _mesa_glsl_parse_state *state)
{
struct simple_node *ptr;
@@ -880,7 +880,7 @@ apply_type_qualifier_to_variable(const struct ast_type_qualifier *qual,
ir_instruction *
-ast_declarator_list::hir(struct simple_node *instructions,
+ast_declarator_list::hir(exec_list *instructions,
struct _mesa_glsl_parse_state *state)
{
struct simple_node *ptr;
@@ -953,7 +953,7 @@ ast_declarator_list::hir(struct simple_node *instructions,
continue;
}
- insert_at_tail(instructions, (struct simple_node *) var);
+ instructions->push_tail(var);
/* FINISHME: Process the declaration initializer. */
}
@@ -965,7 +965,7 @@ ast_declarator_list::hir(struct simple_node *instructions,
ir_instruction *
-ast_parameter_declarator::hir(struct simple_node *instructions,
+ast_parameter_declarator::hir(exec_list *instructions,
struct _mesa_glsl_parse_state *state)
{
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);
- insert_at_tail(instructions, var);
+ instructions->push_tail(var);
/* Parameter declarations do not have r-values.
*/
@@ -1007,7 +1007,7 @@ ast_parameter_declarator::hir(struct simple_node *instructions,
static void
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 simple_node *ptr;
@@ -1019,18 +1019,17 @@ ast_function_parameters_to_hir(struct simple_node *ast_parameters,
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;
- struct simple_node *node_b;
+ exec_list_iterator iter_a = list_a->iterator();
+ exec_list_iterator iter_b = list_b->iterator();
- node_b = first_elem(list_b);
- foreach (node_a, list_a) {
+ while (iter_a.has_next()) {
/* If all of the parameters from the other parameter list have been
* exhausted, the lists have different length and, by definition,
* do not match.
*/
- if (at_end(list_b, node_b))
+ if (!iter_b.has_next())
return false;
/* 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 */
- node_b = next_elem(node_b);
+ iter_a.next();
+ iter_b.next();
}
return true;
@@ -1047,22 +1047,19 @@ parameter_lists_match(struct simple_node *list_a, struct simple_node *list_b)
ir_instruction *
-ast_function_definition::hir(struct simple_node *instructions,
+ast_function_definition::hir(exec_list *instructions,
struct _mesa_glsl_parse_state *state)
{
ir_label *label;
- struct simple_node *ptr;
- struct simple_node *tmp;
ir_function_signature *signature = 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
* used below to compare this function's signature with previously seen
* signatures for functions with the same name.
*/
- make_empty_list(& parameters);
ast_function_parameters_to_hir(& this->prototype->parameters, & parameters,
state);
@@ -1075,8 +1072,8 @@ ast_function_definition::hir(struct simple_node *instructions,
_mesa_symbol_table_find_symbol(state->symbols, 0,
this->prototype->identifier);
if (f != NULL) {
- foreach (ptr, & f->signatures) {
- signature = (struct ir_function_signature *) ptr;
+ foreach_iter(exec_list_iterator, iter, f->signatures) {
+ signature = (struct ir_function_signature *) iter.get();
/* Compare the parameter list of the function being defined to the
* 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) {
signature = new ir_function_signature();
- insert_at_tail(& f->signatures, (struct simple_node *) signature);
+ f->signatures.push_tail(signature);
} else {
/* Destroy all of the previous parameter information. The previous
* parameter information comes from the function prototype, and it can
* either include invalid parameter names or may not have names at all.
*/
- foreach_s(ptr, tmp, & signature->parameters) {
- assert(((struct ir_instruction *)ptr)->mode == ir_op_var_decl);
+ foreach_iter(exec_list_iterator, iter, signature->parameters) {
+ assert(((struct ir_instruction *)iter.get())->mode == ir_op_var_decl);
- remove_from_list(ptr);
- free(ptr);
+ iter.remove();
+ delete iter.get();
}
}
@@ -1135,7 +1132,7 @@ ast_function_definition::hir(struct simple_node *instructions,
if (signature->definition == NULL) {
signature->definition = label;
}
- insert_at_tail(instructions, label);
+ instructions->push_tail(label);
/* Add the function parameters to the symbol table. During this step the
* 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.
*/
_mesa_symbol_table_push_scope(state->symbols);
- foreach_s(ptr, tmp, & parameters) {
- struct ir_variable *const var = (struct ir_variable *) ptr;
+ foreach_iter(exec_list_iterator, iter, parameters) {
+ ir_variable *const var = (ir_variable *) iter.get();
assert(var->mode == ir_op_var_decl);
- remove_from_list(ptr);
- insert_at_tail(instructions, ptr);
+ iter.remove();
+ instructions->push_tail(var);
_mesa_symbol_table_add_symbol(state->symbols, 0, var->name, var);
}
diff --git a/glsl_parser_extras.cpp b/glsl_parser_extras.cpp
index 602f2cc5b21..a166fbcd09f 100644
--- a/glsl_parser_extras.cpp
+++ b/glsl_parser_extras.cpp
@@ -681,7 +681,7 @@ main(int argc, char **argv)
char *shader;
size_t shader_len;
struct simple_node *ptr;
- struct simple_node instructions;
+ exec_list instructions;
(void) argc;
shader = load_text_file(argv[1], & shader_len);
@@ -698,7 +698,6 @@ main(int argc, char **argv)
((ast_node *)ptr)->print();
}
- make_empty_list(& instructions);
foreach (ptr, & state.translation_unit) {
((ast_node *)ptr)->hir(&instructions, &state);
}
diff --git a/hir_field_selection.cpp b/hir_field_selection.cpp
index 1dd81264407..326a10543fe 100644
--- a/hir_field_selection.cpp
+++ b/hir_field_selection.cpp
@@ -127,7 +127,7 @@ generate_swizzle(const char *str, struct ir_swizzle_mask *swiz,
struct ir_instruction *
_mesa_ast_field_selection_to_hir(const ast_expression *expr,
- simple_node *instructions,
+ exec_list *instructions,
struct _mesa_glsl_parse_state *state)
{
ir_instruction *op;
diff --git a/ir.cpp b/ir.cpp
index 7bd7854ccb8..2eac2c90cd1 100644
--- a/ir.cpp
+++ b/ir.cpp
@@ -105,12 +105,12 @@ ir_variable::ir_variable(const struct glsl_type *type, const char *name)
ir_function_signature::ir_function_signature(void)
: ir_instruction(ir_op_func_sig)
{
- make_empty_list(& parameters);
+ /* empty */
}
ir_function::ir_function(void)
: ir_instruction(ir_op_func)
{
- make_empty_list(& signatures);
+ /* empty */
}
diff --git a/ir.h b/ir.h
index 304f1dccfe0..b728631d785 100644
--- a/ir.h
+++ b/ir.h
@@ -21,6 +21,8 @@
* DEALINGS IN THE SOFTWARE.
*/
+#include "list.h"
+
struct ir_program {
void *bong_hits;
};
@@ -41,7 +43,7 @@ enum ir_opcodes {
/**
* Base class of all IR instructions
*/
-class ir_instruction : public simple_node {
+class ir_instruction : public exec_node {
public:
unsigned mode;
const struct glsl_type *type;
@@ -113,7 +115,7 @@ public:
/**
* 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.
@@ -134,7 +136,7 @@ public:
*/
const char *name;
- struct simple_node signatures;
+ struct exec_list signatures;
};
/*@}*/
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-19 02:34:59 +0000