aboutsummaryrefslogtreecommitdiffstats
path: root/Compiler.cpp
diff options
context:
space:
mode:
authorGav Wood <i@gavwood.com>2014-07-27 19:09:36 +0800
committerGav Wood <i@gavwood.com>2014-07-27 19:09:36 +0800
commited0209fefc50ab59b43b7f781410699c49445aab (patch)
treef82f1e4fee307efb67a16d9fb82e37c78e16b5b1 /Compiler.cpp
parent510abc0997c248a1a767ceade6749f426ae3a968 (diff)
downloaddexon-solidity-ed0209fefc50ab59b43b7f781410699c49445aab.tar
dexon-solidity-ed0209fefc50ab59b43b7f781410699c49445aab.tar.gz
dexon-solidity-ed0209fefc50ab59b43b7f781410699c49445aab.tar.bz2
dexon-solidity-ed0209fefc50ab59b43b7f781410699c49445aab.tar.lz
dexon-solidity-ed0209fefc50ab59b43b7f781410699c49445aab.tar.xz
dexon-solidity-ed0209fefc50ab59b43b7f781410699c49445aab.tar.zst
dexon-solidity-ed0209fefc50ab59b43b7f781410699c49445aab.zip
Updates to assembler - see the sub-codes.
Diffstat (limited to 'Compiler.cpp')
-rw-r--r--Compiler.cpp9
1 files changed, 2 insertions, 7 deletions
diff --git a/Compiler.cpp b/Compiler.cpp
index 1621acf9..ebe2638b 100644
--- a/Compiler.cpp
+++ b/Compiler.cpp
@@ -34,9 +34,7 @@ bytes eth::compileLLL(string const& _src, bool _opt, vector<string>* _errors)
CompilerState cs;
cs.populateStandard();
auto f = CodeFragment::compile(_src, cs);
- if (_opt)
- f.optimise();
- bytes ret = f.code(cs);
+ bytes ret = f.assembly(cs).optimise(_opt).assemble();
for (auto i: cs.treesToKill)
killBigints(i);
return ret;
@@ -60,10 +58,7 @@ std::string eth::compileLLLToAsm(std::string const& _src, bool _opt, std::vector
{
CompilerState cs;
cs.populateStandard();
- auto f = CodeFragment::compile(_src, cs);
- if (_opt)
- f.optimise();
- string ret = f.assembly(cs);
+ string ret = CodeFragment::compile(_src, cs).assembly(cs).optimise(_opt).out();
for (auto i: cs.treesToKill)
killBigints(i);
return ret;