#include <msp/core/algorithm.h>
+#include <msp/core/raii.h>
#include "reflect.h"
using namespace std;
r_result = false;
if(var1->array_size && var.array_size)
compare(*var1->array_size, *var.array_size);
+ else if(!var1->array_size && !var.array_size)
+ r_result = true;
}
if(r_result && var1->type_declaration!=var.type_declaration)
compare(*var1->type_declaration, *var.type_declaration);
}
else if(basic.kind==BasicTypeDeclaration::ARRAY)
basic.base_type->visit(*this);
+
+ if(basic.extended_alignment)
+ r_alignment = (r_alignment+15)&~15U;
}
void MemoryRequirementsCalculator::visit(StructDeclaration &strct)
r_alignment = 1;
r_offset = -1;
s->visit(*this);
- if(r_offset)
+ if(r_offset>=0)
total = r_offset;
total += r_alignment-1;
total -= total%r_alignment;
}
r_size = total;
r_alignment = max_align;
+ if(strct.extended_alignment)
+ r_alignment = (r_alignment+15)&~15U;
+ r_size += r_alignment-1;
+ r_size -= r_size%r_alignment;
}
void MemoryRequirementsCalculator::visit(VariableDeclaration &var)
{
- if(var.layout)
- {
- auto i = find_member(var.layout->qualifiers, string("offset"), &Layout::Qualifier::name);
- if(i!=var.layout->qualifiers.end())
- r_offset = i->value;
- }
+ r_offset = get_layout_value(var.layout.get(), "offset");
if(var.type_declaration)
var.type_declaration->visit(*this);
{
unsigned aligned_size = r_size+r_alignment-1;
aligned_size -= aligned_size%r_alignment;
- r_size += aligned_size*(literal->value.value<int>()-1);
+ r_size = aligned_size*literal->value.value<int>();
}
}
}
}
-void DependencyCollector::visit(InterfaceBlockReference &iface)
-{
- if(iface.declaration)
- {
- dependencies.insert(iface.declaration);
- iface.declaration->visit(*this);
- }
-}
-
void DependencyCollector::visit(FunctionCall &call)
{
if(call.declaration)
}
-set<VariableDeclaration *> AssignmentCollector::apply(Node &node)
+set<Node *> AssignmentCollector::apply(Node &node)
{
node.visit(*this);
return assigned_variables;
}
+void AssignmentCollector::visit(VariableReference &var)
+{
+ if(assignment_target)
+ assigned_variables.insert(var.declaration);
+}
+
+void AssignmentCollector::visit(UnaryExpression &unary)
+{
+ SetFlag set_assignment(assignment_target, (unary.oper->token[1]=='+' || unary.oper->token[1]=='-'));
+ TraversingVisitor::visit(unary);
+}
+
+void AssignmentCollector::visit(BinaryExpression &binary)
+{
+ binary.left->visit(*this);
+ SetFlag clear_assignment(assignment_target, false);
+ binary.right->visit(*this);
+}
+
void AssignmentCollector::visit(Assignment &assign)
{
- if(VariableDeclaration *var = dynamic_cast<VariableDeclaration *>(assign.target.declaration))
- assigned_variables.insert(var);
+ {
+ SetFlag set_assignment(assignment_target);
+ assign.left->visit(*this);
+ }
+ assign.right->visit(*this);
}
} // namespace SL