From 3cceede41232a6157f01f0392a4f7c65a3076d63 Mon Sep 17 00:00:00 2001
From: Dmitry Vagner <typecat@dmitrys-mbp.lan>
Date: Fri, 23 Sep 2022 10:52:05 -0700
Subject: [PATCH] format, stack macro, remove prints

---
 evm/src/cpu/kernel/asm/ripemd/compression.asm |  9 ++-------
 evm/src/cpu/kernel/interpreter.rs             |  1 -
 evm/src/cpu/kernel/tests/ripemd.rs            | 14 ++++++--------
 3 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/evm/src/cpu/kernel/asm/ripemd/compression.asm b/evm/src/cpu/kernel/asm/ripemd/compression.asm
index 851586b7..dfd57bc3 100644
--- a/evm/src/cpu/kernel/asm/ripemd/compression.asm
+++ b/evm/src/cpu/kernel/asm/ripemd/compression.asm
@@ -240,13 +240,8 @@ mid_rol:
     %jump(rol)
 post_rol:
     // stack: c, a, b, d, e, F, K, boxes  , rounds, sides, virt
-    SWAP3
-    // stack: d, a, b, c, e, F, K, boxes  , rounds, sides, virt
-    SWAP4
-    // stack: e, a, b, c, d, F, K, boxes  , rounds, sides, virt
-    SWAP7  
-    PUSH 1  
-    SWAP1  
+    %stack (c, a, b, d, e, F, K, boxes) -> (boxes, 1, a, b, c, d, F, K, e)
+    // stack: boxes, 1, a, b, c, d, F, K, e, rounds, sides, virt
     SUB  
     SWAP7
     // stack: e, a, b, c, d, F, K, boxes-1, rounds, sides, virt
diff --git a/evm/src/cpu/kernel/interpreter.rs b/evm/src/cpu/kernel/interpreter.rs
index 40e9cc18..e36b1e66 100644
--- a/evm/src/cpu/kernel/interpreter.rs
+++ b/evm/src/cpu/kernel/interpreter.rs
@@ -282,7 +282,6 @@ impl<'a> Interpreter<'a> {
             0xff => todo!(),                                           // "SELFDESTRUCT",
             _ => bail!("Unrecognized opcode {}.", opcode),
         };
-        println!("{:X}", opcode);
         Ok(())
     }
 
diff --git a/evm/src/cpu/kernel/tests/ripemd.rs b/evm/src/cpu/kernel/tests/ripemd.rs
index 80c46a54..d418fa5a 100644
--- a/evm/src/cpu/kernel/tests/ripemd.rs
+++ b/evm/src/cpu/kernel/tests/ripemd.rs
@@ -6,25 +6,23 @@ use crate::cpu::kernel::interpreter::run_with_kernel;
 
 #[test]
 fn test_ripemd() -> Result<()> {
-    let expected = "f71c27109c692c1b56bbdceb5b9d2865b3708dbc";
-    println!("{:#}", expected);
-
     let input: Vec<u32> = vec![
-        26,   0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e,
-        0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a
+        26, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e,
+        0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a,
     ];
 
     let kernel = combined_kernel();
     let stack_input: Vec<U256> = input.iter().map(|&x| U256::from(x as u32)).rev().collect();
     let stack_output = run_with_kernel(&kernel, kernel.global_labels["ripemd_alt"], stack_input)?;
-    let actual: Vec<String> = stack_output
+    let actual: String = stack_output
         .stack()
         .iter()
         .map(|&x| format!("{:x}", x))
         .rev()
         .collect();
-    println!("{:#?}", actual);
-    assert_eq!(expected, actual[0]);
+
+    let expected = "f71c27109c692c1b56bbdceb5b9d2865b3708dbc";
+    assert_eq!(expected, actual);
 
     Ok(())
 }