Support for savestate versioning. Plenty of cleanups.

1 files changed, 12 insertions, 8 deletions

diff --git a/source/sar.h b/source/sar.h
index 9d0861e..635477a 100644
--- a/source/sar.h
+++ b/source/sar.h
@@ -8,16 +8,17 @@
 #include "port.h"
 
 #ifdef RIGHTSHIFT_IS_SAR
-#define SAR8(b, n) ((b)>>(n))
-#define SAR16(b, n) ((b)>>(n))
-#define SAR32(b, n) ((b)>>(n))
-#define SAR64(b, n) ((b)>>(n))
+#define SAR8(b, n)  ((b) >> (n))
+#define SAR16(b, n) ((b) >> (n))
+#define SAR32(b, n) ((b) >> (n))
+#define SAR64(b, n) ((b) >> (n))
 #else
 
 static inline int8_t SAR8(const int8_t b, const int32_t n)
 {
 #ifndef RIGHTSHIFT_INT8_IS_SAR
-   if (b < 0) return (b >> n) | (-1 << (8 - n));
+   if (b < 0)
+      return (b >> n) | (~0u << (8 - n));
 #endif
    return b >> n;
 }
@@ -25,7 +26,8 @@ static inline int8_t SAR8(const int8_t b, const int32_t n)
 static inline int16_t SAR16(const int16_t b, const int32_t n)
 {
 #ifndef RIGHTSHIFT_INT16_IS_SAR
-   if (b < 0) return (b >> n) | (-1 << (16 - n));
+   if (b < 0)
+      return (b >> n) | (~0u << (16 - n));
 #endif
    return b >> n;
 }
@@ -33,7 +35,8 @@ static inline int16_t SAR16(const int16_t b, const int32_t n)
 static inline int32_t SAR32(const int32_t b, const int32_t n)
 {
 #ifndef RIGHTSHIFT_INT32_IS_SAR
-   if (b < 0) return (b >> n) | (-1 << (32 - n));
+   if (b < 0)
+      return (b >> n) | (~0u << (32 - n));
 #endif
    return b >> n;
 }
@@ -41,7 +44,8 @@ static inline int32_t SAR32(const int32_t b, const int32_t n)
 static inline int64_t SAR64(const int64_t b, const int32_t n)
 {
 #ifndef RIGHTSHIFT_INT64_IS_SAR
-   if (b < 0) return (b >> n) | (-1 << (64 - n));
+   if (b < 0)
+      return (b >> n) | (~0u << (64 - n));
 #endif
    return b >> n;
 }