Ticket #8247: be-unaligned.diff

scummvm/common/scummsys.h

@@ -368 +368 @@
         #define MKID_BE(a) (a)
         //#define MKID_BE(a) SWAP_BYTES(a)
 
-        FORCEINLINE uint32 FROM_LE_32(uint32 a) {
-                return ((a >> 24) & 0xFF) + ((a >> 8) & 0xFF00) + (( a<< 8) & 0xFF0000) \
-                                                + ((a<<24)&0xFF000000);
-        }
-
-        FORCEINLINE uint16 FROM_LE_16(uint16 a) {
-                return ((a >> 8) & 0xFF) + ((a << 8) & 0xFF00);
+        FORCEINLINE uint READ_LE_UINT16(const void *ptr) {
+                const byte *b = (const byte *)ptr;
+                return (b[1] << 8) + b[0];
         }
 
-        #define TO_LE_32 FROM_LE_32
-        #define TO_LE_16 FROM_LE_16
+        #if defined(SCUMM_NEED_ALIGNMENT)
+                FORCEINLINE uint READ_BE_UINT16(const void *ptr) {
+                        return (((const byte *)ptr)[0] << 8)|((const byte *)ptr)[1];
+                }
+        #else
+                FORCEINLINE uint READ_BE_UINT16(const void *ptr) {
+                        return *(const uint16 *)(ptr);
+                }
+        #endif
 
         FORCEINLINE uint32 READ_LE_UINT32(const void *ptr) {
                 const byte *b = (const byte *)ptr;
                 return (b[3] << 24) + (b[2] << 16) + (b[1] << 8) + (b[0]);
         }
 
-        FORCEINLINE uint32 READ_BE_UINT32(const void *ptr) {
-                return *(const uint32 *)(ptr);
-        }
+        #if defined(SCUMM_NEED_ALIGNMENT)
+                FORCEINLINE uint32 READ_BE_UINT32(const void *ptr) {
+                        const byte *b = (const byte*)ptr;
+                        return (b[0] << 24) + (b[1] << 16) + (b[2] << 8) + (b[3]);
+                }
+        #else
+                FORCEINLINE uint32 READ_BE_UINT32(const void *ptr) {
+                        return *(const uint32 *)(ptr);
+                }
+        #endif
 
-        FORCEINLINE uint READ_LE_UINT16(const void *ptr) {
-                const byte *b = (const byte *)ptr;
-                return (b[1] << 8) + b[0];
-        }
+        #define READ_BE_UINT32_UNALIGNED READ_BE_UINT32
+        #define READ_BE_UINT16_UNALIGNED READ_BE_UINT16
 
-        FORCEINLINE uint READ_BE_UINT16(const void *ptr) {
-                return *(const uint16 *)(ptr);
-        }
+        #define READ_UINT32_UNALIGNED READ_BE_UINT32_UNALIGNED
 
-        FORCEINLINE uint READ_BE_UINT16_UNALIGNED(const void *ptr) {
-                return (((const byte *)ptr)[0] << 8)|((const byte *)ptr)[1];
+        FORCEINLINE uint32 FROM_LE_32(uint32 a) {
+                return ((a >> 24) & 0xFF) + ((a >> 8) & 0xFF00) + (( a<< 8) & 0xFF0000) \
+                                                + ((a<<24)&0xFF000000);
         }
 
-        FORCEINLINE uint32 READ_BE_UINT32_UNALIGNED(const void *ptr) {
-                const byte *b = (const byte*)ptr;
-                return (b[0] << 24) + (b[1] << 16) + (b[2] << 8) + (b[3]);
+        FORCEINLINE uint16 FROM_LE_16(uint16 a) {
+                return ((a >> 8) & 0xFF) + ((a << 8) & 0xFF00);
         }
 
-        #define READ_UINT32_UNALIGNED READ_BE_UINT32_UNALIGNED
+        #define TO_LE_32 FROM_LE_32
+        #define TO_LE_16 FROM_LE_16
 
         #define TO_BE_32(a) (a)
         #define TO_BE_16(a) (a)