Small Makefile adjustments, preparing fusion with fxSDK

Makefile

@@ -13,7 +13,7 @@ include Makefile.cfg
 # Modules
 modules-gint	= bopti clock core display events gray init keyboard mmu rtc \
 		  screen tales timer
-modules-libc	= ctype setjmp stdio stdlib string time
+modules-libc	= ctype math setjmp stdio stdlib string time
 
 # Targets
 target-lib	= libgint.a
@@ -44,8 +44,8 @@ demo-cflags	= -m3 -mb -nostdlib -I include -ffreestanding -std=c11 -Os \
 		  -Wall -Wextra
 
 # Specific objects
-obj-lib-spec	= build/display_font_system.bmp.o
 obj-std-spec	=
+obj-lib-spec	= build/display_font_system.bmp.o
 
 # Configuration files
 config		= gcc.cfg
@@ -101,7 +101,7 @@ hdr-dep = $(wildcard include/*.h include/*/*.h)
 #   $3  dependencies
 define rule-c-source
 build/$1_$2.o: src/$1/$2 $3 $(config)
-	$(if $(VERBOSE),,@ printf '\e[34;1msrc \u00bb\e[0m cc $$<\n')
+	$(if $(VERBOSE),,@ printf '\e[34;1m    gcc\e[0m $$<\n')
 	$(if $(VERBOSE),,@) $(cc) -c $$< -o $$@ $(lib-cflags)
 endef
 
@@ -110,7 +110,7 @@ endef
 #   $2  filename
 define rule-asm-source
 build/$1_$2.o: src/$1/$2 $(config)
-	$(if $(VERBOSE),,@ printf '\e[34;1msrc \u00bb\e[0m as $$<\n')
+	$(if $(VERBOSE),,@ printf '\e[34;1m     as\e[0m $$<\n')
 	$(if $(VERBOSE),,@) $(as)  -c $$< -o $$@
 endef
 
