[WIP] Implement subroutine opcodes

Author: Peppece

eth/vm/forks/__init__.py

@@ -25,3 +25,6 @@
 from .muir_glacier import (  # noqa: F401
     MuirGlacierVM,
 )
+from .berlin import (
+    BerlinVM,
+)

eth/vm/forks/berlin/opcodes.py

@@ -16,8 +16,6 @@
     copy.deepcopy(MUIR_GLACIER_OPCODES),
     UPDATED_OPCODES,
 )
-||||||| parent of eb1aad086... [WIP]Implement simple subroutine opcodes
-=======
 import copy
 
 from eth_utils.toolz import merge
@@ -54,4 +52,3 @@
 	copy.deepcopy(ISTANBUL_OPCODES),
 	UPDATED_OPCODES,
 )
->>>>>>> eb1aad086... [WIP]Implement simple subroutine opcodes

tests/core/opcodes/test_opcodes.py

@@ -37,6 +37,7 @@
 )
 from eth.vm.chain_context import ChainContext
 from eth.vm.forks import (
+    BerlinVM,
     IstanbulVM,
     PetersburgVM,
     ConstantinopleVM,
@@ -1125,3 +1126,49 @@ def test_blake2b_f_compression(vm_class, input_hex, output_hex, expect_exception
         comp.raise_if_error()
         result = comp.output
         assert result.hex() == output_hex
+
+
+@pytest.mark.parametrize(
+    'vm_class, code, expect_gas_used',
+    (
+        (
+            BerlinVM,
+            '0x60045e005c5d',
+            18,
+        ),
+        (
+            BerlinVM,
+            '0x6800000000000000000c5e005c60115e5d5c5d',
+            36,
+        ),
+        (
+            BerlinVM,
+            '0x6801000000000000000c5e005c60115e5d5c5d',
+            0,
+        ),
+        (
+            BerlinVM,
+            '0x5d5858',
+            0,
+        ),
+        (
+            BerlinVM,
+            '0x6005565c5d5b60035e',
+            30,
+        ),
+        (
+            BerlinVM,
+            '0x5c5d00',
+            0,
+        ),
+    )
+)
+def test_jumpsub(vm_class, code, expect_gas_used):
+    computation = setup_computation(vm_class, CANONICAL_ADDRESS_B, decode_hex(code))
+    comp = computation.apply_message(
+        computation.state,
+        computation.msg,
+        computation.transaction_context,
+    )
+    assert comp.is_success
+    assert comp.get_gas_used() == expect_gas_used