srenblad
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

compiler/ir_ast_body,ir_values: minor fixes

This commit is contained in:
Sebastien Bourdeauducq 2014-08-18 22:51:24 +08:00
parent a5e5b5c870
commit 4ff61a8f56
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
artiq/compiler/ir_ast_body.py
View File

@ -97,7 +97,7 @@ class Visitor:
old_comparator = self.visit_expression(node.left) old_comparator = self.visit_expression(node.left)
for op, comparator_a in zip(node.ops, node.comparators): for op, comparator_a in zip(node.ops, node.comparators):
comparator = self.visit_expression(comparator_a) comparator = self.visit_expression(comparator_a)
comparison = ast_cmps[type(op)](old_comparator, comparator) comparison = ast_cmps[type(op)](old_comparator, comparator, self.builder)
comparisons.append(comparison) comparisons.append(comparison)
old_comparator = comparator old_comparator = comparator
r = comparisons[0] r = comparisons[0]
@ -136,14 +136,14 @@ class Visitor:
val = self.visit_expression(node.value) val = self.visit_expression(node.value)
for target in node.targets: for target in node.targets:
if isinstance(target, ast.Name): if isinstance(target, ast.Name):
self.builder.store(val, self.ns[target.id]) self.builder.store(val.llvm_value, self.ns[target.id].llvm_value)
else: else:
raise NotImplementedError raise NotImplementedError
def _visit_stmt_AugAssign(self, node): def _visit_stmt_AugAssign(self, node):
val = self.visit_expression(ast.BinOp(op=node.op, left=node.target, right=node.value)) val = self.visit_expression(ast.BinOp(op=node.op, left=node.target, right=node.value))
if isinstance(node.target, ast.Name): if isinstance(node.target, ast.Name):
self.builder.store(val, self.ns[node.target.id]) self.builder.store(val.llvm_value, self.ns[node.target.id].llvm_value)
else: else:
raise NotImplementedError raise NotImplementedError
@ -175,8 +175,8 @@ class Visitor:
else_block = function.append_basic_block("w_else") else_block = function.append_basic_block("w_else")
merge_block = function.append_basic_block("w_merge") merge_block = function.append_basic_block("w_merge")
condition = self.visit_expression(node.test) condition = ir_values.operators.bool(self.visit_expression(node.test), self.builder)
self.builder.cbranch(condition, body_block, else_block) self.builder.cbranch(condition.llvm_value, body_block, else_block)
self.builder.position_at_end(body_block) self.builder.position_at_end(body_block)
self.visit_statements(node.body) self.visit_statements(node.body)

2
artiq/compiler/ir_values.py
View File

@ -107,7 +107,7 @@ def _make_vint_cmp_method(icmp_val):
if builder is None: if builder is None:
return VBool() return VBool()
else: else:
return VBool(llvm_value=builder.icmp(icmp_val, self, other)) return VBool(llvm_value=builder.icmp(icmp_val, self.llvm_value, other.llvm_value))
else: else:
return NotImplemented return NotImplemented
return cmp_method return cmp_method