topic: return to the 5x7 font as default

The 5x6 font is less readable than I hoped, so too bad.

configure

@@ -141,6 +141,10 @@ for arg; do case "$arg" in
     echo "warning: support for '-timer-slots' has been removed";;
   -events-queue-size=*)
     echo "warning: support for '-events-queue-size' has been removed";;
+
+  *)
+    echo "error: unrecognized argument '$arg'";
+    fail=true;;
 esac; done
 
 #
@@ -152,6 +156,11 @@ if [[ -z "$target" ]]; then
   fail=true;
 fi
 
+if $fail; then
+  echo "note: output file $output has not been changed."
+  exit 1
+fi
+
 # If no prefix is specified, install to the GCC's build folder
 if [[ -z "$prefix" ]]; then
   echo "No prefix specified, let's ask the compiler:"
@@ -195,11 +204,6 @@ output_config()
   echo ""
 }
 
-if $fail; then
-  echo "note: output file $output has not been changed."
-  exit 1
-fi
-
 output_config > $output
 
 src="Makefile"

make/Makefile

@@ -53,7 +53,7 @@ src      := $(shell find ../src \
 src_obj  := $(foreach s,$(src),$(call src2obj,$s))
 
 # Files with special handling
-spe     := ../src/font5x6.png
+spe     := ../src/font5x7.png
 spe_obj := version.o $(foreach s,$(spe),$(call src2obj,$s))
 
 # All object files
@@ -103,10 +103,10 @@ src/%.c.o: ../src/%.c src/%.c.d
 	$(call cmd_b,gcc,$*.c) $(gcc) -c $< -o $@ $(dflags) $(cflags)
 
 # Special files
-$(call src2obj,../src/font5x6.png): ../src/font5x6.png
+$(call src2obj,../src/font5x7.png): ../src/font5x7.png
 	@ mkdir -p $(dir $@)
-	$(call cmd_m,fxconv,font5x6.png)$(conv) -f $< -o $@ name:gint_font5x6 \
+	$(call cmd_m,fxconv,font5x7.png)$(conv) -f $< -o $@ name:gint_font5x7 \
-		charset:ascii grid.size:5x6 grid.padding:1 grid.border:0
+		charset:ascii grid.size:5x7 grid.padding:1 grid.border:0
 
 # Version symbol. ld generates a .stack section for unknown reasons; I remove
 # it in the linker script.

src/core/bootlog.c

@@ -43,7 +43,7 @@ static void print(int x, int y, const char *format, ...)
 	vsprintf(str + 2, format, args);
 
 	#ifdef FX9860G
-	dtext(6 * (x-1) + 1, 7 * (y-1), str + 2, color_black, color_white);
+	dtext(6 * (x-1) + 1, 8 * (y-1), str + 2, color_black, color_white);
 	#endif
 
 	#ifdef FXCG50
@@ -154,7 +154,7 @@ void bootlog_driver(const char *drv, const char *status)
 
 	static int mx = 1, my = 6;
 	if(mx + len > 22) mx = 1, my++;
-	if(my > 9) return;
+	if(my > 8) return;
 
 	print(mx, my, "%s", status);
 	mx += len + 1;

src/core/exch.S

@@ -11,22 +11,16 @@
 .section .gint.blocks, "ax"
 .align 4
 
-/* SH7305-TYPE DEBUG EXCEPTION HANDLER - 26 BYTES */
+/* SH7305-TYPE DEBUG EXCEPTION HANDLER */
 
 _exch_entry_7705:
 _exch_entry_7305:
 	mov.l	1f, r0
 	mov.l	@r0, r4
 
-	sts.l	pr, @-r15
-	mov.l	2f, r0
-	jsr	@r0
-	nop
-	lds.l	@r15+, pr
 	rte
 	nop
 
-	.zero 6
+	.zero 20
 
-2:	.long	_debug_exc
 1:	.long	0xff000024

src/render-fx/topti.c

@@ -5,14 +5,14 @@
 #include "topti-asm.h"
 
 /* Default font */
-extern font_t gint_font5x6;
+extern font_t gint_font5x7;
-font_t const * topti_font = &gint_font5x6;
+font_t const * topti_font = &gint_font5x7;
 
 /* dfont() - set the default font for text rendering */
 GSECTION(".pretext")
 void dfont(font_t const * font)
 {
-	topti_font = font ? font : &gint_font5x6;
+	topti_font = font ? font : &gint_font5x7;
 }
 
 /* enum charset: Available character set decoders