Uma opcodes

programs/aux_heap_gas.zasm

@@ -0,0 +1,12 @@
+	.text
+	.file	"add.zasm"
+	.globl	__entry
+__entry:
+.func_begin0:
+	sstore r0,r0
+	ld.2 r0, r3
+	ret
+.func_end0:
+
+	.note.GNU-stack
+	.rodata

programs/aux_heap_store_gas.zasm

@@ -0,0 +1,12 @@
+	.text
+	.file	"add.zasm"
+	.globl	__entry
+__entry:
+.func_begin0:
+	sstore r0,r0
+	st.2 r0, r3
+	ret
+.func_end0:
+
+	.note.GNU-stack
+	.rodata

programs/fat_pointer_read.zasm

@@ -0,0 +1,14 @@
+	.text
+	.file	"add.zasm"
+	.globl	__entry
+__entry:
+.func_begin0:
+	; sets r1=address, r2=value, r3=FatPointer
+	st.1 r1, r2
+	ld r3, r4
+	sstore	r0, r4
+	ret
+.func_end0:
+
+	.note.GNU-stack
+	.rodata

programs/fat_pointer_read_inc.zasm

@@ -0,0 +1,14 @@
+	.text
+	.file	"add.zasm"
+	.globl	__entry
+__entry:
+.func_begin0:
+	; sets r1=address, r2=value, r3=FatPointer
+	st.1 r1, r2
+	ld.inc r3, r4, r5
+	sstore	r0, r5
+	ret
+.func_end0:
+
+	.note.GNU-stack
+	.rodata

programs/heap.zasm

@@ -0,0 +1,14 @@
+	.text
+	.file	"add.zasm"
+	.globl	__entry
+__entry:
+.func_begin0:
+	; sets r1=address, r2=value
+	st.1 r1, r2
+	ld.1 r1, r3
+	sstore	r0, r3
+	ret
+.func_end0:
+
+	.note.GNU-stack
+	.rodata

programs/heap_aux.zasm

@@ -0,0 +1,14 @@
+	.text
+	.file	"add.zasm"
+	.globl	__entry
+__entry:
+.func_begin0:
+	; sets r1=address, r2=value
+	st.2 r1, r2
+	ld.2 r1, r3
+	sstore	r0, r3
+	ret
+.func_end0:
+
+	.note.GNU-stack
+	.rodata

programs/heap_gas.zasm

@@ -0,0 +1,12 @@
+	.text
+	.file	"add.zasm"
+	.globl	__entry
+__entry:
+.func_begin0:
+	sstore r0,r0
+	ld.1 r0, r3
+	ret
+.func_end0:
+
+	.note.GNU-stack
+	.rodata

programs/heap_load_inc.zasm

@@ -0,0 +1,15 @@
+	.text
+	.file	"add.zasm"
+	.globl	__entry
+__entry:
+.func_begin0:
+	; sets r1=address, r2=value
+	st.1 r1, r2
+	ld.1.inc r1, r3, r4
+	ld.1 r4, r5
+	sstore	r0, r5
+	ret
+.func_end0:
+
+	.note.GNU-stack
+	.rodata

programs/heap_load_inc_aux.zasm

@@ -0,0 +1,15 @@
+	.text
+	.file	"add.zasm"
+	.globl	__entry
+__entry:
+.func_begin0:
+	; sets r1=address, r2=value
+	st.2 r1, r2
+	ld.2.inc r1, r3, r4
+	ld.2 r4, r5
+	sstore	r0, r5
+	ret
+.func_end0:
+
+	.note.GNU-stack
+	.rodata

programs/heap_only_read.zasm

@@ -0,0 +1,13 @@
+	.text
+	.file	"add.zasm"
+	.globl	__entry
+__entry:
+.func_begin0:
+	; sets r1=address
+	ld.1 r1, r3
+	sstore	r0, r3
+	ret
+.func_end0:
+
+	.note.GNU-stack
+	.rodata

programs/heap_only_read_aux.zasm

