[WIP] Implement subroutine opcodes

Author: Peppece

eth/vm/forks/berlin/opcodes.py

@@ -1,21 +1,6 @@
-import copy
-
-from eth_utils.toolz import merge
-
-
 from eth.vm.forks.muir_glacier.opcodes import (
     MUIR_GLACIER_OPCODES,
 )
-
-
-UPDATED_OPCODES = {
-    # New opcodes
-}
-
-BERLIN_OPCODES = merge(
-    copy.deepcopy(MUIR_GLACIER_OPCODES),
-    UPDATED_OPCODES,
-)
 import copy
 
 from eth_utils.toolz import merge
@@ -26,29 +11,28 @@
     opcode_values,
 )
 from eth.vm.opcode import as_opcode
-from eth.vm.forks.istanbul.opcodes import ISTANBUL_OPCODES
-
+from eth.vm.logic import flow
 
 UPDATED_OPCODES = {
 	opcode_values.BEGINSUB: as_opcode(
-		logic_fn = ...,
+		logic_fn = flow.beginsub,
 		mnemonic = mnemonics.BEGINSUB,
 		gas_cost = constants.GAS_BASE,
 	),
 	opcode_values.JUMPSUB: as_opcode(
-		logic_fn = ...,
+		logic_fn = flow.jumpsub,
 		mnemonic = mnemonics.JUMPSUB,
 		gas_cost = constants.GAS_MID,
 	),
-	opcode_values.ENDSUB: as_opcode(
-		logic_fn = ...,
-		mnemonic = mnemonics.ENDSUB,
+	opcode_values.RETURNSUB: as_opcode(
+		logic_fn = flow.returnsub,
+		mnemonic = mnemonics.RETURNSUB,
 		gas_cost = constants.GAS_VERYLOW,
 	),
 }
 
 
 BERLIN_OPCODES = merge(
-	copy.deepcopy(ISTANBUL_OPCODES),
+	copy.deepcopy(MUIR_GLACIER_OPCODES),
 	UPDATED_OPCODES,
 )

eth/vm/logic/flow.py

@@ -3,6 +3,7 @@
     InvalidInstruction,
     OutOfGas,
     Halt,
+    InsufficientStack,
 )
 
 from eth.vm.computation import BaseComputation
@@ -69,8 +70,8 @@ def jumpsub(computation: BaseComputation) -> None:
     sub_loc = computation.stack_pop1_int()
 
     if computation.code.is_valid_opcode(sub_loc):
-    
-        sub_op = computation.code(sub_loc)
+
+        sub_op = computation.code.is_valid_opcode(sub_loc)
 
         if sub_op == BEGINSUB:
             temp = computation.code.program_counter

eth/vm/mnemonics.py

@@ -166,7 +166,7 @@
 #
 BEGINSUB = 'BEGINSUB'
 JUMPSUB = 'JUMPSUB'
-ENDSUB = 'ENDSUB'
+RETURNSUB = 'RETURNSUB'
 #
 # System
 #

eth/vm/opcode_values.py

@@ -91,7 +91,12 @@
 MSIZE = 0x59
 GAS = 0x5a
 JUMPDEST = 0x5b
-
+#
+# Subroutines
+#
+BEGINSUB = 0x5c
+RETURNSUB = 0x5d
+JUMPSUB = 0x5e
 
 #
 # Push Operations
@@ -182,14 +187,6 @@
 LOG4 = 0xa4
 
 
-#
-# Subroutines
-#
-BEGINSUB = 0xb2
-JUMPSUB = 0xb3
-ENDSUB = 0xb7
-
-
 #
 # System
 #

tests/core/opcodes/test_opcodes.py

@@ -1172,3 +1172,5 @@ def test_jumpsub(vm_class, code, expect_gas_used):
     )
     assert comp.is_success
     assert comp.get_gas_used() == expect_gas_used
+
+test_jumpsub(BerlinVM, '0x60045e005c5d', 18)