From 3140c77cd16343e5c76e656efac4f221cace8452 Mon Sep 17 00:00:00 2001
From: Nicholas Ward <npward@berkeley.edu>
Date: Mon, 18 Jul 2022 16:18:25 -0700
Subject: [PATCH] progress

---
 evm/src/cpu/kernel/asm/sha2.asm     | 63 +++++++++++++++++++++++++----
 evm/src/cpu/kernel/asm/sha2_ops.asm |  2 +-
 2 files changed, 57 insertions(+), 8 deletions(-)

diff --git a/evm/src/cpu/kernel/asm/sha2.asm b/evm/src/cpu/kernel/asm/sha2.asm
index 5788da0a..eb9a507f 100644
--- a/evm/src/cpu/kernel/asm/sha2.asm
+++ b/evm/src/cpu/kernel/asm/sha2.asm
@@ -106,13 +106,62 @@ global sha2_gen_message_schedule_from_block:
     // stack: counter=16, block, output_addr
 
 
+
 global sha2_message_schedule_next_word:
     JUMPDEST
-    // stack: address
+    // stack: addr
+    dup1
+    // stack: addr, addr
+    push 2
+    swap1
+    sub
+    // stack: addr - 2, addr
+    mload
+    // stack: x[addr - 2], addr
+    %jump(sha2_sigma_1)
+    // stack: sigma_1(x[addr - 2]), addr
+    swap1
+    // stack: addr, sigma_1(x[addr - 2])
+    dup1
+    // stack: addr, addr, sigma_1(x[addr - 2])
+    push 7
+    swap1
+    sub
+    // stack: addr - 7, addr, sigma_1(x[addr - 2])
+    mload
+    // stack: x[addr - 7], addr, sigma_1(x[addr - 2])
+    swap1
+    // stack: addr, x[addr - 7], sigma_1(x[addr - 2])
+    dup1
+    // stack: addr, addr, x[addr - 7], sigma_1(x[addr - 2])
+    push 15
+    swap1
+    sub
+    // stack: addr - 15, addr, x[addr - 7], sigma_1(x[addr - 2])
+    mload
+    // stack: x[addr - 15], addr, x[addr - 7], sigma_1(x[addr - 2])
+    %jump(sha2_sigma_0)
+    // stack: sigma_0(x[addr - 15]), addr, x[addr - 7], sigma_1(x[addr - 2])
+    swap1
+    // stack: addr, sigma_0(x[addr - 15]), x[addr - 7], sigma_1(x[addr - 2])
+    dup1
+    // stack: addr, addr, sigma_0(x[addr - 15]), x[addr - 7], sigma_1(x[addr - 2])
+    push 16
+    swap1
+    sub
+    // stack: addr - 16, addr, sigma_0(x[addr - 15]), x[addr - 7], sigma_1(x[addr - 2])
+    mload
+    // stack: x[addr - 16], addr, sigma_0(x[addr - 15]), x[addr - 7], sigma_1(x[addr - 2])
+    swap1
+    // stack: addr, x[addr - 16], sigma_0(x[addr - 15]), x[addr - 7], sigma_1(x[addr - 2])
+    swap4
+    // stack: sigma_1(x[addr - 2]), x[addr - 16], sigma_0(x[addr - 15]), x[addr - 7], addr
+    add
+    add
+    add
+    // stack: sigma_1(x[addr - 2]) + x[addr - 16] + sigma_0(x[addr - 15]) + x[addr - 7], addr
+    swap1
+    mstore
 
-
-
-
-
-global sha2_gen_message_schedules:
-    JUMPDEST
\ No newline at end of file
+global sha2_gen_all_message_schedules:
+    JUMPDEST
diff --git a/evm/src/cpu/kernel/asm/sha2_ops.asm b/evm/src/cpu/kernel/asm/sha2_ops.asm
index 31b03d4b..f6656954 100644
--- a/evm/src/cpu/kernel/asm/sha2_ops.asm
+++ b/evm/src/cpu/kernel/asm/sha2_ops.asm
@@ -27,7 +27,7 @@
 %endmacro
 
 // 32-bit left rotation
-%macro rot,
+%macro rotl
     // stack: rot, value
     dup2
     dup2