From f3d4e57aa6effa82d9305f8db7f9a355cb7a901b Mon Sep 17 00:00:00 2001 From: wborgeaud Date: Mon, 31 Oct 2022 10:48:57 +0100 Subject: [PATCH] Use address macro instead of opcode --- evm/src/cpu/kernel/asm/mpt/accounts.asm | 2 +- evm/src/cpu/kernel/asm/mpt/storage/storage_write.asm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/evm/src/cpu/kernel/asm/mpt/accounts.asm b/evm/src/cpu/kernel/asm/mpt/accounts.asm index 0e49da98..08291048 100644 --- a/evm/src/cpu/kernel/asm/mpt/accounts.asm +++ b/evm/src/cpu/kernel/asm/mpt/accounts.asm @@ -1,6 +1,6 @@ // Return a pointer to the current account's data in the state trie. %macro current_account_data - ADDRESS %mpt_read_state_trie + %address %mpt_read_state_trie // stack: account_ptr // account_ptr should be non-null as long as the prover provided the proper // Merkle data. But a bad prover may not have, and we don't want return a diff --git a/evm/src/cpu/kernel/asm/mpt/storage/storage_write.asm b/evm/src/cpu/kernel/asm/mpt/storage/storage_write.asm index 057e4bb5..7695b0c2 100644 --- a/evm/src/cpu/kernel/asm/mpt/storage/storage_write.asm +++ b/evm/src/cpu/kernel/asm/mpt/storage/storage_write.asm @@ -39,6 +39,6 @@ after_storage_insert: // stack: new_account_ptr, retdest // Save this updated account to the state trie. - ADDRESS %addr_to_state_key + %address %addr_to_state_key // stack: state_key, new_account_ptr, retdest %jump(mpt_insert_state_trie)