Commit Graph
43 Commits
Author SHA1 Message Date
Paweł Bylica 69556666db Update jsoncpp.cmake from cpp-dependencies repo
This change will keep the downloaded jsoncpp archive in the source dir and allow PPA builds from tarballs.
2016-11-08 14:28:59 +01:00
Paweł Bylica 598154ed17 Drop CryptoPP leftovers
Especially, do not compile CryptoPP for Emscripten.
2016-11-08 01:16:31 +01:00
Paweł Bylica 10019d4a5e Update jsoncpp.cmake from cpp-dependencies repo 2016-11-08 00:57:30 +01:00
Paweł Bylica 4bde0a2d36 Build jsoncpp from source using jsoncpp.cmake script 2016-10-20 22:18:13 +01:00
Paweł Bylica 008c4111d7 Merge pull request #1254 from ethereum/appveyor
AppVeyor: build only pushes to master and develop branch
2016-10-20 17:04:04 +02:00
Paweł Bylica 21eef6aa89 AppVeyor: build only pushes to master and develop branch
This fixes the issue when PRs from a branch in main repo are built twice.
2016-10-20 14:22:38 +02:00
Paweł Bylica 77f3a85441 Merge pull request #566 from ethereum/msvc2015
Suppress a warning in LLL parser on MSVC 2015
2016-05-17 14:27:39 +02:00
Paweł Bylica ca6a21bcd3 Suppress a warning in LLL parser on MSVC 2015 2016-05-13 15:38:23 +02:00
Paweł Bylica 31863528a4 Remove unnecesary std::move 2016-01-15 14:04:18 +01:00
Paweł Bylica e4858023be Fix "add_sources" cmake macro. 2015-08-25 15:38:41 +02:00
Paweł Bylica 035a93a356 Merge remote-tracking branch 'upstream/develop' into evmjit_stack
Conflicts:
	evmjit/libevmjit/BasicBlock.cpp
	evmjit/libevmjit/BasicBlock.h
2015-08-11 10:01:31 +02:00
Paweł Bylica a75158129f Fix EVM JIT stack limit checking.
Tests inlcuded.
2015-07-29 15:10:41 +02:00
Paweł Bylica bc00b64684 Merge remote-tracking branch 'upstream/develop' into evmjit_stack 2015-07-27 19:10:23 +02:00
Paweł Bylica e9e6bc6780 Add test for global stack underflow. 2015-07-27 18:48:58 +02:00
Paweł Bylica 2fb9eafc9d Test dynamic jumps. 2015-07-27 14:25:28 +02:00
Paweł Bylica befbeba512 Fix up rvalue references. Avoid a copy of an EVM code in ExtVM. 2015-07-06 09:23:21 +02:00
Paweł Bylica 09f0e7f644 Make --vm command line option syntax consistent with other options. 2015-07-03 15:16:51 +02:00
Paweł Bylica f32f142e91 Merge remote-tracking branch 'upstream/develop' into evmjit-develop
Conflicts:
	alethzero/Main.ui
	eth/main.cpp
2015-07-03 14:24:56 +02:00
Paweł Bylica 953e392ad2 --vm command line option replacing --jit. 2015-07-03 14:04:04 +02:00
Paweł Bylica 7ce128e322 Merge remote-tracking branch 'upstream/develop' into evmjit-develop 2015-07-01 15:29:32 +02:00
Paweł Bylica 209e16e211 Do not compute code hash twice in VM test engine. 2015-06-24 17:43:47 +02:00
Paweł Bylica 79e7325e3f Merge remote-tracking branch 'upstream/develop' into evmjit-develop
Conflicts:
	evmjit/CMakeLists.txt
	evmjit/libevmjit/Arith256.cpp
2015-06-24 17:28:56 +02:00
Paweł Bylica 3d3734d95b Merge branch 'develop' into evmjit-develop 2015-06-16 16:15:40 +02:00
Paweł Bylica 477550c611 Set code hash in FakeExtVM. 2015-06-16 10:38:10 +02:00
Paweł Bylica 0deb3ea9c9 Merge remote-tracking branch 'upstream/develop' into evmjit-develop
Conflicts:
	evmjit/libevmjit/Cache.cpp
2015-06-11 09:42:40 +02:00
Paweł Bylica 7272785f92 Add code hash to VM tester. 2015-06-10 18:18:38 +02:00
Paweł Bylica 5d534416b1 Merge remote-tracking branch 'upstream/develop' into evmjit-develop
Conflicts:
	evmjit/libevmjit-cpp/JitVM.cpp
	evmjit/libevmjit-cpp/JitVM.h
2015-06-10 18:01:03 +02:00
Paweł Bylica 8061002b9c Add missing override specifiers. 2015-06-08 12:13:44 +02:00
Paweł Bylica 87a56b2bfe Remove pessimising moves. 2015-06-08 12:09:24 +02:00
Paweł Bylica 9425cfacf8 Remove pessimising moves. 2015-06-08 12:09:24 +02:00
Paweł Bylica cddceb2b4f Remove pessimising moves. 2015-06-08 12:09:24 +02:00
Paweł Bylica 8c66813683 Rename Executive::collectResult -> setResultRecipient. 2015-06-08 10:45:42 +02:00
Paweł Bylica 3bacb6f377 Merge remote-tracking branch 'upstream/develop' into refactor_executive
Conflicts:
	test/libsolidity/solidityExecutionFramework.h
2015-06-03 17:16:33 +02:00
Paweł Bylica 6a64d18780 Merge remote-tracking branch 'upstream/develop' into feature/vm_gas_counter_refactor
Conflicts:
	libethereum/Executive.h
2015-06-02 11:57:13 +02:00
Paweł Bylica 711933ab79 Merge remote-tracking branch 'upstream/develop' into evmjit-develop 2015-05-19 14:11:06 +02:00
Paweł Bylica c7facd6d37 Little improved base64 implementation.
Global variable type changed from dynamic constructed std::string to constant char array.
Truncating conversion eliminated (no MSVC warning).
Unit tests added.
2015-05-17 23:03:39 +02:00
Paweł Bylica 0785602ad5 Ping buildbot 2015-05-12 16:14:18 +02:00
Paweł Bylica fc3ea6aa6c Merge remote-tracking branch 'upstream/develop' into evmjit 2015-04-03 12:23:58 +02:00
Paweł Bylica 3ba2d4195f Merge remote-tracking branch 'origin/vm' into develop-evmcc
Conflicts:
	libethereum/Executive.cpp
	libethereum/Executive.h
	libethereum/State.cpp
	libevm/VM.cpp
	libevm/VM.h
	libevm/VMFace.h
	test/createRandomTest.cpp
	test/vm.cpp
	windows/LibEthereum.vcxproj.filters
2014-12-10 23:42:01 +01:00
Paweł Bylica 1d85b074c8 Merge remote-tracking branch 'upstream/develop' into vm 2014-12-10 17:44:10 +01:00
Paweł Bylica c1ffbbe797 VMFactory - a new way of creating VMs 2014-12-10 17:41:53 +01:00
Paweł Bylica 475ce376eb Merge branch 'develop-evmcc' into pr-jit 2014-11-26 20:21:41 +01:00
Paweł Bylica a5d0496ea4 Merge branch 'develop' into develop-evmcc
Conflicts:
	libevm/VM.h
	test/vm.cpp
2014-11-26 20:20:52 +01:00