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

* net/loveruby/cflat/compiler/CodeGenerator.java (allocateLocalVariables): refactoring: stackWordSize -> stackAlignment. 

git-svn-id: file:///Users/aamine/c/gitwork/public/cbc/trunk@3970 1b9489fe-b721-0410-924e-b54b9192deb8
This commit is contained in:
Minero Aoki 2008-08-29 08:18:15 +00:00
parent 14722b9d49
commit 4f50048234
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Fri Aug 29 17:18:03 2008 Minero Aoki <aamine@loveruby.net>
* net/loveruby/cflat/compiler/CodeGenerator.java
(allocateLocalVariables): refactoring:
stackWordSize -> stackAlignment.
Fri Aug 29 17:11:50 2008 Minero Aoki <aamine@loveruby.net>
* build.xml: test entry point is now run.sh.

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

@ -279,22 +279,23 @@ static public void p(String s) { System.err.println(s); }
*/
static final protected int stackDirection = -1; // stack grows lower
static final protected long stackWordSize = 4;
static final protected long stackAlignment = stackWordSize;
// 1 for return address, 1 for saved bp.
static final protected long paramStartOffset = 2;
static final protected long usedStackWords = 0;
protected void allocateParameters(DefinedFunction func) {
Iterator vars = func.parameters();
long i = paramStartOffset;
long offset = paramStartOffset;
while (vars.hasNext()) {
Parameter var = (Parameter)vars.next();
var.setAddress(lvarAddressByWord(i));
i++;
var.setAddress(lvarAddressByWord(offset));
offset++;
}
}
protected CompositeAddress lvarAddressByWord(long offset) {
return new CompositeAddress(offset * stackWordSize, bp());
return mem(offset * stackWordSize, bp());
}
protected void allocateLocalVariables(DefinedFunction func) {
@ -303,12 +304,12 @@ static public void p(String s) { System.err.println(s); }
while (vars.hasNext()) {
DefinedVariable var = (DefinedVariable)vars.next();
if (stackDirection < 0) {
len = align(len + var.allocSize(), stackWordSize);
var.setAddress(new CompositeAddress(-len, bp()));
len = align(len + var.allocSize(), stackAlignment);
var.setAddress(mem(-len, bp()));
}
else {
var.setAddress(new CompositeAddress(len, bp()));
len = align(len + var.allocSize(), stackWordSize);
var.setAddress(mem(len, bp()));
len = align(len + var.allocSize(), stackAlignment);
}
}
if (len != 0) {
@ -433,7 +434,8 @@ static public void p(String s) { System.err.println(s); }
CaseNode caseNode = (CaseNode)cases.next();
Iterator values = caseNode.values();
while (values.hasNext()) {
mov(imm(caseValue((Node)values.next())), reg("cx"));
IntegerLiteralNode ival = (IntegerLiteralNode)values.next();
mov(imm(ival.value()), reg("cx"));
cmp(t, reg("cx", t), reg("ax", t));
je(caseNode.beginLabel());
}
@ -444,14 +446,6 @@ static public void p(String s) { System.err.println(s); }
}
}
protected long caseValue(Node node) {
if (!(node instanceof IntegerLiteralNode)) {
// FIXME: use exception
throw new Error("case accepts only integer literal");
}
return ((IntegerLiteralNode)node).value();
}
public void visit(CaseNode node) {
label(node.beginLabel());
compile(node.body());