@@ -135,7 +135,6 @@ version_symbol	= $(shell printf '0x%02x%01x%01x%04x' "'$(version_letter)'" \
 
 # Tell the linker to define the version symbol.
 demo-ldflags	+= -Wl,--defsym,_GINT_VERSION=$(version_symbol)
-debug-ldflags	+= -Wl,--defsym,_GINT_VERSION=$(version_symbol)
 
 
 
@@ -150,37 +149,37 @@ all-lib: $(config) $(target-std) $(target-lib)
 all: $(config) $(target-std) $(target-lib) $(target-g1a)
 
 build:
-	$(if $(VERBOSE),,@ printf '\e[35;1mdir \u00bb\e[0m mkdir $@\n')
+	$(if $(VERBOSE),,@ printf '\e[35;1m  mkdir\e[0m $@\n')
 	$(if $(VERBOSE),,@) mkdir -p $@
 
-version: $(obj-std) $(obj-lib)
+version: src include
 	@ echo '$(version_type)-$(version_major).$(version_minor)-$(version_build_n)' > $@
 
 
 $(obj-std) $(obj-lib) $(demo-obj): | build
 
 $(target-std): $(obj-std) version
-	$(if $(VERBOSE),,@ printf '\e[35;1mlib \u00bb\e[0m ar $@\n')
+	$(if $(VERBOSE),,@ printf '\e[35;1m     ar\e[0m ar $@\n')
 	$(if $(VERBOSE),,@) $(ar) rcs $@ $(obj-std)
-	@ printf '\e[32;1mmsg \u00bb\e[0m Succesfully built libc ('
+	@ printf '\n\e[32;1m\u00bb\e[0m Succesfully built libc ('
 	@ printf $$(stat -c %s $@)
 	@ printf ' bytes)\n\n'
 
 $(target-lib): $(config) $(target-std) $(obj-lib) version
-	$(if $(VERBOSE),,@ printf '\e[35;1mlib \u00bb\e[0m ar $@\n')
+	$(if $(VERBOSE),,@ printf '\e[35;1m     ar\e[0m $@\n')
 	$(if $(VERBOSE),,@) $(ar) rcs $@ $(obj-lib)
-	@ printf '\e[32;1mmsg \u00bb\e[0m Succesfully built libgint ('
+	@ printf '\n\e[32;1m\u00bb\e[0m Succesfully built libgint ('
 	@ printf $$(stat -c %s $@)
 	@ printf ' bytes)\n\n'
 
 $(target-g1a): $(config) $(target-std) $(target-lib) $(demo-obj)
-	$(if $(VERBOSE),,@ printf '\e[35;1mexe \u00bb\e[0m ld -o $(demo-elf)\n')
+	$(if $(VERBOSE),,@ printf '\e[35;1m     ld\e[0m $(demo-elf)\n')
 	$(if $(VERBOSE),,@) $(cc) -o $(demo-elf) $(demo-obj) $(demo-ldflags)
-	$(if $(VERBOSE),,@ printf '\e[35;1mexe \u00bb\e[0m objcopy -o $(demo-bin)\n')
+	$(if $(VERBOSE),,@ printf '\e[35;1mobjcopy\e[0m $(demo-bin)\n')
 	$(if $(VERBOSE),,@) $(ob) -R .comment -R .bss -O binary $(demo-elf) $(demo-bin)
-	$(if $(VERBOSE),,@ printf '\e[35;1mexe \u00bb\e[0m g1a-wrapper -o $@\n')
+	$(if $(VERBOSE),,@ printf '\e[35;1m  fxg1a\e[0m $@\n')
 	$(if $(VERBOSE),,@) $(wr) $(demo-bin) -o $@ -i $(demo-icon)
-	@ printf '\e[32;1mmsg \u00bb\e[0m Succesfully built demo application ('
+	@ printf '\n\e[32;1m\u00bb\e[0m Succesfully built demo application ('
 	@ printf $$(stat -c %s $@)
 	@ printf ' bytes)\n\n'
 
@@ -200,26 +199,26 @@ $(foreach mod,$(modules), \
 # why for now.
 
 build/display_font_%.bmp.o: src/display/font_%.bmp
-	$(if $(VERBOSE),,@ printf '\e[36;1mres \u00bb\e[0m fxconv $<\n')
+	$(if $(VERBOSE),,@ printf '\e[30;1m fxconv\e[0m -font $<\n')
-	$(if $(VERBOSE),,@) fxconv $< -o $@ --font -n $(<:src/display/font_%.bmp=gint_font_%)
+	$(if $(VERBOSE),,@) fxconv -font $< -o $@ -font -n $(<:src/display/font_%.bmp=gint_font_%)
 
 # Demo application
 
 build/demo_%.c.o: demo/%.c $(hdr-dep) $(demo-dep) $(config)
-	$(if $(VERBOSE),,@ printf '\e[34;1msrc \u00bb\e[0m cc $<\n')
+	$(if $(VERBOSE),,@ printf '\e[34;1m    gcc\e[0m $<\n')
 	$(if $(VERBOSE),,@) $(cc) -c $< -o $@ $(demo-cflags)
 
 build/demo_%.s.o: demo/%.s $(config)
-	$(if $(VERBOSE),,@ printf '\e[34;1msrc \u00bb\e[0m as $<\n')
+	$(if $(VERBOSE),,@ printf '\e[34;1m     as\e[0m $<\n')
 	$(if $(VERBOSE),,@) $(as) -c $< -o $@
 
 build/demo_font_%.bmp.o: demo/resources/font_%.bmp
-	$(if $(VERBOSE),,@ printf '\e[36;1mres \u00bb\e[0m fxconv $<\n')
+	$(if $(VERBOSE),,@ printf '\e[30;1m fxconv\e[0m -font $<\n')
-	$(if $(VERBOSE),,@) fxconv $< -o $@ --font -n $(patsubst demo/resources/%.bmp,res_%,$<)
+	$(if $(VERBOSE),,@) fxconv -font $< -o $@ -n $(patsubst demo/resources/%.bmp,res_%,$<)
 
 build/demo_%.bmp.o: demo/resources/%.bmp
-	$(if $(VERBOSE),,@ printf '\e[36;1mres \u00bb\e[0m fxconv $<\n')
+	$(if $(VERBOSE),,@ printf '\e[30;1m fxconv\e[0m -image $<\n')
-	$(if $(VERBOSE),,@) fxconv $< -o $@ -n $(patsubst demo/resources/%.bmp,res_%,$<)
+	$(if $(VERBOSE),,@) fxconv -image $< -o $@ -n $(patsubst demo/resources/%.bmp,res_%,$<)
 
 
 
@@ -237,15 +236,24 @@ mrproper: clean
 distclean: mrproper
 
 install: $(target-std) $(target-lib)
-	mkdir -p $(folder)
+	$(if $(VERBOSE),,@ printf '\e[35;1m  mkdir\e[0m $(folder)\n')
-	install -m 644 $^ $(folder)
+	$(if $(VERBOSE),,@) mkdir -p $(folder)
-	install -m 644 -T demo/gintdemo.ld $(folder)/linker.ld
+
-	mkdir -p $(folder)/gint
+	$(if $(VERBOSE),,@ printf '\e[33;1minstall\e[0m 644 $^\n')
-	install -m 644 include/*.h $(folder)/gint
+	$(if $(VERBOSE),,@) install -m 644 $^ $(folder)
+	$(if $(VERBOSE),,@ printf '\e[33;1minstall\e[0m 644 demo/gintdemo.ld\n')
+	$(if $(VERBOSE),,@) install -m 644 -T demo/gintdemo.ld $(folder)/linker.ld
+
+	$(if $(VERBOSE),,@ printf '\e[35;1m  mkdir\e[0m $(folder)/gint/modules\n')
+	$(if $(VERBOSE),,@) mkdir -p $(folder)/gint/modules
+
+	$(if $(VERBOSE),,@ printf '\e[33;1minstall\e[0m 644 include/**.h\n')
+	$(if $(VERBOSE),,@) install -m 644 include/*.h $(folder)/gint
+	$(if $(VERBOSE),,@) install -m 644 include/modules/*.h $(folder)/gint/modules
 ifdef config_ext
-	install -m 644 include/extended/*.h $(folder)/gint
+	$(if $(VERBOSE),,@) install -m 644 include/extended/*.h $(folder)/gint
 endif
-	@ printf '\e[32;1mmsg \u00bb\e[0m All installed!\n'
+	@ printf "\n\033[32;1m\u00bb\033[0m Successfully installed gint\n\n"
 
 install-demo: all
 	p7 send -f $(target-g1a)

TODO

@@ -5,7 +5,6 @@ Bugs to fix:
 -  Ensure heap data is freed when a task-switch results in leaving the app
 
 Things to do before 1.0:
--  init:	Move qdiv10() somewhere else
 -  bopti:	Test partial transparency
 -  demo:	Try 284x124 at (-60, -28) (all disadvantages)
 -  project:	Check size of *all* library structures

include/internals/init.h

@@ -8,14 +8,6 @@
 
 #include <display.h>
 
-struct qdiv
-{
-	uint32_t q, r;
-};
-
-/* qdiv10() -- quickly divide by 10 */
-struct qdiv qdiv10(uint32_t n);
-
 /* init_version() -- get a version string */
 const char *init_version(void);
 

include/math.h

@@ -0,0 +1,41 @@
+//---
+//
+//	gint libc module: math
+//
+//	Provides mathematical functions as well as a few useful extensions.
+//
+//---
+
+#ifndef	_MATH_H
+#define	_MATH_H
+
+#include <stdint.h>
+
+//---
+//	Function extensions
+//---
+
+/*
+	qdiv()
+	Quickly divides by predefined integers using a 64-bit multiplication
+	technique. These functions should be ~10 times faster than dividing
+	using opeator "/".
+*/
+
+typedef struct qdiv_t
+{
+	uint32_t q;	/* Quotient */
+	uint32_t r;	/* Remainer */
+
+} __attribute__((packed, aligned(4))) qdiv_t;
+
+qdiv_t qdiv(uint32_t n, uint32_t divider, uint32_t reciprocal);
+
+/* Predefined magic numbers */
+#define	qdiv_3(n)	qdiv(n,    3, 0x55555556)
+#define	qdiv_5(n)	qdiv(n,    5, 0x33333334)
+#define	qdiv_10(n)	qdiv(n,   10, 0x1999999a)
+#define	qdiv_100(n)	qdiv(n,  100, 0x028f5c29)
+#define	qdiv_1000(n)	qdiv(n, 1000, 0x00418938)
+
+#endif	// _MATH_H

src/init/util.c

@@ -2,24 +2,7 @@
 #include <string.h>
 #include <clock.h>
 #include <gint.h>
-
+#include <math.h>
-/* qdiv10() -- quickly divide by 10 */
-struct qdiv qdiv10(uint32_t n)
-{
-	uint32_t magic10 = 0x1999999a;
-	struct qdiv result;
-
-	__asm__(
-		"dmuls.l %1, %2		\n\t"
-		"sts     mach, %0	"
-		: "=r"(result.q)
-		: "r"(n), "r"(magic10)
-		: "macl", "mach"
-	);
-
-	result.r = n - 10 * result.q;
-	return result;
-}
 
 /* init_version() -- get a version string */
 const char *init_version(void)
@@ -32,8 +15,8 @@ const char *init_version(void)
 	memcpy(data, "gint #0.0-000", 14);
 
 	/* Quickly get the three digits of the build number */
-	struct qdiv x = qdiv10(s & 0xffff);
+	qdiv_t x = qdiv_10(s & 0xffff);
-	struct qdiv y = qdiv10(x.q);
+	qdiv_t y = qdiv_10(x.q);
 
 	data[5]   = (s & 0xff000000) >> 24;
 	data[6]  += ((s & 0x00f00000) >> 20);
@@ -66,7 +49,7 @@ void print_dec(int x, int y, int n, int digits)
 
 	while(--digits >= 0)
 	{
-		struct qdiv d = qdiv10(n);
+		qdiv_t d = qdiv_10(n);
 		str[digits] = '0' + d.r;
 		n = d.q;
 	}

src/math/math_qdiv.c

@@ -0,0 +1,23 @@
+#include <math.h>
+
+/*
+	Quickly divides by predefined integers using a 64-bit multiplication
+	technique. These functions should be ~10 times faster than dividing
+	using opeator "/".
+*/
+__attribute__((always_inline))
+inline qdiv_t qdiv(uint32_t n, uint32_t divider, uint32_t magic)
+{
+	qdiv_t result;
+
+	__asm__(
+		"dmuls.l %1, %2		\n\t"
+		"sts     mach, %0	"
+		: "=r"(result.q)
+		: "r"(n), "r"(magic)
+		: "macl", "mach"
+	);
+
+	result.r = n - divider * result.q;
+	return result;
+}

src/tales/tales_internals.c

@@ -202,7 +202,7 @@ int update(uint32_t *operators, int height, int available, uint32_t *glyph)
 */
 void render(int x, int y, const char *str, void (*op)(OPERATE_ARGS))
 {
-	if(!font) return;
+	if(!font || font->magic != 0x01) return;
 
 	// Operator data, and number of available bits in the operators (which
 	// is the same for all operators, since they are treated equally).

version

@@ -1 +1 @@
-beta-0.9-566
+beta-0.9-581