Renaming readAligned to load32Aligned.

Author: nicolasnoble

src/mips/common/util/util.h

@@ -28,7 +28,33 @@ SOFTWARE.
 
 #include <stdint.h>
 
-static __inline__ uint32_t readUnaligned(const void *in, int pos) {
+#ifdef __cplusplus
+
+#include <concepts>
+
+namespace Utilities {
+
+template <std::integral T>
+T loadUnaligned(const uint8_t *ptr, unsigned size = (sizeof(T) + 7) / 8) {
+    T ret = 0;
+    for (unsigned i = 0; i < size; i++) {
+        ret |= (ptr[i] << (i * 8));
+    }
+    return ret;
+}
+
+template <std::integral T>
+void storeUnaligned(uint8_t *ptr, T value, unsigned size = (sizeof(T) + 7) / 8) {
+    for (unsigned i = 0; i < size; i++) {
+        ptr[i] = value >> (i * 8);
+    }
+}
+
+}  // namespace Utilities
+
+#endif
+
+static __inline__ uint32_t load32Unaligned(const void *in, int pos) {
     const uint8_t *buffer = (const uint8_t *)in;
     uint32_t r;
     __builtin_memcpy(&r, buffer + pos, sizeof(uint32_t));

src/mips/openbios/cdrom/filesystem.c

@@ -70,7 +70,7 @@ int cdromReadPathTable() {
 
     const uint32_t *const buffer = (uint32_t *)g_readBuffer;
     s_pathTableSize = buffer[132 / 4];
-    s_rootDirectorySector = readUnaligned(buffer, 158);
+    s_rootDirectorySector = load32Unaligned(buffer, 158);
     s_currentDiscHash = buffer[80 / 4];
     uint32_t lba = s_pathTableLocation = buffer[140 / 4];
 
@@ -83,7 +83,7 @@ int cdromReadPathTable() {
     int entryID = 1;
     while ((ptr < g_readBuffer + sizeof(g_readBuffer)) && (entryID <= sizeof(s_pathTable) / sizeof(s_pathTable[0]))) {
         if (!ptr[0]) break;
-        entry->LBA = readUnaligned(ptr, 2);
+        entry->LBA = load32Unaligned(ptr, 2);
         // ...why? it's literally the array entry number.
         entry->ID = entryID;
         // Yes. I can't even.
@@ -122,8 +122,8 @@ static int readDirectory(int entryID) {
     while ((ptr < (g_readBuffer + sizeof(g_readBuffer))) &&
            (entry < s_cachedDirectoryEntry + sizeof(s_cachedDirectoryEntry) / sizeof(s_cachedDirectoryEntry[0])) &&
            ptr[0]) {
-        entry->LBA = readUnaligned(ptr, 2);
-        entry->size = readUnaligned(ptr, 10);
+        entry->LBA = load32Unaligned(ptr, 2);
+        entry->size = load32Unaligned(ptr, 10);
         uint8_t nameSize = ptr[32];
         memcpy(entry->name, ptr + 33, nameSize);
         entry->name[nameSize] = 0;

src/mips/shell/cdrom.c

@@ -188,7 +188,7 @@ static void complete() {
                 s_wait = 1;
                 break;
             }
-            uint32_t lba = readUnaligned(s_sector, 158) + 150;
+            uint32_t lba = load32Unaligned(s_sector, 158) + 150;
             unsigned minutes = lba / 4500;
             lba %= 4500;
             uint8_t msf[3] = {(minutes % 10) + (minutes / 10) * 0x10, ((lba / 75) % 10) + ((lba / 75) / 10) * 0x10,