From 9a5db4b8d29f5c32b62b2350e453b0e4793b23ae Mon Sep 17 00:00:00 2001
From: Nicholas Ward <npward@berkeley.edu>
Date: Fri, 4 Nov 2022 15:27:34 -0700
Subject: [PATCH] progress

---
 .../cpu/kernel/asm/hash/blake/compression.asm | 16 ++++++++++++-
 .../cpu/kernel/asm/hash/blake/constants.asm   | 24 ++++++++++++++++++-
 .../cpu/kernel/asm/hash/blake/g_functions.asm |  4 ----
 3 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/evm/src/cpu/kernel/asm/hash/blake/compression.asm b/evm/src/cpu/kernel/asm/hash/blake/compression.asm
index 74cdaff3..cfa47f64 100644
--- a/evm/src/cpu/kernel/asm/hash/blake/compression.asm
+++ b/evm/src/cpu/kernel/asm/hash/blake/compression.asm
@@ -4,4 +4,18 @@
 
 global blake_compression:
     // stack: h_0, ..., h_7, t_0, t_1, f_0, f_1, m_0, ..., m_15
-    
\ No newline at end of file
+    %blake_compression_internal_state_addr
+    // stack: start, h_0, ..., h_7, t_0, t_1, f_0, f_1, m_0, ..., m_15
+    %rep 8
+        SWAP1
+        DUP2
+        %mstore_kernel_general
+        %increment
+    %endrep
+    // stack: start + 8, t_0, t_1, f_0, f_1, m_0, ..., m_15
+    PUSH 0
+    // stack: 0, start + 8, t_0, t_1, f_0, f_1, m_0, ..., m_15
+    %rep 4
+        
+    %endrep
+
diff --git a/evm/src/cpu/kernel/asm/hash/blake/constants.asm b/evm/src/cpu/kernel/asm/hash/blake/constants.asm
index 12f026e2..d647df37 100644
--- a/evm/src/cpu/kernel/asm/hash/blake/constants.asm
+++ b/evm/src/cpu/kernel/asm/hash/blake/constants.asm
@@ -1,4 +1,4 @@
-global blake_iv:
+global blake_iv_const:
     // IV constants (big-endian)
 
     // IV_0
@@ -32,3 +32,25 @@ global blake_iv:
     // IV_7
     BYTES 91, 224, 205, 25
     BYTES 19, 126, 33, 121
+
+%macro blake_iv(i)
+    PUSH blake_iv_const
+    // stack: blake_iv_const
+    PUSH $i
+    // stack: i, blake_iv_const
+    %mul_const(2)
+    ADD
+    // stack: blake_iv_const + 2 * i
+    DUP1
+    // stack: blake_iv_const + 2 * i, blake_iv_const + 2 * i
+    %increment
+    // stack: blake_iv_const + 2 * i, blake_iv_const + 2 * i
+    %mload_kernel_code
+    SWAP1
+    %increment
+    // stack: IV_i[32:], IV_i[:32]
+    %shl_const(32)
+    // stack: IV_i[32:] << 32, IV_i[:32]
+    ADD
+    // stack: IV_i
+%endmacro
\ No newline at end of file
diff --git a/evm/src/cpu/kernel/asm/hash/blake/g_functions.asm b/evm/src/cpu/kernel/asm/hash/blake/g_functions.asm
index a4783648..67cf6740 100644
--- a/evm/src/cpu/kernel/asm/hash/blake/g_functions.asm
+++ b/evm/src/cpu/kernel/asm/hash/blake/g_functions.asm
@@ -92,7 +92,3 @@ global blake_g_function:
     %mstore_kernel_general
     ADD
     %mstore_kernel_general
-    
-
-
-