fixed small bug in MD5

[avr-crypto-lib.git] / arcfour-asm.S

diff --git a/arcfour-asm.S b/arcfour-asm.S
index 5fbf2a271837374b8d7c9f3f651bae9dfd189d0b..b506dc4953fd9701ec5ca38f2be9b86d5e116c06 100644 (file)
--- a/arcfour-asm.S
+++ b/arcfour-asm.S
@@ -27,51 +27,7 @@
  */
  
 #include <avr/io.h>
-
-
-.macro push_ p1:req, p2:vararg
-       push \p1
-.ifnb \p2      
-       push_ \p2
-.endif
-.endm
-
-.macro pop_ p1:req, p2:vararg
-       pop \p1
-.ifnb \p2      
-       pop_ \p2
-.endif
-.endm
-
-.macro push_range from:req, to:req
-       push \from
-.if     \to-\from
-       push_range "(\from+1)",\to
-.endif         
-.endm
-
-.macro pop_range from:req, to:req
-       pop \to
-.if     \to-\from
-       pop_range \from,"(\to-1)"       
-.endif
-.endm
-
-.macro stack_alloc size:req, reg1=r30, reg2=r31
-       in \reg1, _SFR_IO_ADDR(SPL)
-       in \reg2, _SFR_IO_ADDR(SPH)
-       sbiw r30, \size 
-       out  _SFR_IO_ADDR(SPH), \reg2
-       out  _SFR_IO_ADDR(SPL), \reg1
-.endm
-
-.macro stack_free size:req, reg1=r30, reg2=r31
-       in \reg1, _SFR_IO_ADDR(SPL)
-       in \reg2, _SFR_IO_ADDR(SPH)
-       adiw r30, \size 
-       out  _SFR_IO_ADDR(SPH), \reg2
-       out  _SFR_IO_ADDR(SPL), \reg1
-.endm
+#include "avr-asm-macros.S"
  
  /* +---+---+---------------------+
  *  | i | j | ......<256>........ |