Changeset 21902 in vbox

Timestamp:

Jul 30, 2009 6:38:22 PM (15 years ago)

Author:

vboxsync

Message:

SSM: Fixed a checksum verification issue when loading a stream that isn't checksummed. Also some experimentation with using Adler32 instead of CRC-32.

File:

• trunk/src/VBox/VMM/SSM-new.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/SSM-new.cpp

@@ -264 +264 @@
 #define SSM_ZIP_BLOCK_SIZE                      _4K
 AssertCompile(SSM_ZIP_BLOCK_SIZE / _1K * _1K == SSM_ZIP_BLOCK_SIZE);
+
+#if 0
+static uint32_t RTCrcAdler32Start(void)
+{
+    return 1;
+}
+
+static uint32_t RTCrcAdler32Process(uint32_t u32Crc, void const *pv, size_t cb)
+{
+    uint8_t const  *pbSrc = (uint8_t const *)pv;
+    uint32_t        a     = u32Crc & 0xffff;
+    uint32_t        b     = u32Crc >> 16;
+    if (cb < 64)
+    {
+        while (cb-- > 0)
+        {
+            a += *pbSrc++;
+            a %= 65521;
+            b += a;
+            b %= 65521;
+        }
+    }
+    else
+    {
+        while (((uintptr_t)pbSrc & 0x3))
+        {
+            a += *pbSrc++;
+            a %= 65521;
+            b += a;
+            b %= 65521;
+            cb--;
+        }
+
+        while (cb >= 4)
+        {
+            uint32_t u32 = *(uint32_t const *)pbSrc;
+            pbSrc += 4;
+
+            a += u32 & 0xff;
+            a %= 65521;
+            b += a;
+            b %= 65521;
+
+            a += (u32 >> 8) & 0xff;
+            a %= 65521;
+            b += a;
+            b %= 65521;
+
+            a += (u32 >> 16) & 0xff;
+            a %= 65521;
+            b += a;
+            b %= 65521;
+
+            a += (u32 >> 24) & 0xff;
+            a %= 65521;
+            b += a;
+            b %= 65521;
+
+            cb -= 4;
+        }
+
+        while (cb > 0)
+        {
+            a += *pbSrc++;
+            a %= 65521;
+            b += a;
+            b %= 65521;
+            cb--;
+        }
+    }
+
+    return a | (b << 16);
+}
+
+static uint32_t RTCrcAdler32Finish(uint32_t u32Crc)
+{
+    return u32Crc;
+
+}
+
+static uint32_t RTCrcAdler32(void const *pv, size_t cb)
+{
+    return RTCrcAdler32Process(RTCrcAdler32Start(), pv, cb);
+}
+
+# define RTCrc32            RTCrcAdler32
+# define RTCrc32Start       RTCrcAdler32Start
+# define RTCrc32Process     RTCrcAdler32Process
+# define RTCrc32Finish      RTCrcAdler32Finish
+
+#endif
 
 
@@ -3133 +3224 @@
         else
             AssertFailedReturn(VERR_INTERNAL_ERROR);
+        if (!fChecksummed)
+            ssmR3StrmDisableChecksumming(&pSSM->Strm);
 
         /*