Merge pull request #60 from Cysharp/hadashiA/fix-big-endian3

Fix the bits of Time in big-endian case
Cysharp · Sep 28, 2023 · 86dc190 · 86dc190
2 parents 2981c6c + 37fe5f0
commit 86dc190
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/Ulid.Unity/Assets/Scripts/Ulid/Ulid.cs b/src/Ulid.Unity/Assets/Scripts/Ulid/Ulid.cs
@@ -93,7 +93,7 @@ public DateTimeOffset Time
             {
                 if (BitConverter.IsLittleEndian)
                 {
-                    // |A|B|C|D|E|F|G|H|... -> |F|E|D|C|B|A|0|0|
+                    // |A|B|C|D|E|F|... -> |F|E|D|C|B|A|0|0|
 
                     // Lower |A|B|C|D| -> |D|C|B|A|
                     // Upper |E|F| -> |F|E|
@@ -105,14 +105,14 @@ public DateTimeOffset Time
                 }
                 else
                 {
-                    // |A|B|C|D|E|F|G|H|... -> |A|B|C|D|E|F|0|0|
+                    // |A|B|C|D|E|F|... -> |0|0|A|B|C|D|E|F|
 
                     // Upper |A|B|C|D|
                     // Lower |E|F|
-                    // Time  |A|B|C|D| + |E|F|0|0|
+                    // Time  |A|B|C|C|0|0| + |E|F|
                     var upper = Unsafe.As<byte, uint>(ref Unsafe.AsRef(this.timestamp0));
                     var lower = Unsafe.As<byte, ushort>(ref Unsafe.AsRef(this.timestamp4));
-                    var time = ((long)upper << 32) + ((long)lower << 16);
+                    var time = ((long)upper << 16) + (long)lower;
                     return DateTimeOffset.FromUnixTimeMilliseconds(time);
                 }
             }

diff --git a/src/Ulid/Ulid.cs b/src/Ulid/Ulid.cs
@@ -93,7 +93,7 @@ public DateTimeOffset Time
             {
                 if (BitConverter.IsLittleEndian)
                 {
-                    // |A|B|C|D|E|F|G|H|... -> |F|E|D|C|B|A|0|0|
+                    // |A|B|C|D|E|F|... -> |F|E|D|C|B|A|0|0|
 
                     // Lower |A|B|C|D| -> |D|C|B|A|
                     // Upper |E|F| -> |F|E|
@@ -105,14 +105,14 @@ public DateTimeOffset Time
                 }
                 else
                 {
-                    // |A|B|C|D|E|F|G|H|... -> |A|B|C|D|E|F|0|0|
+                    // |A|B|C|D|E|F|... -> |0|0|A|B|C|D|E|F|
 
                     // Upper |A|B|C|D|
                     // Lower |E|F|
-                    // Time  |A|B|C|D| + |E|F|0|0|
+                    // Time  |A|B|C|C|0|0| + |E|F|
                     var upper = Unsafe.As<byte, uint>(ref Unsafe.AsRef(this.timestamp0));
                     var lower = Unsafe.As<byte, ushort>(ref Unsafe.AsRef(this.timestamp4));
-                    var time = ((long)upper << 32) + ((long)lower << 16);
+                    var time = ((long)upper << 16) + (long)lower;
                     return DateTimeOffset.FromUnixTimeMilliseconds(time);
                 }
             }