X-Git-Url: https://git.cryptolib.org/?p=avr-crypto-lib.git;a=blobdiff_plain;f=memxor.S;h=cb3d0e86cb60fadcec00ca1124b25f2ba9560af9;hp=2e8223766785f1aefed253cc2f681041e875554a;hb=6bd58d7909b89a3e05003a63cdc642638fa653e6;hpb=36101d05fdd3f660375301ca9f017d2e16c228b7

diff --git a/memxor.S b/memxor.S
index 2e82237..cb3d0e8 100644
--- a/memxor.S
+++ b/memxor.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"
 
 /*
  * void memxor(void* dest, const void* src, uint16_t n);