Merge pull request #12 from vitelabs/development

Development 0.8.0

libevmasm/Instruction.cpp

@@ -318,6 +318,11 @@ static std::map<Instruction, InstructionInfo> const c_instructionInfo =
 
 	{ Instruction::RETURN,		{ "RETURN",			0, 2, 0, true, Tier::Zero } },
 	{ Instruction::DELEGATECALL,	{ "DELEGATECALL",	0, 6, 1, true, Tier::Special } },
+
+	// Solidity++:
+	{ Instruction::SYNCCALL,	{ "SYNCCALL",	0, 6, 0, true, Tier::Special } },
+	{ Instruction::CALLBACKDEST,	{ "CALLBACKDEST",	0, 0, 0, true, Tier::Special } },
+
 	{ Instruction::STATICCALL,	{ "STATICCALL",		0, 6, 1, true, Tier::Special } },
 	{ Instruction::CREATE2,		{ "CREATE2",		0, 4, 1, true, Tier::Special } },
 	{ Instruction::REVERT,		{ "REVERT",		0, 2, 0, true, Tier::Zero } },

libevmasm/Instruction.h

@@ -184,11 +184,15 @@ enum class Instruction: uint8_t
 	SELFBALANCE,		///< get balance of the current account
 
 	CREATE = 0xf0,		///< create a new account with associated code
-	CALL,				///< message-call into an account
+	CALL,				///< Async-call into a contract. Will not return data to the caller.
 	CALLCODE,			///< message-call with another account's code only
-	RETURN,				///< halt execution returning output data
+	RETURN,				///< Halt execution returning output data. Will send a callback transaction to the caller of the sync-call.
 	DELEGATECALL,		///< like CALLCODE but keeps caller's value and sender
 	CREATE2 = 0xf5,		///< create new account with associated code at address `sha3(0xff + sender + salt + init code) % 2**160`
+
+	SYNCCALL = 0xf7,    ///< Sync-call into a contract. The callee will send a callback transaction to the caller while executing RETURN.
+	CALLBACKDEST = 0xf8,///< restore execution context for a sync-call
+
 	STATICCALL = 0xfa,	///< like CALL but disallow state modifications
 
 	REVERT = 0xfd,		///< halt execution, revert state and return output data

libsolidity/CMakeLists.txt

@@ -59,8 +59,8 @@ set(sources
 	ast/Types.h
 	ast/TypeProvider.cpp
 	ast/TypeProvider.h
-	${ORIGINAL_SOURCE_DIR}/codegen/ABIFunctions.cpp
-	${ORIGINAL_SOURCE_DIR}/codegen/ABIFunctions.h
+	codegen/ABIFunctions.cpp
+	codegen/ABIFunctions.h
 	${ORIGINAL_SOURCE_DIR}/codegen/ArrayUtils.cpp
 	${ORIGINAL_SOURCE_DIR}/codegen/ArrayUtils.h
 	codegen/Compiler.cpp