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

r4751@macbookpro: aamine | 2009-05-06 18:40:33 +0900 

* net/loveruby/cflat/compiler/IRGenerator.java: assignBeforeStmt is useless.  Use assign instead.
 * net/loveruby/cflat/compiler/IRGenerator.java: should be able to create tmp in variable initializers for also function toplevel block.
 * net/loveruby/cflat/compiler/IRGenerator.java: move funcall before stmt.
 * net/loveruby/cflat/compiler/CodeGenerator.java: do not display "(null)" location.
 


git-svn-id: file:///Users/aamine/c/gitwork/public/cbc/trunk@4184 1b9489fe-b721-0410-924e-b54b9192deb8
This commit is contained in:
Minero Aoki 2009-05-08 10:40:57 +00:00
parent 98937145c8
commit 8a57dbbdd8
3 changed files with 54 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ChangeLog
View File

@ -1,3 +1,18 @@
Wed May 6 18:41:06 2009 Minero Aoki <aamine@loveruby.net>
* net/loveruby/cflat/compiler/IRGenerator.java: assignBeforeStmt
is useless. Use assign instead.
* net/loveruby/cflat/compiler/IRGenerator.java: should be able to
create tmp in variable initializers for also function toplevel
block.
* net/loveruby/cflat/compiler/IRGenerator.java: move funcall
before stmt.
* net/loveruby/cflat/compiler/CodeGenerator.java: do not display
"(null)" location.
Wed May 6 17:08:40 2009 Minero Aoki <aamine@loveruby.net>
* net/loveruby/cflat/compiler/CodeGenerator.java: refactoring:

5
net/loveruby/cflat/compiler/CodeGenerator.java
View File

@ -746,10 +746,7 @@ public class CodeGenerator implements IRVisitor<Void,Void>, ELFConstants {
// #@@range/compileStmt{
protected void compileStmt(Stmt stmt) {
if (options.isVerboseAsm()) {
if (stmt.location() == null) {
as.comment("(null)");
}
else {
if (stmt.location() != null) {
as.comment(stmt.location().numberedLine());
}
}

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

@ -57,11 +57,9 @@ class IRGenerator implements ASTVisitor<Void, Expr> {
return stmts;
}
private int beforeStmt;
private int exprNestLevel = 0;
private void transformStmt(StmtNode node) {
beforeStmt = stmts.size();
node.accept(this);
}
@ -90,19 +88,6 @@ class IRGenerator implements ASTVisitor<Void, Expr> {
return (exprNestLevel == 0);
}
// insert node before the current statement.
private void assignBeforeStmt(Expr lhs, Expr rhs) {
stmts.add(beforeStmt, new Assign(null, lhs, rhs));
beforeStmt++;
}
private void addExprStmt(ExprNode expr) {
Expr e = expr.accept(this);
if (e != null) {
stmts.add(new ExprStmt(expr.location(), e));
}
}
private void label(Label label) {
stmts.add(new LabelStmt(null, label));
}
@ -152,6 +137,7 @@ class IRGenerator implements ASTVisitor<Void, Expr> {
//
public Void visit(BlockNode node) {
scopeStack.add(node.scope());
for (DefinedVariable var : node.variables()) {
if (var.hasInitializer()) {
if (var.isPrivate()) {
@ -164,7 +150,6 @@ class IRGenerator implements ASTVisitor<Void, Expr> {
}
}
}
scopeStack.add(node.scope());
for (StmtNode s : node.stmts()) {
transformStmt(s);
}
@ -173,7 +158,12 @@ class IRGenerator implements ASTVisitor<Void, Expr> {
}
public Void visit(ExprStmtNode node) {
addExprStmt(node.expr());
// do not use transformStmt here, to receive compiled tree.
Expr e = node.expr().accept(this);
if (e != null) {
//stmts.add(new ExprStmt(node.expr().location(), e));
errorHandler.warn(node.location(), "useless expression");
}
return null;
}
@ -455,19 +445,22 @@ class IRGenerator implements ASTVisitor<Void, Expr> {
public Expr visit(AssignNode node) {
if (isStatement()) {
assign(transformLHS(node.lhs()), transformExpr(node.rhs()));
// Evaluate RHS before LHS.
Expr rhs = transformExpr(node.rhs());
assign(transformLHS(node.lhs()), rhs);
return null;
}
else {
// lhs = rhs -> tmp = rhs, lhs = tmp, tmp
DefinedVariable tmp = tmpVar(node.rhs().type());
assignBeforeStmt(ref(tmp), transformExpr(node.rhs()));
assignBeforeStmt(transformLHS(node.lhs()), ref(tmp));
assign(ref(tmp), transformExpr(node.rhs()));
assign(transformLHS(node.lhs()), ref(tmp));
return ref(tmp);
}
}
public Expr visit(OpAssignNode node) {
// evaluate rhs before lhs.
// Evaluate RHS before LHS.
Expr rhs = transformExpr(node.rhs());
Expr lhs = transformLHS(node.lhs());
return transformOpAssign(lhs,
@ -486,8 +479,8 @@ class IRGenerator implements ASTVisitor<Void, Expr> {
// a = &lhs, *a = *a op rhs, *a
Expr addr = addressOf(lhs);
DefinedVariable a = tmpVar(pointerTo(lhsType));
assignBeforeStmt(ref(a), addr);
assignBeforeStmt(deref(a), new Bin(lhs.type(), op, deref(a), rhs));
assign(ref(a), addr);
assign(deref(a), new Bin(lhs.type(), op, deref(a), rhs));
return deref(a);
}
@ -521,10 +514,10 @@ class IRGenerator implements ASTVisitor<Void, Expr> {
else if (lhs.isConstantAddress()) {
// f(expr++) -> v = expr; expr = expr + 1, f(v)
DefinedVariable v = tmpVar(node.expr().type());
assignBeforeStmt(ref(v), lhs);
assign(ref(v), lhs);
Expr rhs = expandPointerArithmetic(intValue(1),
op, node.expr().type());
assignBeforeStmt(lhs, new Bin(lhs.type(), op, lhs, rhs));
assign(lhs, new Bin(lhs.type(), op, lhs, rhs));
return ref(v);
}
else {
@ -532,9 +525,9 @@ class IRGenerator implements ASTVisitor<Void, Expr> {
Expr addr = addressOf(lhs);
DefinedVariable a = tmpVar(pointerTo(node.expr().type()));
DefinedVariable v = tmpVar(node.expr().type());
assignBeforeStmt(ref(a), addr);
assignBeforeStmt(ref(v), deref(a));
assignBeforeStmt(deref(a),
assign(ref(a), addr);
assign(ref(v), deref(a));
assign(deref(a),
new Bin(lhs.type(), op,
deref(a),
expandPointerArithmetic(intValue(1),
@ -549,8 +542,23 @@ class IRGenerator implements ASTVisitor<Void, Expr> {
while (args.hasPrevious()) {
newArgs.add(0, transformExpr(args.previous()));
}
return new Call(asmType(node.type()),
transformExpr(node.expr()), newArgs);
if (isStatement()) {
stmts.add(
new ExprStmt(node.location(),
new Call(asmType(node.type()),
transformExpr(node.expr()),
newArgs)));
return null;
}
else {
DefinedVariable tmp = tmpVar(node.type());
assign(node.location(),
ref(tmp),
new Call(asmType(node.type()),
transformExpr(node.expr()),
newArgs));
return ref(tmp);
}
}
//