Fix DELEGATECALL

Author: axic

include/evm2wasm.h

@@ -313,7 +313,7 @@ static std::map<opcodeEnum, std::vector<opcodeEnum>> depMap = {
             opcodeEnum::check_overflow, opcodeEnum::memset, opcodeEnum::callback_32}},
     {opcodeEnum::DELEGATECALL, {opcodeEnum::callback, opcodeEnum::memusegas,
                                    opcodeEnum::check_overflow, opcodeEnum::memset,
-                                       opcodeEnum::check_overflow_i64}},
+                                       opcodeEnum::check_overflow_i64, opcodeEnum::callback_32}},
     {opcodeEnum::CALLCODE,
         {opcodeEnum::bswap_m256, opcodeEnum::callback, opcodeEnum::memusegas,
             opcodeEnum::check_overflow, opcodeEnum::memset, opcodeEnum::callback_32,

index.js

@@ -38,7 +38,7 @@ const depMap = new Map([
   ['BLOCKHASH', ['check_overflow', 'callback_256']],
   ['SHA3', ['memusegas', 'bswap_m256', 'check_overflow', 'keccak']],
   ['CALL', ['bswap_m256', 'memusegas', 'check_overflow_i64', 'check_overflow', 'memset', 'callback_32']],
-  ['DELEGATECALL', ['callback', 'memusegas', 'check_overflow_i64', 'check_overflow', 'memset']],
+  ['DELEGATECALL', ['callback', 'memusegas', 'check_overflow_i64', 'check_overflow', 'memset', 'callback_32']],
   ['CALLCODE', ['bswap_m256', 'callback', 'memusegas', 'check_overflow_i64', 'check_overflow', 'check_overflow_i64', 'memset', 'callback_32']],
   ['CREATE', ['bswap_m256', 'bswap_m160', 'callback_160', 'memusegas', 'check_overflow']],
   ['RETURN', ['memusegas', 'check_overflow']],

wasm/generateInterface.js

@@ -152,7 +152,7 @@ const interfaceManifest = {
   DELEGATECALL: {
     name: 'callDelegate',
     async: true,
-    input: ['gasLimit', 'address', 'i128', 'readOffset', 'length', 'writeOffset', 'length'],
+    input: ['gasLimit', 'address', 'i128', 'readOffset', 'length'],
     output: ['i32']
   },
   SSTORE: {
@@ -289,7 +289,7 @@ function generateManifest (interfaceManifest, opts) {
         locals += `(local $offset${numOfLocals} i32)`
         body += `(set_local $offset${numOfLocals} ${checkOverflowStackItem256(spOffset)})`
         call += `(get_local $offset${numOfLocals})`
-      } else if (input === 'length' && (opcode === 'CALL' || opcode === 'CALLCODE')) {
+      } else if (input === 'length' && (opcode === 'CALL' || opcode === 'CALLCODE' || opcode === 'DELEGATECALL')) {
         // CALLs in EVM have 7 arguments
         // but in ewasm CALLs only have 5 arguments
         // so delete the bottom two stack elements, after processing the 5th argument
@@ -309,7 +309,7 @@ function generateManifest (interfaceManifest, opts) {
 
         // delete 7th stack element
         spOffset--
-      } else if (input === 'length' && (opcode !== 'CALL' && opcode !== 'CALLCODE')) {
+      } else if (input === 'length' && (opcode !== 'CALL' && opcode !== 'CALLCODE' && opcode !== 'DELEGATECALL')) {
         locals += `(local $length${numOfLocals} i32)`
         body += `(set_local $length${numOfLocals} ${checkOverflowStackItem256(spOffset)})`