X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=memxor.S;h=885dad5338a4f4ad65391ed5f367c802736b6224;hb=e5a49deb52521f019e37779d6e9d81ec4f02aba4;hp=0e0419830d2d1cc7f1dc816fee8d56411c6590c7;hpb=f0ca870318011539b8cab50cf3e9b96a19307deb;p=avr-crypto-lib.git

diff --git a/memxor.S b/memxor.S
index 0e04198..885dad5 100644
--- a/memxor.S
+++ b/memxor.S
@@ -1,6 +1,6 @@
 /* memxor.S */
 /*
-    This file is part of the Crypto-avr-lib/microcrypt-lib.
+    This file is part of the AVR-Crypto-Lib.
     Copyright (C) 2008  Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify
@@ -20,59 +20,12 @@
 /* 
  * File:        memxor.S
  * Author:      Daniel Otte
- * Date:        2006-07-06
+ * Date:        2008-08-07
  * License:     GPLv3 or later
- * Description: Implementation of the ARCFOUR (RC4 compatible) stream cipher algorithm.
+ * Description: memxor, XORing one block into another
  * 
  */
  
-#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
-
 /*
  * void memxor(void* dest, const void* src, uint16_t n);
  */