Changeset 51828 in vbox

Timestamp:

Jul 3, 2014 3:04:39 AM (11 years ago)

Author:

vboxsync

Message:

Added alternative SHA-1 code. Extended asm.h with 32-bit and 64-bit rotate methods. Hope the latter compiles well with gcc, if not I will fix it after some sleep.

Location:

trunk

Files:

• include/iprt/asm.h (modified) (2 diffs)
• include/iprt/sha.h (modified) (3 diffs)
• src/VBox/HostDrivers/Support/Makefile.kmk (modified) (1 diff)
• src/VBox/Runtime/Makefile.kmk (modified) (2 diffs)
• src/VBox/Runtime/common/checksum/sha1-alt.cpp (added)

trunk/include/iprt/asm.h

@@ -66 +66 @@
 # pragma intrinsic(_InterlockedCompareExchange)
 # pragma intrinsic(_InterlockedCompareExchange64)
+# pragma intrinsic(_rotl)
+# pragma intrinsic(_rotr)
+# pragma intrinsic(_rotl64)
+# pragma intrinsic(_rotr64)
 # ifdef RT_ARCH_AMD64
 #  pragma intrinsic(__stosq)
@@ -4811 +4815 @@
 
 
+/**
+ * Rotate 32-bit unsigned value to the left by @a cShift.
+ *
+ * @returns Rotated value.
+ * @param   u32                 The value to rotate.
+ * @param   cShift              How many bits to rotate by.
+ */
+DECLINLINE(uint32_t) ASMRotateLeftU32(uint32_t u32, uint32_t cShift)
+{
+#if RT_INLINE_ASM_USES_INTRIN
+    return _rotl(u32, cShift);
+#elif RT_INLINE_ASM_GNU_STYLE && (defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86))
+    __asm__ __volatile__("roll %1, %0" : "=r" (u32) : "Ir" (cShift), "0" (u32));
+#else
+    cShift &= 31;
+    return (u32 << cShift) | (u32 >> (32 - cShift));
+#endif
+}
+
+
+/**
+ * Rotate 32-bit unsigned value to the right by @a cShift.
+ *
+ * @returns Rotated value.
+ * @param   u32                 The value to rotate.
+ * @param   cShift              How many bits to rotate by.
+ */
+DECLINLINE(uint32_t) ASMRotateRightU32(uint32_t u32, uint32_t cShift)
+{
+#if RT_INLINE_ASM_USES_INTRIN
+    return _rotr(u32, cShift);
+#elif RT_INLINE_ASM_GNU_STYLE && (defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86))
+    __asm__ __volatile__("rorl %1, %0" : "=r" (u32) : "Ir" (cShift), "0" (u32));
+#else
+    cShift &= 31;
+    return (u32 >> cShift) | (u32 << (32 - cShift));
+#endif
+}
+
+
+/**
+ * Rotate 64-bit unsigned value to the left by @a cShift.
+ *
+ * @returns Rotated value.
+ * @param   u64                 The value to rotate.
+ * @param   cShift              How many bits to rotate by.
+ */
+DECLINLINE(uint64_t) ASMRotateLeftU64(uint64_t u64, uint32_t cShift)
+{
+#if RT_INLINE_ASM_USES_INTRIN
+    return _rotl64(u64, cShift);
+#elif RT_INLINE_ASM_GNU_STYLE && defined(RT_ARCH_AMD64)
+    __asm__ __volatile__("rolq %1, %0" : "=r" (u64) : "Ir" (cShift), "0" (u64));
+#elif RT_INLINE_ASM_GNU_STYLE && defined(RT_ARCH_X86)
+    uint32_t uSpill;
+    __asm__ __volatile__("testb $0x20, %%cl\n\t"        /* if (cShift >= 0x20) { swap(u64.hi, u64lo); cShift -= 0x20; } */
+                         "jz    1f\n\t"
+                         "xchgl %%eax, %%edx\n\t"
+                         "1:\n\t"
+                         "andb  $0x1f, %%cl\n\t"        /* if (cShift & 0x1f) { */
+                         "jz    2f\n\t"
+                         "movl  %%edx, %2\n\t"          /*   save the hi value in %3. */
+                         "shldl %%cl,%%eax,%%edx\n\t"   /*   shift the hi value left, feeding MSBits from the low value. */
+                         "shldl %%cl,%2,%%eax\n\t"      /*   shift the lo value left, feeding MSBits from the saved hi value. */
+                         "2:\n\t"                       /* } */
+                         : "=A" (u64), "=c" (cShift), "=r" (uSpill)
+                         : "0" (u64),
+                           "1" (cShift));
+    return u64;
+#else
+    cShift &= 63;
+    return (u64 << cShift) | (u64 >> (64 - cShift));
+#endif
+}
+
+
+/**
+ * Rotate 64-bit unsigned value to the right by @a cShift.
+ *
+ * @returns Rotated value.
+ * @param   u64                 The value to rotate.
+ * @param   cShift              How many bits to rotate by.
+ */
+DECLINLINE(uint64_t) ASMRotateRightU64(uint64_t u64, uint32_t cShift)
+{
+#if RT_INLINE_ASM_USES_INTRIN
+    return _rotr64(u64, cShift);
+#elif RT_INLINE_ASM_GNU_STYLE && defined(RT_ARCH_AMD64)
+    __asm__ __volatile__("rorq %1, %0" : "=r" (u64) : "Ir" (cShift), "0" (u64));
+#elif RT_INLINE_ASM_GNU_STYLE && defined(RT_ARCH_X86)
+    uint32_t uSpill;
+    __asm__ __volatile__("testb $0x20, %%cl\n\t"        /* if (cShift >= 0x20) { swap(u64.hi, u64lo); cShift -= 0x20; } */
+                         "jz    1f\n\t"
+                         "xchgl %%eax, %%edx\n\t"
+                         "1:\n\t"
+                         "andb  $0x1f, %%cl\n\t"        /* if (cShift & 0x1f) { */
+                         "jz    2f\n\t"
+                         "movl  %%edx, %2\n\t"          /*   save the hi value in %3. */
+                         "shrdl %%cl,%%eax,%%edx\n\t"   /*   shift the hi value right, feeding LSBits from the low value. */
+                         "shrdl %%cl,%2,%%eax\n\t"      /*   shift the lo value right, feeding LSBits from the saved hi value. */
+                         "2:\n\t"                       /* } */
+                         : "=A" (u64), "=c" (cShift), "=r" (uSpill)
+                         : "0" (u64),
+                           "1" (cShift));
+    return u64;
+#else
+    cShift &= 63;
+    return (u64 >> cShift) | (u64 << (64 - cShift));
+#endif
+}
+
 /** @} */
 

