Attachment 153677 Details for Bug 198190 – Change inline const rotate functions to macros

[patch] Change inline const rotate functions to macros

security__p5-CryptX-add-const-rotate-macros-1.diff (text/plain), 3.08 KB, created by Dimitry Andric on 2015-03-02 19:29:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dimitry Andric

Created: 2015-03-02 19:29:17 UTC

Size: 3.08 KB

patch

obsolete

>Index: security/p5-CryptX/files/patch-src__ltc__headerss__tomcrypt_macros.h
>===================================================================
>--- security/p5-CryptX/files/patch-src__ltc__headerss__tomcrypt_macros.h	(revision 0)
>+++ security/p5-CryptX/files/patch-src__ltc__headerss__tomcrypt_macros.h	(working copy)
>@@ -0,0 +1,107 @@
>+--- src/ltc/headers/tomcrypt_macros.h.orig	2014-01-23 16:45:59.000000000 +0100
>++++ src/ltc/headers/tomcrypt_macros.h	2015-03-02 20:23:48.396007000 +0100
>+@@ -281,21 +281,19 @@
>+ 
>+ #ifndef LTC_NO_ROLC
>+ 
>+-static inline ulong32 ROLc(ulong32 word, const int i)
>+-{
>+-   asm ("roll %2,%0"
>+-      :"=r" (word)
>+-      :"0" (word),"I" (i));
>+-   return word;
>+-}
>+-
>+-static inline ulong32 RORc(ulong32 word, const int i)
>+-{
>+-   asm ("rorl %2,%0"
>+-      :"=r" (word)
>+-      :"0" (word),"I" (i));
>+-   return word;
>+-}
>++#define ROLc(word, i) ({     \
>++   ulong32 _word = word;     \
>++   asm ("roll %2,%0"         \
>++      :"=r" (_word)          \
>++      :"0" (_word),"I" (i)); \
>++   _word; })
>++
>++#define RORc(word, i) ({     \
>++   ulong32 _word = word;     \
>++   asm ("rorl %2,%0"         \
>++      :"=r" (_word)          \
>++      :"0" (_word),"I" (i)); \
>++   _word; })
>+ 
>+ #else
>+ 
>+@@ -324,21 +322,19 @@
>+ 
>+ #ifndef LTC_NO_ROLC
>+ 
>+-static inline ulong32 ROLc(ulong32 word, const int i)
>+-{
>+-   asm ("rotlwi %0,%0,%2"
>+-      :"=r" (word)
>+-      :"0" (word),"I" (i));
>+-   return word;
>+-}
>+-
>+-static inline ulong32 RORc(ulong32 word, const int i)
>+-{
>+-   asm ("rotrwi %0,%0,%2"
>+-      :"=r" (word)
>+-      :"0" (word),"I" (i));
>+-   return word;
>+-}
>++#define ROLc(word, i) ({     \
>++   ulong32 _word = word;     \
>++   asm ("rotlwi %0,%0,%2"    \
>++      :"=r" (_word)          \
>++      :"0" (_word),"I" (i)); \
>++   _word; })
>++
>++#define RORc(word, i) ({     \
>++   ulong32 _word = word;     \
>++   asm ("rotrwi %0,%0,%2"    \
>++      :"=r" (_word)          \
>++      :"0" (_word),"I" (i)); \
>++   _word; })
>+ 
>+ #else
>+ 
>+@@ -380,21 +376,19 @@
>+ 
>+ #ifndef LTC_NO_ROLC
>+ 
>+-static inline ulong64 ROL64c(ulong64 word, const int i)
>+-{
>+-   asm("rolq %2,%0"
>+-      :"=r" (word)
>+-      :"0" (word),"J" (i));
>+-   return word;
>+-}
>+-
>+-static inline ulong64 ROR64c(ulong64 word, const int i)
>+-{
>+-   asm("rorq %2,%0"
>+-      :"=r" (word)
>+-      :"0" (word),"J" (i));
>+-   return word;
>+-}
>++#define ROL64c(word, i) ({     \
>++   ulong64 _word = word;       \
>++   asm ("rolq %2,%0"           \
>++      :"=r" (_word)            \
>++      :"0" (_word),"J" (i));   \
>++   _word; })
>++
>++#define ROR64c(word, i) ({     \
>++   ulong64 _word = word;       \
>++   asm ("rorq %2,%0"           \
>++      :"=r" (_word)            \
>++      :"0" (_word),"J" (i));   \
>++   _word; })
>+ 
>+ #else /* LTC_NO_ROLC */
>+ 
>
>Property changes on: security/p5-CryptX/files/patch-src__ltc__headerss__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 198190: 153677