progress in asm version of keccak

diff --git a/keccak/keccak-asm.S b/keccak/keccak-asm.S
index 6887a755d573fded11f9ec6e73d72a7907c706f9..328476372b75f06126b5f1ee037adc9be751cdc7 100644 (file)
--- a/keccak/keccak-asm.S
+++ b/keccak/keccak-asm.S
@@ -37,18 +37,45 @@
        }
 */
 
+theta_2a:
+/*
+       input:
+               r24:r25 = a ; uint64_t a[5][5]
+               X = b       ; uint64_t *b
+       output:
+               a[0..4][0] ^= b
+               r20 = 0
+               r21 = XX
+               r22 = XX
+               r24:r25 += 8
+               X += 8
+               Z = r24:r25 + 7 + 4 * 40
+*/
+       ldi r20, 8
+10:
+       movw ZL, r24
+       ld  r21, X+
+       .irp r, 0, 1, 2, 3, 4
+               ld  r22, Z
+               eor r22, r21
+               st  Z, r22
+       .if \r != 4
+               adiw ZL, 40
+       .endif
+       .endr
+       adiw r24, 1
+       dec r20
+       brne 10b
+       ret
+
 .global keccak_theta
 keccak_theta:
-       movw r30, r24
-       movw r26, r22
-
-;      .irp offset, 0, 1, 2, 3, 4
-
+       movw r30, r24 ; Z = a
+       movw r26, r22 ; X = b
        ldi r19, 5
 10:
        ldi r20, 8
 20:
-
        ld  r22, Z
        adiw ZL, 40
        ld  r21, Z
@@ -62,10 +89,8 @@ keccak_theta:
        adiw ZL, 40
        ld  r21, Z
        eor r22, r21
-
        adiw r24, 1
        movw r30, r24
-
        st X+, r22
        dec r20
        brne 20b
@@ -73,6 +98,56 @@ keccak_theta:
        adiw XL, 8 * 4
        dec r19
        brne 10b
-;      .endr
+/*
+       for(i = 0; i < 5; ++i){
+               for(j = 0; j < 5; ++j){
+                       a[j][i] ^= b[(4 + i) % 5][0];
+               }
+       }
+       for(i = 0; i < 5; ++i){
+        for(j = 0; j < 5; ++j){
+            a[j][i] ^= rotate64_1bit_left(b[(i + 1) % 5][0]);
+        }
+    }
+
+*/
+       sbiw XL, 5 * 8
+
+       sbiw r24, 40
+/* a[0..4][0]{0..7} ^= b[4][0]{0..7} */
+       rcall theta_2a
+/* a[0..4][1]{0..7} ^= b[0][0]{0..7} */
+       subi XL, lo8(4 * 5 * 8 + 8)
+       sbci XH, hi8(4 * 5 * 8 + 8)
+       rcall theta_2a
+/* a[0..4][2]{0..7} ^= b[1][0]{0..7} */
+       adiw XL, 4 * 8
+       rcall theta_2a
+/* a[0..4][3]{0..7} ^= b[2][0]{0..7} */
+       adiw XL, 4 * 8
+       rcall theta_2a
+/* a[0..4][4]{0..7} ^= b[3][0]{0..7} */
+       adiw XL, 4 * 8
+       rcall theta_2a
+
+       ret
+
+       ldi r20, 8
+
+10:
+       movw ZL, r24
+       ld  r21, X+
+       .irp r, 0, 1, 2, 3, 4
+               ld  r22, Z
+               eor r22, r21
+               st  Z, r22
+       .if \r != 4
+               adiw ZL, 40
+       .endif
+       .endr
+       adiw r24, 1
+       dec r20
+       brne 10b
+
 
        ret

diff --git a/keccak/keccak-stub.c b/keccak/keccak-stub.c
index 5b9e3c48f6485575287fa98c1de775e476b4125e..60cf2d19af227562f9500f59c95ad2aad8dae317 100644 (file)
--- a/keccak/keccak-stub.c
+++ b/keccak/keccak-stub.c
@@ -30,7 +30,7 @@
 #  undef DEBUG
 #endif
 
-#define DEBUG 0
+#define DEBUG 1
 
 #if DEBUG
 #include "cli.h"
@@ -107,7 +107,7 @@ void keccak_round(uint64_t a[5][5], uint8_t rci){
                        uint8_t v8[8];
                } t;
        /* theta */
-#if DEBUG
+#if DEBUG & 0
     printf_P(PSTR("\npre-theta(1):"));
     keccak_dump_state(b);
 #endif
@@ -117,11 +117,10 @@ void keccak_round(uint64_t a[5][5], uint8_t rci){
        keccak_dump_state(b);
 #endif
        for(i = 0; i < 5; ++i){
-               t.v64 = b[(4 + i) % 5][0] ^ rotate64_1bit_left(b[(i + 1) % 5][0]);
-               for(j = 0; j < 5; ++j){
-                       a[j][i] ^= t.v64;
-               }
-       }
+        for(j = 0; j < 5; ++j){
+            a[j][i] ^= rotate64_1bit_left(b[(i + 1) % 5][0]);
+        }
+    }
 #if DEBUG
        cli_putstr_P(PSTR("\r\nAfter theta:"));
        keccak_dump_state(a);