include: create endianness.h

To ease handling of endianness for LM32 and RISCV Signed-off-by: Adam Wujek <dev_public@wujek.eu>

include: create endianness.h
To ease handling of endianness for LM32 and RISCV Signed-off-by: Adam Wujek <dev_public@wujek.eu>
9da42c2d · Adam Wujek · d3b0dd6d · 9da42c2d · 9da42c2d · 9da42c2d
Commit 9da42c2d authored Oct 10, 2021 by Adam Wujek
Showing with 43 additions and 35 deletions

endianness.h include/endianness.h +40 -0

ppsi-wrappers.h include/ppsi-wrappers.h +1 -18

wrc.h include/wrc.h +0 -8

rt_ipc.c ipc/rt_ipc.c +1 -0

util.c lib/util.c +0 -9

Makefile tools/Makefile +1 -0

No files found.
--- a/include/endianness.h
+++ b/include/endianness.h
+/*
+ * This work is part of the White Rabbit project
+ *
+ * Released according to the GNU GPL, version 2 or any later version.
+ */
+#ifndef __ENDIANNESS_H__
+#define __ENDIANNESS_H__
+
+#ifdef CONFIG_HOST_PROCESS
+#include <arpa/inet.h>
+
+#elif defined CONFIG_ARCH_RISCV
+static inline uint32_t htonl(uint32_t hostlong)
+{
+    return __builtin_bswap32(hostlong);
+}
+
+static inline uint16_t htons(uint16_t hostshort){
+    return __builtin_bswap16(hostshort);
+}
+
+static inline uint32_t ntohl(uint32_t netlong){
+    return __builtin_bswap32(netlong);
+}
+
+static inline uint16_t ntohs(uint16_t netshort){
+    return __builtin_bswap16(netshort);
+}
+#elif defined CONFIG_ARCH_LM32
+#define ntohs(x) (x)
+#define ntohl(x) (x)
+#define htons(x) (x)
+#define htonl(x) (x)
+
+#else
+#error (Wrong Arch!)
+
+#endif
+
+#endif /* ENDIANNESS_H__ */
--- a/include/ppsi-wrappers.h
+++ b/include/ppsi-wrappers.h
@@ -7,21 +7,4 @@
 #include <sys/types.h>
 #include <stdlib.h>
 #include <stdint.h>
-
-#ifdef CONFIG_HOST_PROCESS
-#  include <arpa/inet.h>
-#elif defined(CONFIG_ARCH_RISCV)
-/* FIXME: fix endianness for riscV */
-#define ntohs(x) (x)
-#define ntohl(x) (x)
-#define htons(x) (x)
-#define htons(x) (x)
-#else
-
-#  ifndef __IEEE_BIG_ENDIAN
-#    error "Not big endian, or unknown endianness"
-#  endif
-
-  static inline uint16_t ntohs(uint16_t x) {return x;}
-
-#endif
+#include <endianness.h>
--- a/include/wrc.h
+++ b/include/wrc.h
@@ -33,14 +33,6 @@
 /* Don't use abs from the library */
 #define abs(x) ((x >= 0) ? x : -x)

-#ifndef htons
-#  define htons(x)      (x)
-#endif
-
-#ifndef htonl
-#  define htonl(x)      (x)
-#endif
-
 #undef offsetof
 #define offsetof(TYPE, MEMBER) ((long) &((TYPE *)0)->MEMBER)
 #undef ARRAY_SIZE

--- a/ipc/rt_ipc.c
+++ b/ipc/rt_ipc.c
@@ -13,6 +13,7 @@
 #include <wrc.h>

 #include "minipc.h"
+#include <endianness.h>

 #define RTIPC_EXPORT_STRUCTURES
 #include "rt_ipc.h"

--- a/lib/util.c
+++ b/lib/util.c
@@ -272,15 +272,6 @@ int atoi(const char *s)
 	return res;
 }

-#ifdef CONFIG_ARCH_RISCV
-#warning (FIXME: fix endiansess conversion functions)
-#define ntohs(x) (x)
-#define ntohl(x) (x)
-#define htons(x) (x)
-#define htons(x) (x)
-
-#endif
-
 /* To save code, in the div of two int64 numbers
 * use signed 64bit division, then correct the sign of the result */
 long long __divdi3 (long long A, long long B)

--- a/tools/Makefile
+++ b/tools/Makefile
@@ -4,6 +4,7 @@ SDBFS ?= no

 CFLAGS = -Wall -ggdb -I../include -I../liblinux -I../liblinux/extest
 CFLAGS += -D__GIT_VER__="\"$(GIT_VER)\"" -D__GIT_USR__="\"$(GIT_USR)\""
+CFLAGS += -DBUILD_HOST
 LDFLAGS = -lutil -L../liblinux -ldevmap -L../liblinux/extest -lextest
 LDFLAGS += -lreadline
 ALL    = genraminit genramvhd genrammif