X-Git-Url: https://git.cryptolib.org/?p=avr-crypto-lib.git;a=blobdiff_plain;f=host%2Fdata2wiki.rb;h=7867e01886c7015a8c0e6aee31d48d7b3f5b2f02;hp=06ce418c32f0c54248c1d42f89974d8aab1a142e;hb=4b5da1dc27a791b5c448274a3db09cd035b33493;hpb=82de0ec79b83ba107676269ec1feddabb4cfe456

diff --git a/host/data2wiki.rb b/host/data2wiki.rb
index 06ce418..7867e01 100644
--- a/host/data2wiki.rb
+++ b/host/data2wiki.rb
@@ -3,7 +3,7 @@
 
 =begin
     This file is part of the AVR-Crypto-Lib.
-    Copyright (C) 2009  Daniel Otte (daniel.otte@rub.de)
+    Copyright (C) 2006-2015 Daniel Otte (bg@nerilex.org)
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -41,7 +41,7 @@ def get_size_string(impl, algo)
   while l=fmap.gets
     if m=l.match(/^([^:]*):(.*)$/)
       if m[1] == algo
-        modules = m[2].split(' ')
+        modules = m[2].split(/[\s]+/)
       end
     end
   end
@@ -73,43 +73,47 @@ def process_hashfunction(fin, name, impl)
   end
   hashsize = m[1].to_i()
   lb = fin.readline()
-  m = lb.match(/ctxsize \(bytes\):[\s]*([\d]*)/)
+  m = lb.match(/ctxsize \(bytes\):[\s]*([\d]+)/)
   ctxsize = m[1].to_i()
   lb = fin.readline()
-  m = lb.match(/blocksize \(bits\):[\s]*([\d]*)/)
+  m = lb.match(/blocksize \(bits\):[\s]*([\d]+)/)
   blocksize = m[1].to_i()
   lb = fin.readline()
-  m = lb.match(/init \(cycles\):[\s]*([\d]*)/)
+  m = lb.match(/init \(cycles\):[\s]*([\d]+)/)
   inittime = m[1].to_i()
   lb = fin.readline()
-  m = lb.match(/nextBlock \(cycles\):[\s]*([\d]*)/)
+  m = lb.match(/nextBlock \(cycles\):[\s]*([\d]+)/)
   nextblocktime = m[1].to_i()  
   lb = fin.readline()
-  m = lb.match(/lastBlock \(cycles\):[\s]*([\d]*)/)
+  m = lb.match(/lastBlock \(cycles\):[\s]*([\d]+)/)
   lastblocktime = m[1].to_i()
   lb = fin.readline()
-  m = lb.match(/ctx2hash \(cycles\):[\s]*([\d]*)/)
+  m = lb.match(/ctx2hash \(cycles\):[\s]*([\d]+)/)
   convtime = m[1].to_i()
   begin
+    lb = fin.gets()
+  end until lb==nil || m = lb.match(/init \(bytes\):[\s]*([\d]*)/)
+  if lb
+    initstack = m[1].to_i()
     lb = fin.readline()
-  end until m = lb.match(/init \(bytes\):[\s]*([\d]*)/)
-  initstack = m[1].to_i()
-  lb = fin.readline()
-  m = lb.match(/nextBlock \(bytes\):[\s]*([\d]*)/)
-  nextblockstack = m[1].to_i()
-  lb = fin.readline()
-  m = lb.match(/lastBlock \(bytes\):[\s]*([\d]*)/)
-  lastblockstack = m[1].to_i()
-  lb = fin.readline()
-  m = lb.match(/ctx2hash \(bytes\):[\s]*([\d]*)/)
-  convstack = m[1].to_i()
-  s1 = (initstack>nextblockstack)?initstack:nextblockstack
-  s2 = (lastblockstack>convstack)?lastblockstack:convstack
-  stack = (s1>s2)?s1:s2  
+    m = lb.match(/nextBlock \(bytes\):[\s]*([\d]*)/)
+    nextblockstack = m[1].to_i()
+    lb = fin.readline()
+    m = lb.match(/lastBlock \(bytes\):[\s]*([\d]*)/)
+    lastblockstack = m[1].to_i()
+    lb = fin.readline()
+    m = lb.match(/ctx2hash \(bytes\):[\s]*([\d]*)/)
+    convstack = m[1].to_i()
+    s1 = (initstack>nextblockstack)?initstack:nextblockstack
+    s2 = (lastblockstack>convstack)?lastblockstack:convstack
+    stack = (s1>s2)?s1:s2  
+  else
+    stack = 0
+  end  
   size = get_size_string(impl, name)
-  printf("| %20s || %3s || %3s || %6d || %7d || %7d || %7d || %7d ||" +
+  printf("| %20s || %6s || %3s || %6d || %7d || %7d || %7d || %7d ||" +
          " %7d || %7d || %9.2f || %7d || || || \n|-\n" , 
-        name, $lang, $lang, size, ctxsize, stack, hashsize, blocksize, 
+        name, $variant, $lang, size, ctxsize, stack, hashsize, blocksize, 
 	    inittime, nextblocktime, nextblocktime.to_f/(blocksize/8),
 		lastblocktime+convtime)
 end
@@ -121,9 +125,16 @@ $handlers["hashfunction"] = 1 #process_hashfunction
 
 def process_file(fname)
   fin = File.open(fname, "r")
-  $lang = "asm"
-  $lang = "C" if fname.match(/_c.txt$/)
   impl = fname.match(/([^.]*).txt$/)[1]
+  $lang = "asm"
+  $lang = "C" if impl.match(/^[^_]*_[cC]/)
+  $variant = $lang
+  if m=impl.match(/_([^_]*)$/)
+    $variant = m[1]
+  end
+  if $variant == 'c'
+    $variant = 'C'
+  end
   begin
     begin
 	  if fin.eof()
@@ -137,6 +148,7 @@ def process_file(fname)
     type = m[1]
     if $handlers[type] != 0
     #  handlers[type](fin, name)
+    #  puts "DBG: process "fname+'-'+name+'-'+impl
       process_hashfunction(fin, name, impl)
     else
       printf("ERROR: unsupported type: %s !\n", type)