status-im
/
ethereumj-personal
mirror of https://github.com/status-im/ethereumj-personal.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Serpent Compiler: 

+ Labels encoding bug
This commit is contained in:
romanman 2014-06-10 11:49:38 +01:00
parent 9ae78521a6
commit a47ecf6f90
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ethereumj-core/src/main/java/org/ethereum/gui/SerpentEditor.java
View File

@ -231,6 +231,7 @@ public class SerpentEditor extends JFrame {
}else{
asmResult = SerpentCompiler.compile(codeArea.getText());
machineCode = SerpentCompiler.compileAssemblyToMachine(asmResult);
machineCode = SerpentCompiler.encodeMachineCodeForVMRun(machineCode, null);
}
} catch (Throwable th) {

22
ethereumj-core/src/main/java/org/ethereum/serpent/SerpentCompiler.java
View File

@ -135,8 +135,22 @@ public class SerpentCompiler {
}
// encode ref for 5 bytes
for (int i = 0; i < lexaList.size(); ++i){
String lexa = lexaList.get(i);
if (!lexa.contains("REF_")) continue;
lexaList.add(i + 1, lexa);
lexaList.add(i + 2, lexa);
lexaList.add(i + 3, lexa);
lexaList.add(i + 4, lexa);
i += 4;
}
// calc label pos & remove labels
HashMap<String, Integer> labels = new HashMap<String, Integer>();
for (int i = 0; i < lexaList.size(); ++i){
String lexa = lexaList.get(i);
@ -145,7 +159,9 @@ public class SerpentCompiler {
String label = lexaList.remove(i);
String labelNum = label.split("LABEL_")[1];
labels.put(labelNum, i);
int labelPos = i;
labels.put(labelNum, labelPos);
--i;
}
@ -156,6 +172,10 @@ public class SerpentCompiler {
if (!lexa.contains("REF_")) continue;
String ref = lexaList.remove(i);
lexaList.remove(i);
lexaList.remove(i);
lexaList.remove(i);
lexaList.remove(i);
String labelNum = ref.split("REF_")[1];
Integer pos = labels.get(labelNum);