X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=avr-asm-macros.S;h=829562b7d1b680241df3d8786e8f443ba3edbd4b;hb=45ad29acafe8ee17f7b1bd5b933a0e04cd51c94e;hp=2acb4a13799e393ab07a80a9e32c7e8b7a2a8844;hpb=8fcf3f56d6688f240da7bd78bfe2042bc0bb2e8c;p=avr-crypto-lib.git

diff --git a/avr-asm-macros.S b/avr-asm-macros.S
index 2acb4a1..829562b 100644
--- a/avr-asm-macros.S
+++ b/avr-asm-macros.S
@@ -1,6 +1,6 @@
 /* avr-asm-macros.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
@@ -67,8 +67,8 @@
 	sbiw \reg1, \size 
 	cli
 	out _SFR_IO_ADDR(SPH), \reg2
-	out _SFR_IO_ADDR(SPL), \reg1
 	out _SFR_IO_ADDR(SREG), r0
+	out _SFR_IO_ADDR(SPL), \reg1
 .endm
 
 .macro stack_free size:req, reg1=r30, reg2=r31
@@ -78,10 +78,67 @@
 	adiw \reg1, \size 
 	cli
 	out _SFR_IO_ADDR(SPH), \reg2
+	out _SFR_IO_ADDR(SREG), r0
+	out _SFR_IO_ADDR(SPL), \reg1
+.endm
+
+
+.macro stack_alloc_large size:req, reg1=r30, reg2=r31
+	in r0, _SFR_IO_ADDR(SREG)
+	in \reg1, _SFR_IO_ADDR(SPL)
+	in \reg2, _SFR_IO_ADDR(SPH)
+	subi \reg1, lo8(\size)
+	sbci \reg2, hi8(\size)	 
+	cli
+	out _SFR_IO_ADDR(SPH), \reg2
+	out _SFR_IO_ADDR(SREG), r0
+	out _SFR_IO_ADDR(SPL), \reg1
+.endm
+
+.macro stack_free_large size:req, reg1=r30, reg2=r31
+	in r0, _SFR_IO_ADDR(SREG)
+	in \reg1, _SFR_IO_ADDR(SPL)
+	in \reg2, _SFR_IO_ADDR(SPH)
+	adiw \reg1, 63
+	adiw \reg1, (\size-63) 
+	cli
+	out _SFR_IO_ADDR(SPH), \reg2
+	out _SFR_IO_ADDR(SREG), r0
+	out _SFR_IO_ADDR(SPL), \reg1
+.endm
+
+.macro stack_free_large2 size:req, reg1=r30, reg2=r31
+	in r0, _SFR_IO_ADDR(SREG)
+	in \reg1, _SFR_IO_ADDR(SPL)
+	in \reg2, _SFR_IO_ADDR(SPH)
+	adiw \reg1, 63
+	adiw \reg1, 63
+	adiw \reg1, (\size-63*2) 
+	cli
+	out _SFR_IO_ADDR(SPH), \reg2
+	out _SFR_IO_ADDR(SREG), r0
 	out _SFR_IO_ADDR(SPL), \reg1
+.endm
+
+.macro stack_free_large3 size:req, reg1=r30, reg2=r31
+	in r0, _SFR_IO_ADDR(SREG)
+	in \reg1, _SFR_IO_ADDR(SPL)
+	in \reg2, _SFR_IO_ADDR(SPH)
+	push r16
+	push r17
+	ldi r16, lo8(\size)
+	ldi r17, hi8(\size)
+	add \reg1, r16
+	adc \reg2, r17
+	pop r17
+	pop r16 
+	cli
+	out _SFR_IO_ADDR(SPH), \reg2
 	out _SFR_IO_ADDR(SREG), r0
+	out _SFR_IO_ADDR(SPL), \reg1
 .endm
 
+
 /*******************************************************************************
 * END of MACRO SECTION                                                         *
 *******************************************************************************/