From 241f65139b23e1ae4f5811a90d291b9132321c94 Mon Sep 17 00:00:00 2001
From: Yoichi Hirai <i@yoichihirai.com>
Date: Thu, 6 Jul 2017 16:57:40 +0200
Subject: Use CALLDATALOAD instead of CALLDATACOPY and MLOAD

---
 .../returndatacopy_initial_256.json                | 32 +++++++++++-----------
 .../returndatacopy_initial_256Filler.json          |  2 +-
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/GeneralStateTests/stReturnDataTest/returndatacopy_initial_256.json b/GeneralStateTests/stReturnDataTest/returndatacopy_initial_256.json
index f7c23f161..b8737df22 100644
--- a/GeneralStateTests/stReturnDataTest/returndatacopy_initial_256.json
+++ b/GeneralStateTests/stReturnDataTest/returndatacopy_initial_256.json
@@ -16,7 +16,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "0xd0884fe6d4ad6a566bdd0b7aaa4b3c5a56f8a72b41db46d7482d6a19f1eaa2ef",
+                    "hash" : "0x505bd895f14e839c1b97738d4c7b8b9ee5167f7362514aff159e96a526a233a3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
                     }
                 },
                 {
-                    "hash" : "0xd0884fe6d4ad6a566bdd0b7aaa4b3c5a56f8a72b41db46d7482d6a19f1eaa2ef",
+                    "hash" : "0x505bd895f14e839c1b97738d4c7b8b9ee5167f7362514aff159e96a526a233a3",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -32,7 +32,7 @@
                     }
                 },
                 {
-                    "hash" : "0xd0884fe6d4ad6a566bdd0b7aaa4b3c5a56f8a72b41db46d7482d6a19f1eaa2ef",
+                    "hash" : "0x505bd895f14e839c1b97738d4c7b8b9ee5167f7362514aff159e96a526a233a3",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -42,7 +42,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "0xd0884fe6d4ad6a566bdd0b7aaa4b3c5a56f8a72b41db46d7482d6a19f1eaa2ef",
+                    "hash" : "0x505bd895f14e839c1b97738d4c7b8b9ee5167f7362514aff159e96a526a233a3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,7 @@
                     }
                 },
                 {
-                    "hash" : "0xd0884fe6d4ad6a566bdd0b7aaa4b3c5a56f8a72b41db46d7482d6a19f1eaa2ef",
+                    "hash" : "0x505bd895f14e839c1b97738d4c7b8b9ee5167f7362514aff159e96a526a233a3",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -58,7 +58,7 @@
                     }
                 },
                 {
-                    "hash" : "0xd0884fe6d4ad6a566bdd0b7aaa4b3c5a56f8a72b41db46d7482d6a19f1eaa2ef",
+                    "hash" : "0x505bd895f14e839c1b97738d4c7b8b9ee5167f7362514aff159e96a526a233a3",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -68,7 +68,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "0xd0884fe6d4ad6a566bdd0b7aaa4b3c5a56f8a72b41db46d7482d6a19f1eaa2ef",
+                    "hash" : "0x505bd895f14e839c1b97738d4c7b8b9ee5167f7362514aff159e96a526a233a3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -76,7 +76,7 @@
                     }
                 },
                 {
-                    "hash" : "0xd0884fe6d4ad6a566bdd0b7aaa4b3c5a56f8a72b41db46d7482d6a19f1eaa2ef",
+                    "hash" : "0x505bd895f14e839c1b97738d4c7b8b9ee5167f7362514aff159e96a526a233a3",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -84,7 +84,7 @@
                     }
                 },
                 {
-                    "hash" : "0xd0884fe6d4ad6a566bdd0b7aaa4b3c5a56f8a72b41db46d7482d6a19f1eaa2ef",
+                    "hash" : "0x505bd895f14e839c1b97738d4c7b8b9ee5167f7362514aff159e96a526a233a3",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -94,7 +94,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "0xd0884fe6d4ad6a566bdd0b7aaa4b3c5a56f8a72b41db46d7482d6a19f1eaa2ef",
+                    "hash" : "0x505bd895f14e839c1b97738d4c7b8b9ee5167f7362514aff159e96a526a233a3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -102,7 +102,7 @@
                     }
                 },
                 {
-                    "hash" : "0xd0884fe6d4ad6a566bdd0b7aaa4b3c5a56f8a72b41db46d7482d6a19f1eaa2ef",
+                    "hash" : "0x505bd895f14e839c1b97738d4c7b8b9ee5167f7362514aff159e96a526a233a3",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -110,7 +110,7 @@
                     }
                 },
                 {
-                    "hash" : "0xd0884fe6d4ad6a566bdd0b7aaa4b3c5a56f8a72b41db46d7482d6a19f1eaa2ef",
+                    "hash" : "0x505bd895f14e839c1b97738d4c7b8b9ee5167f7362514aff159e96a526a233a3",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -120,7 +120,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0xd0884fe6d4ad6a566bdd0b7aaa4b3c5a56f8a72b41db46d7482d6a19f1eaa2ef",
+                    "hash" : "0x505bd895f14e839c1b97738d4c7b8b9ee5167f7362514aff159e96a526a233a3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -128,7 +128,7 @@
                     }
                 },
                 {
-                    "hash" : "0xd0884fe6d4ad6a566bdd0b7aaa4b3c5a56f8a72b41db46d7482d6a19f1eaa2ef",
+                    "hash" : "0x505bd895f14e839c1b97738d4c7b8b9ee5167f7362514aff159e96a526a233a3",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -136,7 +136,7 @@
                     }
                 },
                 {
-                    "hash" : "0xd0884fe6d4ad6a566bdd0b7aaa4b3c5a56f8a72b41db46d7482d6a19f1eaa2ef",
+                    "hash" : "0x505bd895f14e839c1b97738d4c7b8b9ee5167f7362514aff159e96a526a233a3",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -148,7 +148,7 @@
         "pre" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60206000600037606460006000516000033e6e112233445566778899aabbccddeeff600052600051600055",
+                "code" : "0x606460006000356000033e6e112233445566778899aabbccddeeff600052600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
diff --git a/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_initial_256Filler.json b/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_initial_256Filler.json
index d47e256c8..c185e8c4a 100644
--- a/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_initial_256Filler.json
+++ b/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_initial_256Filler.json
@@ -27,7 +27,7 @@
         "pre" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "{ (CALLDATACOPY 0 0 32) (RETURNDATACOPY (- 0 (MLOAD 0)) 0 0x64) (MSTORE 0 0x112233445566778899aabbccddeeff) (SSTORE 0 (MLOAD 0)) }",
+                "code" : "{ (RETURNDATACOPY (- 0 (CALLDATALOAD 0)) 0 0x64) (MSTORE 0 0x112233445566778899aabbccddeeff) (SSTORE 0 (MLOAD 0)) }",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
-- 
cgit v1.2.3