@@ -0,0 +1,13 @@
+	.text
+	.file	"add.zasm"
+	.globl	__entry
+__entry:
+.func_begin0:
+	; sets r1=address
+	ld.2 r1, r3
+	sstore	r0, r3
+	ret
+.func_end0:
+
+	.note.GNU-stack
+	.rodata

programs/heap_store_gas.zasm

@@ -0,0 +1,12 @@
+	.text
+	.file	"add.zasm"
+	.globl	__entry
+__entry:
+.func_begin0:
+	sstore r0,r0
+	st.1 r0, r3
+	ret
+.func_end0:
+
+	.note.GNU-stack
+	.rodata

programs/heap_store_inc.zasm

@@ -0,0 +1,15 @@
+	.text
+	.file	"add.zasm"
+	.globl	__entry
+__entry:
+.func_begin0:
+	; sets r1=address, r2=value
+	st.1.inc r1, r2, r3
+	st.1 r3, r2
+	ld.1 r3, r4
+	sstore	r0, r4
+	ret
+.func_end0:
+
+	.note.GNU-stack
+	.rodata

programs/heap_store_inc_aux.zasm

@@ -0,0 +1,15 @@
+	.text
+	.file	"add.zasm"
+	.globl	__entry
+__entry:
+.func_begin0:
+	; sets r1=address, r2=value
+	st.2.inc r1, r2, r3
+	st.2 r3, r2
+	ld.2 r3, r4
+	sstore	r0, r4
+	ret
+.func_end0:
+
+	.note.GNU-stack
+	.rodata

programs/heap_two_addresses.zasm

@@ -0,0 +1,15 @@
+	.text
+	.file	"add.zasm"
+	.globl	__entry
+__entry:
+.func_begin0:
+	; sets r1=address, r2=value, r3=address2 , r4=value2
+	st.1 r1, r2
+	st.1 r3, r4
+	ld.1 r3, r5
+	sstore	r0, r5
+	ret
+.func_end0:
+
+	.note.GNU-stack
+	.rodata

programs/heap_two_addresses_aux.zasm

@@ -0,0 +1,15 @@
+	.text
+	.file	"add.zasm"
+	.globl	__entry
+__entry:
+.func_begin0:
+	; sets r1=address, r2=value, r3=address2 , r4=value2
+	st.2 r1, r2
+	st.2 r3, r4
+	ld.2 r3, r5
+	sstore	r0, r5
+	ret
+.func_end0:
+
+	.note.GNU-stack
+	.rodata

programs/heap_two_addresses_first.zasm

@@ -0,0 +1,15 @@
+	.text
+	.file	"add.zasm"
+	.globl	__entry
+__entry:
+.func_begin0:
+	; sets r1=address, r2=value, r3=address2 , r4=value2
+	st.1 r1, r2
+	st.1 r3, r4
+	ld.1 r1, r5
+	sstore	r0, r5
+	ret
+.func_end0:
+
+	.note.GNU-stack
+	.rodata

programs/heap_two_addresses_first_aux.zasm

@@ -0,0 +1,15 @@
+	.text
+	.file	"add.zasm"
+	.globl	__entry
+__entry:
+.func_begin0:
+	; sets r1=address, r2=value, r3=address2 , r4=value2
+	st.2 r1, r2
+	st.2 r3, r4
+	ld.2 r1, r5
+	sstore	r0, r5
+	ret
+.func_end0:
+
+	.note.GNU-stack
+	.rodata

src/lib.rs

@@ -9,7 +9,12 @@ pub mod value;
 use std::path::PathBuf;
 
 use op_handlers::add::_add;
+use op_handlers::aux_heap_read::_aux_heap_read;
+use op_handlers::aux_heap_write::_aux_heap_write;
 use op_handlers::div::_div;
+use op_handlers::fat_pointer_read::_fat_pointer_read;
+use op_handlers::heap_read::_heap_read;
+use op_handlers::heap_write::_heap_write;
 use op_handlers::log::{
     _storage_read, _storage_write, _transient_storage_read, _transient_storage_write,
 };