trunk/include/iprt/sha.h

@@ -46 +46 @@
 typedef union RTSHA1CONTEXT
 {
-    uint8_t abPadding[ARCH_BITS == 32 ? 96 : 128];
+    uint64_t                u64BetterAlignment;
+    uint8_t                 abPadding[8 + (5 + 80) * 4 + 4];
 #ifdef RT_SHA1_PRIVATE_CONTEXT
-    SHA_CTX Private;
+    SHA_CTX                 Private;
+#endif
+#ifdef RT_SHA1_PRIVATE_ALT_CONTEXT
+    RTSHA1ALTPRIVATECTX     AltPrivate;
 #endif
 } RTSHA1CONTEXT;
@@ -149 +153 @@
 typedef union RTSHA256CONTEXT
 {
-    uint8_t abPadding[ARCH_BITS == 32 ? 112 : 160];
+    uint64_t                u64BetterAlignment;
+    uint8_t                 abPadding[ARCH_BITS == 32 ? 112 : 160];
 #ifdef RT_SHA256_PRIVATE_CONTEXT
-    SHA256_CTX Private;
+    SHA256_CTX              Private;
 #endif
 } RTSHA256CONTEXT;
@@ -253 +258 @@
 typedef union RTSHA512CONTEXT
 {
-    uint8_t abPadding[ARCH_BITS == 32 ? 216 : 256];
+    uint64_t                u64BetterAlignment;
+    uint8_t                 abPadding[ARCH_BITS == 32 ? 216 : 256];
 #ifdef RT_SHA512_PRIVATE_CONTEXT
-    SHA512_CTX Private;
+    SHA512_CTX              Private;
 #endif
 } RTSHA512CONTEXT;

trunk/src/VBox/HostDrivers/Support/Makefile.kmk

@@ -269 +269 @@
         $(VBOX_PATH_RUNTIME_SRC)/common/checksum/md2-alt.cpp \
         $(VBOX_PATH_RUNTIME_SRC)/common/checksum/md5.cpp \
-        $(VBOX_PATH_RUNTIME_SRC)/common/checksum/sha1.cpp \
+        $(VBOX_PATH_RUNTIME_SRC)/common/checksum/sha1-alt.cpp \
         $(VBOX_PATH_RUNTIME_SRC)/common/checksum/sha256.cpp \
         $(VBOX_PATH_RUNTIME_SRC)/common/checksum/sha512.cpp \

trunk/src/VBox/Runtime/Makefile.kmk

@@ -313 +313 @@
         common/checksum/RTSha1Digest.cpp \
         common/checksum/RTSha256Digest.cpp \
-        common/checksum/sha1.cpp \
+        common/checksum/sha1-alt.cpp \
         common/checksum/sha1str.cpp \
         common/checksum/sha256.cpp \
@@ -2037 +2037 @@
         common/crypto/taf-sanity.cpp \
         common/checksum/md2-alt.cpp \
-        common/checksum/sha1.cpp \
+        common/checksum/sha1-alt.cpp \
         common/checksum/sha256.cpp \
         common/checksum/sha512.cpp \