diff options
| author | chriseth <chris@ethereum.org> | 2016-10-13 22:11:37 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-13 22:11:37 +0800 |
| commit | ec08615b7206577964216b05161354f3601c3f3d (patch) | |
| tree | d9f24172e22b28e72d78493fe42dde3bf637e5d9 | |
| parent | 2951c1eba99d5771181b04085d56e1affe2d88b8 (diff) | |
| parent | 00278fdea881077ad33c0d7e4a0bc3bd188629be (diff) | |
| download | dexon-solidity-ec08615b7206577964216b05161354f3601c3f3d.tar.gz dexon-solidity-ec08615b7206577964216b05161354f3601c3f3d.tar.zst dexon-solidity-ec08615b7206577964216b05161354f3601c3f3d.zip | |
Merge pull request #1198 from zigguratt/develop
Remove obsolete built in macros and add a `keccak256` macro alias for `sha3`.
| -rw-r--r-- | liblll/CompilerState.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/liblll/CompilerState.cpp b/liblll/CompilerState.cpp index 63351bc4..1d83192c 100644 --- a/liblll/CompilerState.cpp +++ b/liblll/CompilerState.cpp @@ -45,8 +45,6 @@ CodeFragment const& CompilerState::getDef(std::string const& _s) void CompilerState::populateStandard() { static const string s = "{" - "(def 'gav 0x51ba59315b3a95761d0863b05ccc7a7f54703d99)" - "(def 'config 0x661005d2720d855f1d9976f88bb10c1a3398c77f)" "(def 'allgas (- (gas) 21))" "(def 'send (to value) (call allgas to value 0 0 0 0))" "(def 'send (gaslimit to value) (call gaslimit to value 0 0 0 0))" @@ -60,18 +58,12 @@ void CompilerState::populateStandard() "(def 'sha3 (val) { [0]:val (sha3 0 32) })" "(def 'sha3pair (a b) { [0]:a [32]:b (sha3 0 64) })" "(def 'sha3trip (a b c) { [0]:a [32]:b [64]:c (sha3 0 96) })" + "(def 'keccak256 (loc len) (sha3 loc len))" "(def 'return (val) { [0]:val (return 0 32) })" "(def 'returnlll (code) (return 0 (lll code 0)) )" "(def 'makeperm (name pos) { (def name (sload pos)) (def name (v) (sstore pos v)) } )" "(def 'permcount 0)" "(def 'perm (name) { (makeperm name permcount) (def 'permcount (+ permcount 1)) } )" - "(def 'namereg (msg config 0))" - "(def 'coinreg (msg config 1))" - "(def 'gavcoin (msg config 2))" - "(def 'sendgavcoin (to value) { [32]'send [64]:to [96]:value (call allgas gavcoin 0 32 96 0 0) })" - "(def 'regname (name) { [32]'register [64]name (call allgas namereg 0 32 64 0 0) })" - "(def 'regcoin (name) { [32]name (call allgas coinreg 0 32 32 0 0) })" - "(def 'regcoin (name denom) { [32]name [64]denom (call allgas coinreg 0 32 64 0 0) })" "(def 'ecrecover (r s v hash) { [0] r [32] s [64] v [96] hash (msg allgas 1 0 0 128) })" "(def 'sha256 (data datasize) (msg allgas 2 0 data datasize))" "(def 'ripemd160 (data datasize) (msg allgas 3 0 data datasize))" |