From aceb7af658ce53f1c525e507a5b441ef955de784 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Bylica?= <chfast@gmail.com>
Date: Wed, 28 Sep 2016 13:19:02 +0200
Subject: [PATCH] EVM-C: reorder and add create_address to evm_result

---
 include/evm.h | 43 ++++++++++++++++++++++++++++---------------
 1 file changed, 28 insertions(+), 15 deletions(-)

diff --git a/include/evm.h b/include/evm.h
index 06d799c..2c15fea 100644
--- a/include/evm.h
+++ b/include/evm.h
@@ -77,23 +77,25 @@ struct evm_result {
     /// The value is valid only if evm_result::code == ::EVM_SUCCESS.
     int64_t gas_left;
 
-    /// The reference to output data. The memory containing the output data
-    /// is owned by EVM and is freed with evm_release_result_fn().
-    uint8_t const* output_data;
+    union
+    {
+        struct
+        {
+            /// The reference to output data. The memory containing the output
+            /// data is owned by EVM and is freed with evm_result::release().
+            uint8_t const* output_data;
 
-    /// The size of the output data.
-    size_t output_size;
+            /// The size of the output data.
+            size_t output_size;
+        };
 
-    /// @name Optional
-    /// The optional information that EVM is not required to provide.
-    /// @{
-
-    /// The pointer to EVM-owned memory. For EVM internal use.
-    /// @see output_data.
-    void* internal_memory;
-
-    /// The error message explaining the result code.
-    char const* error_message;
+        /// The address of the successfully created contract.
+        ///
+        /// This field has valid value only if the evm_result comes from a
+        /// successful CREATE opcode execution
+        /// (i.e. evm_call_fn(..., EVM_CREATE, ...)).
+        struct evm_uint160be create_address;
+    };
 
     /// The pointer to the result release implementation.
     ///
@@ -102,6 +104,17 @@ struct evm_result {
     /// itself allows VM composition.
     evm_release_result_fn release;
 
+    /// @name Optional
+    /// The optional information that EVM is not required to provide.
+    /// @{
+
+    /// The error message explaining the result code.
+    char const* error_message;
+
+    /// The pointer to EVM-owned memory. For EVM internal use.
+    /// @see output_data.
+    void* internal_memory;
+
     /// @}
 };