Common: Fix read/write 64bits

Signed-off-by: Quentin Guidée <[email protected]>

Author: quentinguidee

src/common/stream.hpp

@@ -70,17 +70,17 @@ class InputStream
     T read(uint8_t n_bytes)
     {
         T value = 0;
-        for (int8_t offset = (n_bytes - 1) * BYTE; offset >= 0; offset -= BYTE)
-            value |= read_u8() << offset;
+        for (int16_t offset = (n_bytes - 1) * BYTE; offset >= 0; offset -= BYTE)
+            value |= (T)read_u8() << offset;
         return value;
     }
 
     template <typename T>
     T read_le(uint8_t n_bytes)
     {
         T value = 0;
-        for (uint8_t offset = 0; offset <= (n_bytes - 1) * BYTE; offset += BYTE)
-            value |= read_u8() << offset;
+        for (uint16_t offset = 0; offset <= (n_bytes - 1) * BYTE; offset += BYTE)
+            value |= (T)read_u8() << offset;
         return value;
     }
 };
@@ -111,14 +111,14 @@ class OutputStream
     template <typename T>
     void write(uint8_t n_bytes, T value)
     {
-        for (int8_t offset = (n_bytes - 1) * BYTE; offset >= 0; offset -= BYTE)
+        for (int16_t offset = (n_bytes - 1) * BYTE; offset >= 0; offset -= BYTE)
             write_u8(value >> offset);
     }
 
     template <typename T>
     void write_le(uint8_t n_bytes, T value)
     {
-        for (uint8_t offset = 0; offset <= (n_bytes - 1) * BYTE; offset += BYTE)
+        for (uint16_t offset = 0; offset <= (n_bytes - 1) * BYTE; offset += BYTE)
             write_u8(value >> offset);
     }
 };

tests/common_tests.cpp

@@ -22,10 +22,11 @@ static void test_write(OutputStream& out)
     out.write_i24(0xABCDEF);
     out.write_u32(0x12345678);
     out.write_u32_le(0x12345678);
+    out.write<uint64_t>(8, 0xFEDCBA9876543210);
 }
 static void test_read(InputStream& in)
 {
-    EXPECT_EQ(in.size(), 36);
+    EXPECT_EQ(in.size(), 44);
 
     EXPECT_EQ(in.peek_u8(), 0);
     EXPECT_EQ(in.read_u8(), 0);
@@ -57,6 +58,7 @@ static void test_read(InputStream& in)
     EXPECT_EQ(in.read_i32(), 0x12345678);
     EXPECT_EQ(in.peek_u32(), 0x78563412);
     EXPECT_EQ(in.read_u32(), 0x78563412);
+    EXPECT_EQ(in.read<uint64_t>(8), 0xFEDCBA9876543210);
 }
 
 TEST(CommonTest, BufferStream)