diff --git a/evm/src/cpu/kernel/asm/ripemd/compression.asm b/evm/src/cpu/kernel/asm/ripemd/compression.asm index 328a5074..5ce5f347 100644 --- a/evm/src/cpu/kernel/asm/ripemd/compression.asm +++ b/evm/src/cpu/kernel/asm/ripemd/compression.asm @@ -19,7 +19,7 @@ /// u32(s4 + l0 + r1), /// u32(s0 + l1 + r2) /// -/// where si, li, ri, oi, OF, RD respectively denote +/// where si, li, ri, oi, VR, RD respectively denote /// state[i], stateL[i], stateR[i], output[i], virt, retdest global compress: @@ -39,9 +39,7 @@ switch: // stack: STATEL, STATE, virt, retdest PUSH mix DUP12 - PUSH 0 - PUSH 5 - PUSH 16 + %stack () -> (16, 5, 0) // stack: 16, 5, 0, virt, mix, STATEL, STATE, virt, retdest DUP15 DUP15 @@ -203,7 +201,6 @@ pre_rol: %mload_kernel_code_label(R_data) ADD // stack: virt + r, box, a, b, c, d, e, F, K, boxes, rounds, sides, virt - // %mload_kernel_code_u32_LE(Input_Block) %load_u32_from_block // stack: x, box, a, b, c, d, e, F, K, boxes, rounds, sides, virt SWAP1 diff --git a/evm/src/cpu/kernel/asm/ripemd/constants.asm b/evm/src/cpu/kernel/asm/ripemd/constants.asm index 1ce49c28..18bf3595 100644 --- a/evm/src/cpu/kernel/asm/ripemd/constants.asm +++ b/evm/src/cpu/kernel/asm/ripemd/constants.asm @@ -118,23 +118,3 @@ global R_data: BYTES 04, 20, 32, 28 BYTES 24, 08, 52, 56 BYTES 00, 12, 36, 44 - - -global Input_Block: - BYTES 0x61, 0x62, 0x63, 0x64 - BYTES 0x65, 0x66, 0x67, 0x68 - BYTES 0x69, 0x6a, 0x6b, 0x6c - BYTES 0x6d, 0x6e, 0x6f, 0x70 - BYTES 0x71, 0x72, 0x73, 0x74 - BYTES 0x75, 0x76, 0x77, 0x78 - BYTES 0x79, 0x7a, 0x80, 0x00 - BYTES 0x00, 0x00, 0x00, 0x00 - BYTES 0x00, 0x00, 0x00, 0x00 - BYTES 0x00, 0x00, 0x00, 0x00 - BYTES 0x00, 0x00, 0x00, 0x00 - BYTES 0x00, 0x00, 0x00, 0x00 - BYTES 0x00, 0x00, 0x00, 0x00 - BYTES 0x00, 0x00, 0x00, 0x00 - BYTES 0xd0, 0x00, 0x00, 0x00 - BYTES 0x00, 0x00, 0x00, 0x00 - \ No newline at end of file diff --git a/evm/src/cpu/kernel/asm/util/basic_macros.asm b/evm/src/cpu/kernel/asm/util/basic_macros.asm index edf63359..3027d338 100644 --- a/evm/src/cpu/kernel/asm/util/basic_macros.asm +++ b/evm/src/cpu/kernel/asm/util/basic_macros.asm @@ -295,4 +295,4 @@ %macro break %jump(0xdeadbeef) -%endmacro \ No newline at end of file +%endmacro diff --git a/evm/src/memory/segments.rs b/evm/src/memory/segments.rs index 5b3725d7..f32e0f5e 100644 --- a/evm/src/memory/segments.rs +++ b/evm/src/memory/segments.rs @@ -37,7 +37,6 @@ pub(crate) enum Segment { /// See also `StateTrieCheckpointPointer`. StorageTrieCheckpointPointers = 14, /// RipeMD storage - /// RipeMd = 15, }