Commit Graph

12873 Commits

Author SHA1 Message Date
Christian
bfb2ae9f3c Test adjustments. 2014-11-03 16:30:11 +01:00
Christian
e9f8ebe4dc Merge remote-tracking branch 'ethereum/develop' into sol_contractCompiler
Conflicts:
	alethzero/CMakeLists.txt
2014-11-03 16:13:40 +01:00
Christian
8a9da8648d Merge remote-tracking branch 'ethereum/develop' into sol_contractCompiler
Conflicts:
	alethzero/CMakeLists.txt
2014-11-03 16:13:40 +01:00
Christian
4dfd6dfa13 Some tests and bugfixes for the compiler. 2014-11-03 16:11:40 +01:00
Christian
dab09c595a Some tests and bugfixes for the compiler. 2014-11-03 16:11:40 +01:00
Christian
643c781a6d Bugfix: Swap before mod and div. 2014-11-03 15:44:22 +01:00
Christian
6951657c59 Bugfix: Swap before mod and div. 2014-11-03 15:44:22 +01:00
Christian
e9eef77489 Bugfix: Swap before mod and div. 2014-11-03 12:23:53 +01:00
Christian
47d37b12a3 Bugfix: Swap before mod and div. 2014-11-03 12:23:53 +01:00
Paweł Bylica
ea726b8ef8 Merge branch 'develop' into develop-evmcc
Conflicts:
	test/CMakeLists.txt
2014-11-03 10:30:59 +01:00
subtly
af35240e37 Merge branch 'develop' into crypto 2014-11-03 01:35:29 +01:00
subtly
51fea10bbe Placeholder kdf. More cleanup and tests. 2014-11-02 04:41:16 +01:00
Gav Wood
577503539e Fix for assembler. 2014-10-31 20:29:38 +01:00
Marek Kotewicz
07d08e3af3 boost_auto_test_suite for jsonrpc && @brief description for WebThreeStubServer 2014-10-31 17:30:04 +01:00
Christian
245efb0280 Merge remote-tracking branch 'ethereum/develop' into sol_contractCompiler
Conflicts:
	libsolidity/AST.cpp
	libsolidity/AST.h
	libsolidity/Compiler.cpp
	libsolidity/Compiler.h
	libsolidity/NameAndTypeResolver.h
	libsolidity/Types.cpp
	solc/main.cpp
	test/solidityCompiler.cpp
2014-10-31 17:20:27 +01:00
Christian
6d2b660ba7 Merge remote-tracking branch 'ethereum/develop' into sol_contractCompiler
Conflicts:
	libsolidity/AST.cpp
	libsolidity/AST.h
	libsolidity/Compiler.cpp
	libsolidity/Compiler.h
	libsolidity/NameAndTypeResolver.h
	libsolidity/Types.cpp
	solc/main.cpp
	test/solidityCompiler.cpp
2014-10-31 17:20:27 +01:00
Christian
25c0e08bdf Merge remote-tracking branch 'ethereum/develop' into sol_contractCompiler
Conflicts:
	libsolidity/AST.cpp
	libsolidity/AST.h
	libsolidity/Compiler.cpp
	libsolidity/Compiler.h
	libsolidity/NameAndTypeResolver.h
	libsolidity/Types.cpp
	solc/main.cpp
	test/solidityCompiler.cpp
2014-10-31 17:20:27 +01:00
Christian
2088aaa85b Merge remote-tracking branch 'ethereum/develop' into sol_contractCompiler
Conflicts:
	libsolidity/AST.cpp
	libsolidity/AST.h
	libsolidity/Compiler.cpp
	libsolidity/Compiler.h
	libsolidity/NameAndTypeResolver.h
	libsolidity/Types.cpp
	solc/main.cpp
	test/solidityCompiler.cpp
