shithub: sl

Info  •  Files  •  Log  •  Branches

allow unaligned reads/writes where applicable

--- a/3rd/spooky.c

+++ b/3rd/spooky.c

@@ -26,7 +26,11 @@

 #include "platform.h"

 #include "spooky.h"

+#if defined(MEM_UNALIGNED_ACCESS)

+#define ALLOW_UNALIGNED_READS 1

+#else

 #define ALLOW_UNALIGNED_READS 0

+#endif

 //

 // SC_CONST: a constant which:

@@ -44,23 +48,8 @@

 # define inline __forceinline

 #endif

-static bool

-spooky_is_aligned(const void *p, size_t size)

-{

-	return (uintptr_t) p % size == 0;

-}

+#define spooky_is_aligned(p, size) ((uintptr_t)(p) % (size) == 0)

-static bool

-spooky_is_little_endian(void)

-{

-	const union {

-		uint32_t i;

-		uint8_t c[sizeof(uint32_t)];

-	} x = { 1 };

-

-	return x.c[0];

-}

-

 //

 // Read uint64_t in little-endian order.

 //

@@ -68,22 +57,19 @@

 static inline uint64_t

 spooky_read_le64(const uint64_t *s)

 {

-	if (spooky_is_little_endian()) {

-		uint64_t v;

-		memcpy(&v, s, sizeof(v));

-		return v;

-	}

-	else {

-		const uint8_t *p = (const uint8_t *) s;

-		return (uint64_t) p[0]

-		    | ((uint64_t) p[1] << 8)

-		    | ((uint64_t) p[2] << 16)

-		    | ((uint64_t) p[3] << 24)

-		    | ((uint64_t) p[4] << 32)

-		    | ((uint64_t) p[5] << 40)

-		    | ((uint64_t) p[6] << 48)

-		    | ((uint64_t) p[7] << 56);

-	}

+#if BYTE_ORDER == LITTLE_ENDIAN && defined(MEM_UNALIGNED_ACCESS)

+	return *s;

+#else

+	const uint8_t *p = (const uint8_t *) s;

+	return (uint64_t) p[0]

+	    | ((uint64_t) p[1] << 8)

+	    | ((uint64_t) p[2] << 16)

+	    | ((uint64_t) p[3] << 24)

+	    | ((uint64_t) p[4] << 32)

+	    | ((uint64_t) p[5] << 40)

+	    | ((uint64_t) p[6] << 48)

+	    | ((uint64_t) p[7] << 56);

+#endif

 }

 //

--- a/dos/platform.h

+++ b/dos/platform.h

@@ -46,6 +46,8 @@

 #define ALLOC_LIMIT_TRIGGER INITIAL_HEAP_SIZE

 #endif

+#define MEM_UNALIGNED_ACCESS

+

 #include "cc.h"

 #include "mem.h"

 #include "mp.h"

--- a/flisp.c

+++ b/flisp.c

@@ -840,23 +840,24 @@

 	return nargs;

 }

-#define GET_INT32(a) \

-	((int32_t) \

-	((((uint32_t)a[0])<<0)  | \

-	 (((uint32_t)a[1])<<8)  | \

-	 (((uint32_t)a[2])<<16) | \

-	 (((uint32_t)a[3])<<24)))

-#define GET_INT16(a) \

-	((int16_t) \

-	((((int16_t)a[0])<<0)  | \

-	 (((int16_t)a[1])<<8)))

+#if BYTE_ORDER == LITTLE_ENDIAN && defined(MEM_UNALIGNED_ACCESS)

+#define GET_INT32(a) *(int32_t*)(a)

+#define GET_INT16(a) *(int16_t*)(a)

 #define PUT_INT32(a, i) \

 	do{ \

-		((uint8_t*)(a))[0] = ((uint32_t)(i)>>0)&0xff; \

-		((uint8_t*)(a))[1] = ((uint32_t)(i)>>8)&0xff; \

-		((uint8_t*)(a))[2] = ((uint32_t)(i)>>16)&0xff; \

-		((uint8_t*)(a))[3] = ((uint32_t)(i)>>24)&0xff; \

+		*(uint32_t*)(a) = (uint32_t)(i); \

 	}while(0)

+#else

+#define GET_INT32(a) (int32_t)((a)[0]<<0 | (a)[1]<<8 | (a)[2]<<16 | (a)[3]<<24)

+#define GET_INT16(a) (int16_t)((a)[0]<<0 | (a)[1]<<8)

+#define PUT_INT32(a, i) \

+	do{ \

+		((uint8_t*)(a))[0] = (uint32_t)(i)>>0; \

+		((uint8_t*)(a))[1] = (uint32_t)(i)>>8; \

+		((uint8_t*)(a))[2] = (uint32_t)(i)>>16; \

+		((uint8_t*)(a))[3] = (uint32_t)(i)>>24; \

+	}while(0)

+#endif

 /*

   stack on entry: <func>  <nargs args...>

--- a/plan9/platform.h

+++ b/plan9/platform.h

@@ -47,6 +47,10 @@

 #define PRIuPTR "lud"

 #endif

+#if defined(__386__) || defined(__amd64__) || defined(__arm64__)

+#define MEM_UNALIGNED_ACCESS

+#endif

+

 #define unsetenv(name) putenv(name, "")

 #define setenv(name, val, overwrite) putenv(name, val)

 #define exit(x) exits((x) ? "error" : nil)

--- a/posix/platform.h

+++ b/posix/platform.h

@@ -82,6 +82,10 @@

 #endif

 #endif

+#if defined(__386__) || defined(__x86_64__) || defined(__aarch64__)

+#define MEM_UNALIGNED_ACCESS

+#endif

+

 #if !defined(INITIAL_HEAP_SIZE)

 #define INITIAL_HEAP_SIZE 16*1024*1024

 #endif