Skip to content

Commit

Permalink
Refactored send function compile
Browse files Browse the repository at this point in the history
  • Loading branch information
@maccasoft
maccasoft committed Dec 16, 2023
1 parent 7ea077b commit 98a923d
Show file tree
Hide file tree
Showing 2 changed files with 110 additions and 23 deletions.
7 changes: 2 additions & 5 deletions modules/spin-tools/src-tests/com/maccasoft/propeller/spin2/Spin2ObjectCompilerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3148,7 +3148,7 @@ void testSendBytes() throws Exception {
+ "' PUB main() | a\n"
+ "00008 00008 01 (stack size)\n"
+ "' SEND(1,2,3)\n"
+ "00009 00009 0E 03 01 02 03 SEND\n"
+ "00009 00009 0E 03 01 02 03 SEND_BYTES\n"
+ "0000E 0000E 04 RETURN\n"
+ "0000F 0000F 00 Padding\n"
+ "", compile(text));
Expand All @@ -3172,10 +3172,7 @@ void testSendMixed() throws Exception {
+ "' SEND(a,2,3)\n"
+ "00009 00009 E0 VAR_READ LONG DBASE+$00000 (short)\n"
+ "0000A 0000A 0D SEND\n"
+ "0000B 0000B A3 CONSTANT (2)\n"
+ "0000C 0000C 0D SEND\n"
+ "0000D 0000D A4 CONSTANT (3)\n"
+ "0000E 0000E 0D SEND\n"
+ "0000B 0000B 0E 02 02 03 SEND_BYTES\n"
+ "0000F 0000F 04 RETURN\n"
+ "", compile(text));
}
Expand Down
126 changes: 108 additions & 18 deletions modules/spin-tools/src/com/maccasoft/propeller/spin2/Spin2BytecodeCompiler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,28 +178,78 @@ else if (s.startsWith("%")) {
if (node.getChildCount() == 0) {
throw new RuntimeException("syntax error");
}
boolean bytes = true;
for (Spin2StatementNode child : node.getChilds()) {
if (child.getType() != Token.NUMBER) {
bytes = false;
break;

ByteArrayOutputStream os = new ByteArrayOutputStream();
int i = 0;
while (i < node.getChildCount()) {
Spin2StatementNode child = node.getChild(i++);

boolean isByte = false;
if (child.getType() == Token.STRING) {
String s = child.getText();
os.write(s.substring(1, s.length() - 1).getBytes());
isByte = true;
}
}
if (bytes) {
byte[] code = new byte[node.getChildCount() + 2];
code[0] = 0x0E;
code[1] = (byte) node.getChildCount();
for (int i = 0; i < node.getChildCount(); i++) {
code[i + 2] = (byte) new NumberLiteral(node.getChild(i).getText()).getNumber().intValue();
else {
try {
Expression expression = buildConstantExpression(context, child);
if (expression.isConstant()) {
int value = expression.getNumber().intValue();
if (value >= 0x00 && value <= 0xFF) {
os.write(value);
isByte = true;
}
}
} catch (Exception e) {
// Do nothing
}
}
source.add(new Bytecode(context, code, node.getText().toUpperCase()));
}
else {
for (Spin2StatementNode child : node.getChilds()) {
source.addAll(compileBytecodeExpression(context, method, child, true));
source.add(new Bytecode(context, 0x0D, node.getText().toUpperCase()));
if (!isByte) {
if (os.size() == 1) {
source.addAll(compileConstantExpression(context, method, node.getChild(i - 1)));
source.add(new Bytecode(context, 0x0D, node.getText().toUpperCase()));
os = new ByteArrayOutputStream();
}
else if (os.size() != 0) {
byte[] code = new byte[os.size() + 2];
code[0] = 0x0E;
code[1] = (byte) os.size();
System.arraycopy(os.toByteArray(), 0, code, 2, os.size());
source.add(new Bytecode(context, code, node.getText().toUpperCase() + "_BYTES"));
os = new ByteArrayOutputStream();
}

boolean popValue = false;

Method methodExpression = getMethodExpression(context, child);
if (methodExpression != null) {
if (methodExpression.getReturnsCount() > 1) {
throw new CompilerException("send parameter cannot return multiple values", child.getTokens());
}
popValue = methodExpression.getReturnsCount() != 0;
source.addAll(compileMethodCall(context, method, methodExpression, child, popValue, false));
}
else {
source.addAll(compileConstantExpression(context, method, child));
popValue = true;
}

if (popValue) {
source.add(new Bytecode(context, 0x0D, node.getText().toUpperCase()));
}
}
}
if (os.size() == 1) {
source.addAll(compileConstantExpression(context, method, node.getChild(i - 1)));
source.add(new Bytecode(context, 0x0D, node.getText().toUpperCase()));
}
else if (os.size() != 0) {
byte[] code = new byte[os.size() + 2];
code[0] = 0x0E;
code[1] = (byte) os.size();
System.arraycopy(os.toByteArray(), 0, code, 2, os.size());
source.add(new Bytecode(context, code, node.getText().toUpperCase() + "_BYTES"));
}
return source;
}
}
Expand Down Expand Up @@ -1870,6 +1920,46 @@ else if (write) {
return source;
}

Method getMethodExpression(Context context, Spin2StatementNode node) {
Expression symbol = context.getLocalSymbol(node.getText());

if (symbol instanceof SpinObject) {
Spin2StatementNode methodNode = null;

int n = 0;
if (n < node.getChildCount()) {
if (node.getChild(n) instanceof Spin2StatementNode.Index) {
node.getChild(n++);
}
}
if (n < node.getChildCount()) {
methodNode = node.getChild(n++);
}
if (n < node.getChildCount() || methodNode == null) {
throw new CompilerException("syntax error", node.getTokens());
}

String qualifiedName = node.getText() + methodNode.getText();

symbol = context.getLocalSymbol(qualifiedName);
if (symbol == null && isAddress(qualifiedName)) {
symbol = context.getLocalSymbol(qualifiedName.substring(1));
}
if (symbol == null) {
throw new CompilerException("undefined symbol " + methodNode.getText(), methodNode.getToken());
}
if (!(symbol instanceof Method)) {
throw new CompilerException(methodNode.getText() + " is not a method", methodNode.getToken());
}
return (Method) symbol;
}
if (symbol instanceof Method) {
return (Method) symbol;
}

return null;
}

List<Spin2Bytecode> compileMethodCall(Context context, Spin2Method method, Expression symbol, Spin2StatementNode node, boolean push, boolean trap) {
List<Spin2Bytecode> source = new ArrayList<Spin2Bytecode>();

Expand Down

0 comments on commit 98a923d

Please sign in to comment.