optimizing norx32

[avr-crypto-lib.git] / test_src / string-extras-asm.S

diff --git a/test_src/string-extras-asm.S b/test_src/string-extras-asm.S
index c40e442b6c1d56ef2027b13e0158718286cfb09e..92467919bd41c471684d3970653e0407f62dfc5e 100644 (file)
--- a/test_src/string-extras-asm.S
+++ b/test_src/string-extras-asm.S
@@ -21,7 +21,7 @@
 
 /******************************************************************************/
 /*
-       uint16_t stridentcnt_P(char* a, PGM_P b){
+       uint16_t stridentcnt_P(char *a, PGM_P b){
                uint16_t i=0;
                char c;
                for(;;){
@@ -46,16 +46,16 @@ stridentcnt_P:
        ld r22, X+
        lpm r23, Z+
        cpse r22, r23
-       ret
-       cpse r22, r1
-       ret
+2:     ret
+       tst r22
+       breq 2b
        adiw r24, 1
        rjmp 1b
                
 
 /******************************************************************************/
 /*
-       uint16_t firstword_length(char* s){
+       uint16_t firstword_length(char *s){
                uint16_t ret=0;
                while(isgraph(*s++))
                        ret++;
@@ -91,10 +91,10 @@ firstword_length:
 
 /******************************************************************************/
 /*
-       char* strstrip(char* str){
+       char *strstrip(char *str){
                if(!str)
                        return str;
-               char* endptr;
+               char *endptr;
                while(*str && (*str==' ' || *str=='\t'))
                        ++str;
                endptr=str;