X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=memxor.S;h=a32058bfc4c3c93d22abd82e23f83ae30d4e56e9;hb=b022a029def51d63f330c12bf07156db294c8958;hp=cb3d0e86cb60fadcec00ca1124b25f2ba9560af9;hpb=6bd58d7909b89a3e05003a63cdc642638fa653e6;p=avr-crypto-lib.git
diff --git a/memxor.S b/memxor.S
index cb3d0e8..a32058b 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
@@ -17,17 +17,14 @@
along with this program. If not, see .
*/
-/*
+/*
* File: memxor.S
* Author: Daniel Otte
* Date: 2008-08-07
* License: GPLv3 or later
* Description: memxor, XORing one block into another
- *
+ *
*/
-
-#include
-#include "avr-asm-macros.S"
/*
* void memxor(void* dest, const void* src, uint16_t n);
@@ -42,9 +39,7 @@ memxor:
movw r30, r24
movw r26, r22
movw r24, r20
- tst r24
- brne 1f
- tst r25
+ adiw r24, 0
breq 2f
1:
ld r20, X+
@@ -55,17 +50,17 @@ memxor:
brne 1b
2:
ret
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+