2014-10-31 17:20:27 +01:00
Marek Kotewicz
f64c53ac62 Merge branch 'develop' into mk_jsonrpc 2014-10-31 17:13:32 +01:00
Marek Kotewicz
d645388fa9 fixed style issue 2014-10-31 17:13:06 +01:00
Paweł Bylica
973781d4a7 Merge branch 'develop-evmcc' into pr-jit 2014-10-31 16:59:36 +01:00
Paweł Bylica
cf26020ecc Merge branch 'develop' into develop-evmcc 2014-10-31 16:41:23 +01:00
artur-zawlocki
5546ac9f94 Merge branch 'develop-evmcc' of github.com:imapp-pl/ethereum into develop-evmcc
Conflicts:
	libevmjit/Compiler.cpp
2014-10-31 15:08:10 +00:00
artur-zawlocki
f19bc2cfef allow --jit as non first argument 2014-10-31 14:47:16 +00:00
Christian
a36db1f241 Actual contract creator and add solidity to AlethZero interface. 2014-10-31 14:37:23 +01:00
Christian
c0528f511a Actual contract creator and add solidity to AlethZero interface. 2014-10-31 14:37:23 +01:00
Gav Wood
c45495afb9 Big fixes. 2014-10-31 14:35:13 +01:00
Gav Wood
882b8ad089 Big fixes. 2014-10-31 14:35:13 +01:00
Gav Wood
64786387c1 PoC-7: Instruction set reform 2014-10-31 14:32:32 +01:00
chriseth
be45d11e4c Merge pull request #415 from chriseth/sol_expressionCompiler
Solidity expression compiler
2014-10-31 13:42:24 +01:00
Christian
9f53f18893 Corrected doxygen post comments. 2014-10-31 13:29:32 +01:00
Gav Wood
882ee7db3e Merge pull request #432 from CJentzsch/newTests
Added tests for SIGNEXTEND and BNOT
2014-10-31 13:12:25 +01:00
Paweł Bylica
e9ec6ae8fd Merge branch 'develop-evmcc' into pr-jit 2014-10-31 12:50:10 +01:00
Paweł Bylica
d56553dfb6 Merge branch 'develop' into develop-evmcc 2014-10-31 12:35:51 +01:00
Marek Kotewicz
53b422c64a applied changes from ethereum.js 5538ff725235f30a9afbbedc098fd18dfd9f1293 2014-10-31 11:49:28 +01:00
Marek Kotewicz
57ef1fbd9b Merge branch 'develop' into mk_jsonrpc 2014-10-31 11:27:49 +01:00
Christoph Jentzsch
bc1aaa78a8 Merge remote-tracking branch 'upstream/develop' into stateTests
Conflicts:
	libethereum/AddressState.h
	test/vm.cpp
2014-10-31 09:46:20 +01:00
Christoph Jentzsch
3d17d7b2f1 Clean up FakeExtVM - move to state tests 2014-10-31 09:41:02 +01:00
Christian
9eb7fd274c Function selector and variable (un)packing. 2014-10-30 21:21:25 +01:00
Christian
cb9cb48dc7 Function selector and variable (un)packing. 2014-10-30 21:21:25 +01:00
Christian
f6c46c57f3 Function selector and variable (un)packing. 2014-10-30 21:21:25 +01:00
Christian
a5f3602738 Renamed file. 2014-10-30 21:21:25 +01:00
Christian
fa24c954a5 Renamed file. 2014-10-30 21:21:25 +01:00
Paweł Bylica
b2cd52eb0d Merge branch 'develop-evmcc' into pr-jit 2014-10-30 18:10:24 +01:00
artur-zawlocki
609d460025 CMakeLists updated, should now build without LLVM when EVMJIT is not enabled [#81588646] 2014-10-30 16:42:44 +00:00
Gav Wood
bf763824f3 Fix for Trie roots.
AddressState -> Account.
2014-10-30 13:47:28 +01:00
Marek Kotewicz
f301ee29f7 common changes 2014-10-30 13:06:45 +01:00
Paweł Bylica
fdca7c8eed Merge branch 'develop' into develop-evmcc
Conflicts:
	libevm/VM.h
	test/vm.cpp
2014-10-30 12:37:21 +01:00
Marek Kotewicz
7aa61b8297 Merge branch 'develop' into mk_jsonrpc 2014-10-30 11:56:53 +01:00
Christian
aeac2e67e6 Merge remote-tracking branch 'ethereum/develop' into sol_contractCompiler 2014-10-30 01:25:42 +01:00