Attachment 153479 Details for Bug 198017 – Change inline const rotate functions to macros

[patch] Change inline const rotate functions to macros

security__tomcrypt-add-const-rotate-macros-1.diff (text/plain), 3.09 KB, created by Dimitry Andric on 2015-02-24 22:25:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dimitry Andric

Created: 2015-02-24 22:25:30 UTC

Size: 3.09 KB

patch

obsolete

>Index: security/libtomcrypt/files/patch-src__headers__tomcrypt_macros.h
>===================================================================
>--- security/libtomcrypt/files/patch-src__headers__tomcrypt_macros.h	(revision 0)
>+++ security/libtomcrypt/files/patch-src__headers__tomcrypt_macros.h	(working copy)
>@@ -0,0 +1,107 @@
>+--- src/headers/tomcrypt_macros.h.orig	2007-05-12 16:46:25.000000000 +0200
>++++ src/headers/tomcrypt_macros.h	2015-02-24 23:19:08.128986000 +0100
>+@@ -262,21 +262,19 @@
>+ 
>+ #ifndef LTC_NO_ROLC
>+ 
>+-static inline unsigned ROLc(unsigned word, const int i)
>+-{
>+-   asm ("roll %2,%0"
>+-      :"=r" (word)
>+-      :"0" (word),"I" (i));
>+-   return word;
>+-}
>+-
>+-static inline unsigned RORc(unsigned word, const int i)
>+-{
>+-   asm ("rorl %2,%0"
>+-      :"=r" (word)
>+-      :"0" (word),"I" (i));
>+-   return word;
>+-}
>++#define ROLc(word, i) ({     \
>++   unsigned _word = word;    \
>++   asm ("roll %2,%0"         \
>++      :"=r" (_word)          \
>++      :"0" (_word),"I" (i)); \
>++   _word; })
>++
>++#define RORc(word, i) ({     \
>++   unsigned _word = word;    \
>++   asm ("rorl %2,%0"         \
>++      :"=r" (_word)          \
>++      :"0" (_word),"I" (i)); \
>++   _word; })
>+ 
>+ #else
>+ 
>+@@ -305,21 +303,19 @@
>+ 
>+ #ifndef LTC_NO_ROLC
>+ 
>+-static inline unsigned ROLc(unsigned word, const int i)
>+-{
>+-   asm ("rotlwi %0,%0,%2"
>+-      :"=r" (word)
>+-      :"0" (word),"I" (i));
>+-   return word;
>+-}
>+-
>+-static inline unsigned RORc(unsigned word, const int i)
>+-{
>+-   asm ("rotrwi %0,%0,%2"
>+-      :"=r" (word)
>+-      :"0" (word),"I" (i));
>+-   return word;
>+-}
>++#define ROLc(word, i) ({     \
>++   unsigned _word = word;    \
>++   asm ("rotlwi %0,%0,%2"    \
>++      :"=r" (_word)          \
>++      :"0" (_word),"I" (i)); \
>++   _word; })
>++
>++#define RORc(word, i) ({     \
>++   unsigned _word = word;    \
>++   asm ("rotrwi %0,%0,%2"    \
>++      :"=r" (_word)          \
>++      :"0" (_word),"I" (i)); \
>++   _word; })
>+ 
>+ #else
>+ 
>+@@ -361,21 +357,19 @@
>+ 
>+ #ifndef LTC_NO_ROLC
>+ 
>+-static inline unsigned long ROL64c(unsigned long word, const int i)
>+-{
>+-   asm("rolq %2,%0"
>+-      :"=r" (word)
>+-      :"0" (word),"J" (i));
>+-   return word;
>+-}
>+-
>+-static inline unsigned long ROR64c(unsigned long word, const int i)
>+-{
>+-   asm("rorq %2,%0"
>+-      :"=r" (word)
>+-      :"0" (word),"J" (i));
>+-   return word;
>+-}
>++#define ROL64c(word, i) ({     \
>++   unsigned long _word = word; \
>++   asm ("rolq %2,%0"           \
>++      :"=r" (_word)            \
>++      :"0" (_word),"J" (i));   \
>++   _word; })
>++
>++#define ROR64c(word, i) ({     \
>++   unsigned long _word = word; \
>++   asm ("rorq %2,%0"           \
>++      :"=r" (_word)            \
>++      :"0" (_word),"J" (i));   \
>++   _word; })
>+ 
>+ #else /* LTC_NO_ROLC */
>+ 
>
>Property changes on: security/libtomcrypt/files/patch-src__headers__tomcrypt_macros.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 198017: 153479