@@ -27,6 +32,7 @@ use zkevm_opcode_defs::ISAVersion;
 use zkevm_opcode_defs::LogOpcode;
 use zkevm_opcode_defs::Opcode as Variant;
 use zkevm_opcode_defs::PtrOpcode;
+use zkevm_opcode_defs::UMAOpcode;
 
 /// Run a vm program with a clean VM state and with in memory storage.
 pub fn run_program_in_memory(bin_path: &str) -> (U256, VMState) {
@@ -106,7 +112,15 @@ pub fn run_program_with_custom_state(bin_path: &str, mut vm: VMState) -> (U256,
                     // hooked up.
                     break;
                 }
-                Variant::UMA(_) => todo!(),
+                Variant::UMA(uma_variant) => match uma_variant {
+                    UMAOpcode::HeapRead => _heap_read(&mut vm, &opcode),
+                    UMAOpcode::HeapWrite => _heap_write(&mut vm, &opcode),
+                    UMAOpcode::AuxHeapRead => _aux_heap_read(&mut vm, &opcode),
+                    UMAOpcode::AuxHeapWrite => _aux_heap_write(&mut vm, &opcode),
+                    UMAOpcode::FatPointerRead => _fat_pointer_read(&mut vm, &opcode),
+                    UMAOpcode::StaticMemoryRead => todo!(),
+                    UMAOpcode::StaticMemoryWrite => todo!(),
+                },
             }
         }
         vm.current_frame.pc += 1;

src/op_handlers/aux_heap_read.rs

@@ -0,0 +1,32 @@
+use u256::U256;
+use zkevm_opcode_defs::MAX_OFFSET_TO_DEREF_LOW_U32;
+
+use crate::address_operands::address_operands_read;
+use crate::value::TaggedValue;
+use crate::{opcode::Opcode, state::VMState};
+
+pub fn _aux_heap_read(vm: &mut VMState, opcode: &Opcode) {
+    let (src0, _) = address_operands_read(vm, opcode);
+    if src0.is_pointer {
+        panic!("Invalid operands for heap_read");
+    }
+
+    if src0.value > U256::from(MAX_OFFSET_TO_DEREF_LOW_U32) {
+        panic!("Address too large for heap_read");
+    }
+    let addr = src0.value.low_u32();
+
+    let gas_cost = vm.current_frame.aux_heap.expand_memory(addr + 32);
+    vm.gas_left -= gas_cost;
+
+    let value = vm.current_frame.aux_heap.read(addr);
+    vm.set_register(opcode.dst0_index, TaggedValue::new_raw_integer(value));
+
+    if opcode.alters_vm_flags {
+        // This flag is set if .inc is present
+        vm.set_register(
+            opcode.dst1_index,
+            TaggedValue::new_raw_integer(U256::from(addr + 32)),
+        );
+    }
+}

src/op_handlers/aux_heap_write.rs

@@ -0,0 +1,31 @@
+use u256::U256;
+use zkevm_opcode_defs::MAX_OFFSET_TO_DEREF_LOW_U32;
+
+use crate::address_operands::address_operands_read;
+use crate::value::TaggedValue;
+use crate::{opcode::Opcode, state::VMState};
+
+pub fn _aux_heap_write(vm: &mut VMState, opcode: &Opcode) {
+    let (src0, src1) = address_operands_read(vm, opcode);
+    if src0.is_pointer {
+        panic!("Invalid operands for heap_write");
+    }
+
+    if src0.value > U256::from(MAX_OFFSET_TO_DEREF_LOW_U32) {
+        panic!("Address too large for heap_write");
+    }
+    let addr = src0.value.low_u32();
+
+    let gas_cost = vm.current_frame.aux_heap.expand_memory(addr + 32);
+    vm.gas_left -= gas_cost;
+
+    vm.current_frame.aux_heap.store(addr, src1.value);
+
+    if opcode.alters_vm_flags {
+        // This flag is set if .inc is present
+        vm.set_register(
+            opcode.dst0_index,
+            TaggedValue::new_raw_integer(U256::from(addr + 32)),
+        );
+    }
+}