including even/odd-trick for BMW

[arm-crypto-lib.git] / bmw / autogen_f1_large.rb

diff --git a/bmw/autogen_f1_large.rb b/bmw/autogen_f1_large.rb
index 5faca0fa095da47f73bf908bd70e2aeac5bc6799..780e95398c58d9f59ca3d6f4cf718daa44216633 100644 (file)
--- a/bmw/autogen_f1_large.rb
+++ b/bmw/autogen_f1_large.rb
@@ -5,6 +5,7 @@ header = <<EOF
 
 static inline
 void bmw_large_f1(uint64_t* q, const void* m, const void* h){ 
+  uint64_t even, odd;
 EOF
 
 footer = <<EOF
@@ -46,7 +47,7 @@ def expand_1(j)
 end
 
 
-def expand_2(j)
+def expand_2(j, start)
   s = sprintf("/* expand_2(%2d) */\n", j)
   s += sprintf("\tq[%2d] = \n", j+16)
   s += sprintf("\t\t((  ROTL64(((uint64_t*)m)[%2d], %d) \n", j%16,      (j%16)+1)
@@ -55,15 +56,28 @@ def expand_2(j)
   s += sprintf("\t\t  + 0x%016xULL \n", 0x0555_5555_5555_5555*(16+j))
   s += sprintf("\t\t )^ ((uint64_t*)h)[%2d] \n", (j+7)%16)
   s += sprintf("\t\t)");
-  (0..13).each do |x|
-    s += (x%4==0)?"\n\t\t":" "
-    if x%2==0
-      s += sprintf("+       q[%2d] ",  x+j)
+  if(j-1<=start) 
+    if(j%2==0)
+      # even
+      s += sprintf("\n\t\t + ( even =  q[%2d] + q[%2d] + q[%2d]",j,j+2,j+4)
+      s += sprintf("\n\t\t           + q[%2d] + q[%2d] + q[%2d] + q[%2d] )",j+6,j+8,j+10,j+12)
+      s += sprintf("\n\t\t + R64_1(q[%2d]) + R64_2(q[%2d]) + R64_3(q[%2d])",j+1,j+3,j+5)
+      s += sprintf("\n\t\t + R64_4(q[%2d]) + R64_5(q[%2d]) + R64_6(q[%2d])",j+7,j+9,j+11)
+      s += sprintf("\n\t\t + R64_7(q[%2d]) + S64_4(q[%2d]) + S64_5(q[%2d])",j+13,j+14,j+15)
     else
-      s += sprintf("+ R64_%d(q[%2d])", (x+1)/2, x+j)
-    end
-  end
-  s += sprintf(" + S64_4(q[%2d]) + S64_5(q[%2d])", j+14, j+15)
+      # odd
+      s += sprintf("\n\t\t + ( odd  =  q[%2d] + q[%2d] + q[%2d]",j,j+2,j+4)
+      s += sprintf("\n\t\t           + q[%2d] + q[%2d] + q[%2d] + q[%2d] )",j+6,j+8,j+10,j+12)
+      s += sprintf("\n\t\t + R64_1(q[%2d]) + R64_2(q[%2d]) + R64_3(q[%2d])",j+1,j+3,j+5)
+      s += sprintf("\n\t\t + R64_4(q[%2d]) + R64_5(q[%2d]) + R64_6(q[%2d])",j+7,j+9,j+11)
+      s += sprintf("\n\t\t + R64_7(q[%2d]) + S64_4(q[%2d]) + S64_5(q[%2d])",j+13,j+14,j+15)
+    end 
+  else 
+    s += sprintf("\n\t\t + ( %s  +=  q[%2d] - q[%2d] )",(j%2==0)?"even":"odd ",j+12,j-2)    
+    s += sprintf("\n\t\t + R64_1(q[%2d]) + R64_2(q[%2d]) + R64_3(q[%2d])",j+1,j+3,j+5)
+    s += sprintf("\n\t\t + R64_4(q[%2d]) + R64_5(q[%2d]) + R64_6(q[%2d])",j+7,j+9,j+11)
+    s += sprintf("\n\t\t + R64_7(q[%2d]) + S64_4(q[%2d]) + S64_5(q[%2d])",j+13,j+14,j+15)  
+  end 
   s += ';'
   return s
 end
@@ -71,5 +85,5 @@ end
 
 puts header
 (0..1).each  {|x| puts expand_1(x)}
-(2..15).each {|x| puts expand_2(x)}
+(2..15).each {|x| puts expand_2(x, 2)}
 puts footer
\ No newline at end of file