natas_hw
/
cbc
mirror of https://github.com/aamine/cbc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

r4762@macbookpro: aamine | 2009-05-07 13:00:19 +0900 

* net/loveruby/cflat/compiler/IRGenerator.java: should not return Expr for stmt, to suppress wrong warning.
 


git-svn-id: file:///Users/aamine/c/gitwork/public/cbc/trunk@4193 1b9489fe-b721-0410-924e-b54b9192deb8
This commit is contained in:
Minero Aoki 2009-05-08 10:41:03 +00:00
parent f37b34ab93
commit 6e8bfed7a3
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Thu May 7 13:00:09 2009 Minero Aoki <aamine@loveruby.net>
* net/loveruby/cflat/compiler/IRGenerator.java: should not return
Expr for stmt, to suppress wrong warning.
Thu May 7 12:55:41 2009 Minero Aoki <aamine@loveruby.net>
* net/loveruby/cflat/compiler/IRGenerator.java (AddressNode):

25
net/loveruby/cflat/compiler/IRGenerator.java
View File

@ -414,7 +414,7 @@ class IRGenerator implements ASTVisitor<Void, Expr> {
assign(ref(var), transformExpr(node.elseExpr()));
jump(endLabel);
label(endLabel);
return ref(var);
return isStatement() ? null : ref(var);
}
public Expr visit(LogicalAndNode node) {
@ -427,7 +427,7 @@ class IRGenerator implements ASTVisitor<Void, Expr> {
label(rightLabel);
assign(ref(var), transformExpr(node.right()));
label(endLabel);
return ref(var);
return isStatement() ? null : ref(var);
}
public Expr visit(LogicalOrNode node) {
@ -440,7 +440,7 @@ class IRGenerator implements ASTVisitor<Void, Expr> {
label(rightLabel);
assign(ref(var), transformExpr(node.right()));
label(endLabel);
return ref(var);
return isStatement() ? null : ref(var);
}
public Expr visit(AssignNode node) {
@ -472,16 +472,18 @@ class IRGenerator implements ASTVisitor<Void, Expr> {
private Expr transformOpAssign(Expr lhs, Op op, Expr _rhs, Type lhsType) {
Expr rhs = expandPointerArithmetic(_rhs, op, lhsType);
if (lhs.isConstantAddress()) {
// lhs = lhs op rhs
// lhs = lhs op rhs, lhs
assign(lhs, new Bin(lhs.type(), op, lhs, rhs));
return isStatement() ? null : lhs;
}
// a = &lhs, *a = *a op rhs, *a
Expr addr = addressOf(lhs);
DefinedVariable a = tmpVar(pointerTo(lhsType));
assign(ref(a), addr);
assign(deref(a), new Bin(lhs.type(), op, deref(a), rhs));
return deref(a);
else {
// a = &lhs, *a = *a op rhs, *a
Expr addr = addressOf(lhs);
DefinedVariable a = tmpVar(pointerTo(lhsType));
assign(ref(a), addr);
assign(deref(a), new Bin(lhs.type(), op, deref(a), rhs));
return isStatement() ? null : deref(a);
}
}
private Expr expandPointerArithmetic(Expr rhs, Op op, Type lhsType) {
@ -509,7 +511,8 @@ class IRGenerator implements ASTVisitor<Void, Expr> {
Op op = binOp(node.operator());
if (isStatement()) {
// expr++; -> expr += 1;
return transformOpAssign(lhs, op, intValue(1), node.expr().type());
transformOpAssign(lhs, op, intValue(1), node.expr().type());
return null;
}
else if (lhs.isConstantAddress()) {
// f(expr++) -> v = expr; expr = expr + 1, f(v)