CMakeLists.txt

@@ -1,7 +1,7 @@
 # Build system for the gint unikernel
 
 cmake_minimum_required(VERSION 3.15)
-project(Gint VERSION 2.5.2 LANGUAGES C ASM)
+project(Gint VERSION 2.5.1 LANGUAGES C ASM)
 
 include(GitVersionNumber)
 include(Fxconv)

include/gint/std/endian.h

@@ -1,2 +1,28 @@
-/* Now provided by fxlibc. */
-#include <endian.h>
+//---
+// gint:std:endian - Endianness conversion
+//---
+
+#ifndef GINT_STD_ENDIAN
+#define GINT_STD_ENDIAN
+
+#include <gint/defs/types.h>
+#include <gint/defs/attributes.h>
+
+/* CASIO calculators are configured as big-endian. */
+
+#define htobe16(x) (x)
+#define htole16(x) (__builtin_bswap16(x))
+#define be16toh(x) (x)
+#define le16toh(x) (__builtin_bswap16(x))
+
+#define htobe32(x) (x)
+#define htole32(x) (__builtin_bswap32(x))
+#define be32toh(x) (x)
+#define le32toh(x) (__builtin_bswap32(x))
+
+#define htobe64(x) (x)
+#define htole64(x) (__builtin_bswap64(x))
+#define be64toh(x) (x)
+#define le64toh(x) (__builtin_bswap64(x))
+
+#endif /* GINT_STD_ENDIAN */

src/gray/engine.c

@@ -3,13 +3,13 @@
 //---
 
 #include <gint/defs/types.h>
+#include <gint/std/stdlib.h>
+
 #include <gint/drivers/t6k11.h>
 #include <gint/gray.h>
 #include <gint/display.h>
 #include <gint/timer.h>
 
-#include <stdlib.h>
-
 #include "../render-fx/render-fx.h"
 
 /* Three additional video RAMS, allocated statically if --static-gray was set

src/intc/intc.c

@@ -5,8 +5,7 @@
 #include <gint/hardware.h>
 #include <gint/cpu.h>
 #include <gint/mpu/intc.h>
-
-#include <string.h>
+#include <gint/std/string.h>
 
 //---
 // Interrupt controllers

src/kernel/hardware.c

@@ -8,8 +8,7 @@
 #include <gint/defs/types.h>
 #include <gint/defs/util.h>
 #include <gint/mpu/pfc.h>
-
-#include <string.h>
+#include <gint/std/string.h>
 
 /* Holds information about the current platform */
 GBSS uint32_t gint[HW_KEYS];

src/kernel/kernel.c

@@ -4,15 +4,14 @@
 
 #include <gint/gint.h>
 #include <gint/drivers.h>
+#include <gint/std/string.h>
+#include <gint/std/stdlib.h>
 #include <gint/hardware.h>
 #include <gint/mmu.h>
 #include <gint/mpu/intc.h>
 #include <gint/kmalloc.h>
 #include <gint/cpu.h>
 
-#include <string.h>
-#include <stdlib.h>
-
 #include "vbr.h"
 #include "kernel.h"
 

src/kernel/osmenu.c

@@ -1,7 +1,6 @@
 #include <gint/gint.h>
 #include <gint/display.h>
-
-#include <string.h>
+#include <gint/std/string.h>
 
 int   __Timer_Install(int id, void (*handler)(void), int delay);
 int   __Timer_Start(int id);

src/kernel/world.c

@@ -2,8 +2,7 @@
 #include <gint/cpu.h>
 #include <gint/gint.h>
 #include <gint/defs/call.h>
-
-#include <stdlib.h>
+#include <gint/std/stdlib.h>
 
 //---
 // World buffer

src/keysc/keydev.c

@@ -6,8 +6,7 @@
 #include <gint/drivers/keydev.h>
 #include <gint/defs/types.h>
 #include <gint/defs/util.h>
-
-#include <string.h>
+#include <gint/std/string.h>
 #include <stdarg.h>
 
 void keydev_init(keydev_t *d)

src/kmalloc/arena_gint.c

@@ -3,11 +3,10 @@
 //---
 
 #include <gint/kmalloc.h>
+#include <gint/std/string.h>
 #include <gint/defs/attributes.h>
 #include <gint/defs/util.h>
 
-#include <string.h>
-
 /* block_t: A memory block managed by the heap.
 
    The heap is a sequence of blocks made of a block_t header (4 bytes) and raw

src/kmalloc/kmalloc.c

@@ -4,10 +4,9 @@
 
 #include <gint/kmalloc.h>
 #include <gint/defs/util.h>
+#include <gint/std/string.h>
 #include <gint/config.h>
 
-#include <string.h>
-
 /* Maximum number of arenas */
 #define KMALLOC_ARENA_MAX 8
 

src/render-cg/topti.c

@@ -1,8 +1,7 @@
 #include <gint/defs/types.h>
 #include <gint/defs/attributes.h>
 #include <gint/display.h>
-
-#include <string.h>
+#include <gint/std/string.h>
 
 #include "../render/render.h"
 #include "topti-asm.h"

src/render/dprint.c

@@ -1,5 +1,5 @@
 #include <gint/display.h>
-#include <stdio.h>
+#include <gint/std/stdio.h>
 
 /* dprint(): Display a formatted string */
 void dprint_opt(int x, int y, int fg, int bg, int halign, int valign,

src/usb/classes/ff-bulk.c

@@ -1,8 +1,7 @@
 #include <gint/usb.h>
 #include <gint/usb-ff-bulk.h>
 #include <gint/display.h>
-
-#include <string.h>
+#include <gint/std/string.h>
 
 static usb_dc_interface_t dc_interface = {
 	.bLength              = sizeof(usb_dc_interface_t),

src/usb/pipes.c

@@ -3,9 +3,7 @@
 #include <gint/clock.h>
 #include <gint/dma.h>
 #include <gint/defs/util.h>
-
-#include <string.h>
-
+#include <gint/std/string.h>
 #include "usb_private.h"
 
 #define USB SH7305_USB

src/usb/setup.c

@@ -1,10 +1,8 @@
 #include <gint/usb.h>
 #include <gint/mpu/usb.h>
-
-#include <stdarg.h>
-#include <endian.h>
-
+#include <gint/std/endian.h>
 #include "usb_private.h"
+#include <stdarg.h>
 
 #define USB SH7305_USB
 

src/usb/string.c

@@ -3,9 +3,8 @@
 //---
 
 #include <gint/usb.h>
-
-#include <stdlib.h>
-#include <string.h>
+#include <gint/std/stdlib.h>
+#include <gint/std/string.h>
 
 /* String descriptor array */
 static usb_dc_string_t **array = NULL;