Import spleen bitmap fonts to contrib/

[emaste]

Summary

Spleen is a set of monospaced bitmap fonts in five sizes from 5x8 to 32x64 and is 2-clause BSD licensed.

Prepare to make spleen fonts available for vt(4) in the base system, in particular to support hi-resolution (e.g. 4K) monitors.

https://www.cambus.net/spleen-monospaced-bitmap-fonts/

[imp]

This detached license is basically required since bdf files don't have a good way to add it.

[imp]

well, it could be in the files, but it's unambiguous enough. I assume this is how it is upstream?

[imp]

ah, enough searching and I see that it is.

[tobik]

This needs to be updated to 1.5.0 which adds Latin Extended-A chars and box drawing characters(!), so dialog(1) looks right now and the window separator is actually drawn in tmux(1).

https://github.com/fcambus/spleen/blob/1.5.0/ChangeLog
https://github.com/fcambus/spleen/releases/download/1.5.0/spleen-1.5.0.tar.gz

[zarychtam_plan-b.pwste.edu.pl]

Spleen 1.6.0 has been released a few days ago --> https://github.com/fcambus/spleen/blob/1.6.0/ChangeLog. It would be a nice Christmas gift for 4K monitor users to add this font to the base.

[emaste]

update to 1.6.0

[fred_statdns.com]

In D20654, tobik raised the concern that new releases of Spleen still happened regularly at the time this differential was opened, which was indeed a valid concern in 2019.

At this point though, Spleen is mostly in maintenance mode, so this shouldn't be a problem anymore. For info, I released Spleen 1.9.2 yesterday, which is a maintenance release updating the build scripts and documentation. The last modifications on the BDF files themselves happened in March 2021.

Hoping to see this differential finally be committed :-)

[emaste]

Vendor import in f3d044c73b847c27ea751557b6c979b735a3771f (1.6.0) and 5eab6333fa27e2b6954c6927859d462a004e57bb (1.9.3 update), will merge to contrib/ shortly.

contrib/spleen/LICENSE

  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #include <sys/elf_common.h>
 
 #include <machine/asm.h>
 
+#include "assym.inc"
+
 .macro arm_smccc_1_0    insn
 ENTRY(arm_smccc_\insn)
         \insn   #0
         ldr     x4, [sp]
         cbz     x4, 1f
         stp        x0, x1, [x4, #16 * 0]
         stp        x2, x3, [x4, #16 * 1]
+#ifdef KMSAN
+        stp        x29, x30, [sp, #-32]!
+        str        x0, [sp, #16]
+        mov     x29, sp
+        mov     x0, x4
+        mov     x1, #(ARM_SMCCC_RES_SIZE)
+        mov     x2, #(KMSAN_STATE_INITED)
+        bl      kmsan_mark
+        ldr        x0, [sp, #16]
+        ldp        x29, x30, [sp], #32
+#endif
 1:      ret
 END(arm_smccc_\insn)
 .endm
 
 /*
  * int arm_smccc_*(register_t, register_t, register_t, register_t,
  *     register_t, register_t, register_t, register_t,
  *     struct arm_smccc_res *res)
  */
 arm_smccc_1_0   hvc
 arm_smccc_1_0   smc
 
 .macro arm_smccc_1_2    insn
 ENTRY(arm_smccc_1_2_\insn)
-        stp        x1, x19, [sp, #-16]!
+        stp        x29, x30, [sp, #-32]!
+        stp        x1, x19, [sp, #16]
+        mov     x29, sp
         mov     x19, x0
+#ifdef KMSAN
+        mov     x1, #(ARM_SMCCC_1_2_REGS_SIZE)
+        adr     x2, .Lfunc_name_\insn
+        bl      kmsan_check
+#endif
         ldp        x0, x1, [x19, #16 * 0]
         ldp        x2, x3, [x19, #16 * 1]
         ldp        x4, x5, [x19, #16 * 2]
         ldp        x6, x7, [x19, #16 * 3]
         ldp        x8, x9, [x19, #16 * 4]
         ldp        x10, x11, [x19, #16 * 5]
         ldp        x12, x13, [x19, #16 * 6]
         ldp        x14, x15, [x19, #16 * 7]
         ldp        x16, x17, [x19, #16 * 8]
         \insn   #0
-        ldr     x19, [sp]
+        ldr        x19, [sp, #16]
         cbz     x19, 1f
         stp        x0, x1, [x19, #16 * 0]
         stp        x2, x3, [x19, #16 * 1]
         stp        x4, x5, [x19, #16 * 2]
         stp        x6, x7, [x19, #16 * 3]
         stp        x8, x9, [x19, #16 * 4]
         stp        x10, x11, [x19, #16 * 5]
         stp        x12, x13, [x19, #16 * 6]
         stp        x14, x15, [x19, #16 * 7]
         stp        x16, x17, [x19, #16 * 8]
-1:        ldp        xzr, x19, [sp], #16
+#ifdef KMSAN
+        mov     x0, x19
+        mov     x1, #(ARM_SMCCC_1_2_REGS_SIZE)
+        mov     x2, #(KMSAN_STATE_INITED)
+        bl      kmsan_mark
+        /* Restore x0 as the return value */
+        ldr     x0, [x19]
+#endif
+1:
+        ldr             x19, [sp, #24]
+        ldp        x29, x30, [sp], #32
         ret
+#ifdef KMSAN
+.Lfunc_name_\insn:
+        .asciz  "arm_smccc_1_2_\insn"
+#endif
 END(arm_smccc_1_2_\insn)
 .endm
 /* int arm_smccc_1_2_*(const struct arm_smccc_1_2_regs *args,
  *     struct arm_smccc_1_2_regs *res)
  */
 arm_smccc_1_2   hvc
 arm_smccc_1_2   smc
 
 GNU_PROPERTY_AARCH64_FEATURE_1_NOTE(GNU_PROPERTY_AARCH64_FEATURE_1_VAL)

contrib/spleen/spleen-12x24.bdf

  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #include <sys/elf_common.h>
 
 #include <machine/asm.h>
 
+#include "assym.inc"
+
 .macro arm_smccc_1_0    insn
 ENTRY(arm_smccc_\insn)
         \insn   #0
         ldr     x4, [sp]
         cbz     x4, 1f
         stp        x0, x1, [x4, #16 * 0]
         stp        x2, x3, [x4, #16 * 1]
+#ifdef KMSAN
+        stp        x29, x30, [sp, #-32]!
+        str        x0, [sp, #16]
+        mov     x29, sp
+        mov     x0, x4
+        mov     x1, #(ARM_SMCCC_RES_SIZE)
+        mov     x2, #(KMSAN_STATE_INITED)
+        bl      kmsan_mark
+        ldr        x0, [sp, #16]
+        ldp        x29, x30, [sp], #32
+#endif
 1:      ret
 END(arm_smccc_\insn)
 .endm
 
 /*
  * int arm_smccc_*(register_t, register_t, register_t, register_t,
  *     register_t, register_t, register_t, register_t,
  *     struct arm_smccc_res *res)
  */
 arm_smccc_1_0   hvc
 arm_smccc_1_0   smc
 
 .macro arm_smccc_1_2    insn
 ENTRY(arm_smccc_1_2_\insn)
-        stp        x1, x19, [sp, #-16]!
+        stp        x29, x30, [sp, #-32]!
+        stp        x1, x19, [sp, #16]
+        mov     x29, sp
         mov     x19, x0
+#ifdef KMSAN
+        mov     x1, #(ARM_SMCCC_1_2_REGS_SIZE)
+        adr     x2, .Lfunc_name_\insn
+        bl      kmsan_check
+#endif
         ldp        x0, x1, [x19, #16 * 0]
         ldp        x2, x3, [x19, #16 * 1]
         ldp        x4, x5, [x19, #16 * 2]
         ldp        x6, x7, [x19, #16 * 3]
         ldp        x8, x9, [x19, #16 * 4]
         ldp        x10, x11, [x19, #16 * 5]
         ldp        x12, x13, [x19, #16 * 6]
         ldp        x14, x15, [x19, #16 * 7]
         ldp        x16, x17, [x19, #16 * 8]
         \insn   #0
-        ldr     x19, [sp]
+        ldr        x19, [sp, #16]
         cbz     x19, 1f
         stp        x0, x1, [x19, #16 * 0]
         stp        x2, x3, [x19, #16 * 1]
         stp        x4, x5, [x19, #16 * 2]
         stp        x6, x7, [x19, #16 * 3]
         stp        x8, x9, [x19, #16 * 4]
         stp        x10, x11, [x19, #16 * 5]
         stp        x12, x13, [x19, #16 * 6]
         stp        x14, x15, [x19, #16 * 7]
         stp        x16, x17, [x19, #16 * 8]
-1:        ldp        xzr, x19, [sp], #16
+#ifdef KMSAN
+        mov     x0, x19
+        mov     x1, #(ARM_SMCCC_1_2_REGS_SIZE)
+        mov     x2, #(KMSAN_STATE_INITED)
+        bl      kmsan_mark
+        /* Restore x0 as the return value */
+        ldr     x0, [x19]
+#endif
+1:
+        ldr             x19, [sp, #24]
+        ldp        x29, x30, [sp], #32
         ret
+#ifdef KMSAN
+.Lfunc_name_\insn:
+        .asciz  "arm_smccc_1_2_\insn"
+#endif
 END(arm_smccc_1_2_\insn)
 .endm
 /* int arm_smccc_1_2_*(const struct arm_smccc_1_2_regs *args,
  *     struct arm_smccc_1_2_regs *res)
  */
 arm_smccc_1_2   hvc
 arm_smccc_1_2   smc
 
 GNU_PROPERTY_AARCH64_FEATURE_1_NOTE(GNU_PROPERTY_AARCH64_FEATURE_1_VAL)

contrib/spleen/spleen-16x32.bdf

  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #include <sys/elf_common.h>
 
 #include <machine/asm.h>
 
+#include "assym.inc"
+
 .macro arm_smccc_1_0    insn
 ENTRY(arm_smccc_\insn)
         \insn   #0
         ldr     x4, [sp]
         cbz     x4, 1f
         stp        x0, x1, [x4, #16 * 0]
         stp        x2, x3, [x4, #16 * 1]
+#ifdef KMSAN
+        stp        x29, x30, [sp, #-32]!
+        str        x0, [sp, #16]
+        mov     x29, sp
+        mov     x0, x4
+        mov     x1, #(ARM_SMCCC_RES_SIZE)
+        mov     x2, #(KMSAN_STATE_INITED)
+        bl      kmsan_mark
+        ldr        x0, [sp, #16]
+        ldp        x29, x30, [sp], #32
+#endif
 1:      ret
 END(arm_smccc_\insn)
 .endm
 
 /*
  * int arm_smccc_*(register_t, register_t, register_t, register_t,
  *     register_t, register_t, register_t, register_t,
  *     struct arm_smccc_res *res)
  */
 arm_smccc_1_0   hvc
 arm_smccc_1_0   smc
 
 .macro arm_smccc_1_2    insn
 ENTRY(arm_smccc_1_2_\insn)
-        stp        x1, x19, [sp, #-16]!
+        stp        x29, x30, [sp, #-32]!
+        stp        x1, x19, [sp, #16]
+        mov     x29, sp
         mov     x19, x0
+#ifdef KMSAN
+        mov     x1, #(ARM_SMCCC_1_2_REGS_SIZE)
+        adr     x2, .Lfunc_name_\insn
+        bl      kmsan_check
+#endif
         ldp        x0, x1, [x19, #16 * 0]
         ldp        x2, x3, [x19, #16 * 1]
         ldp        x4, x5, [x19, #16 * 2]
         ldp        x6, x7, [x19, #16 * 3]
         ldp        x8, x9, [x19, #16 * 4]
         ldp        x10, x11, [x19, #16 * 5]
         ldp        x12, x13, [x19, #16 * 6]
         ldp        x14, x15, [x19, #16 * 7]
         ldp        x16, x17, [x19, #16 * 8]
         \insn   #0
-        ldr     x19, [sp]
+        ldr        x19, [sp, #16]
         cbz     x19, 1f
         stp        x0, x1, [x19, #16 * 0]
         stp        x2, x3, [x19, #16 * 1]
         stp        x4, x5, [x19, #16 * 2]
         stp        x6, x7, [x19, #16 * 3]
         stp        x8, x9, [x19, #16 * 4]
         stp        x10, x11, [x19, #16 * 5]
         stp        x12, x13, [x19, #16 * 6]
         stp        x14, x15, [x19, #16 * 7]
         stp        x16, x17, [x19, #16 * 8]
-1:        ldp        xzr, x19, [sp], #16
+#ifdef KMSAN
+        mov     x0, x19
+        mov     x1, #(ARM_SMCCC_1_2_REGS_SIZE)
+        mov     x2, #(KMSAN_STATE_INITED)
+        bl      kmsan_mark
+        /* Restore x0 as the return value */
+        ldr     x0, [x19]
+#endif
+1:
+        ldr             x19, [sp, #24]
+        ldp        x29, x30, [sp], #32
         ret
+#ifdef KMSAN
+.Lfunc_name_\insn:
+        .asciz  "arm_smccc_1_2_\insn"
+#endif
 END(arm_smccc_1_2_\insn)
 .endm
 /* int arm_smccc_1_2_*(const struct arm_smccc_1_2_regs *args,
  *     struct arm_smccc_1_2_regs *res)
  */
 arm_smccc_1_2   hvc
 arm_smccc_1_2   smc
 
 GNU_PROPERTY_AARCH64_FEATURE_1_NOTE(GNU_PROPERTY_AARCH64_FEATURE_1_VAL)

contrib/spleen/spleen-32x64.bdf

  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #include <sys/elf_common.h>
 
 #include <machine/asm.h>
 
+#include "assym.inc"
+
 .macro arm_smccc_1_0    insn
 ENTRY(arm_smccc_\insn)
         \insn   #0
         ldr     x4, [sp]
         cbz     x4, 1f
         stp        x0, x1, [x4, #16 * 0]
         stp        x2, x3, [x4, #16 * 1]
+#ifdef KMSAN
+        stp        x29, x30, [sp, #-32]!
+        str        x0, [sp, #16]
+        mov     x29, sp
+        mov     x0, x4
+        mov     x1, #(ARM_SMCCC_RES_SIZE)
+        mov     x2, #(KMSAN_STATE_INITED)
+        bl      kmsan_mark
+        ldr        x0, [sp, #16]
+        ldp        x29, x30, [sp], #32
+#endif
 1:      ret
 END(arm_smccc_\insn)
 .endm
 
 /*
  * int arm_smccc_*(register_t, register_t, register_t, register_t,
  *     register_t, register_t, register_t, register_t,
  *     struct arm_smccc_res *res)
  */
 arm_smccc_1_0   hvc
 arm_smccc_1_0   smc
 
 .macro arm_smccc_1_2    insn
 ENTRY(arm_smccc_1_2_\insn)
-        stp        x1, x19, [sp, #-16]!
+        stp        x29, x30, [sp, #-32]!
+        stp        x1, x19, [sp, #16]
+        mov     x29, sp
         mov     x19, x0
+#ifdef KMSAN
+        mov     x1, #(ARM_SMCCC_1_2_REGS_SIZE)
+        adr     x2, .Lfunc_name_\insn
+        bl      kmsan_check
+#endif
         ldp        x0, x1, [x19, #16 * 0]
         ldp        x2, x3, [x19, #16 * 1]
         ldp        x4, x5, [x19, #16 * 2]
         ldp        x6, x7, [x19, #16 * 3]
         ldp        x8, x9, [x19, #16 * 4]
         ldp        x10, x11, [x19, #16 * 5]
         ldp        x12, x13, [x19, #16 * 6]
         ldp        x14, x15, [x19, #16 * 7]
         ldp        x16, x17, [x19, #16 * 8]
         \insn   #0
-        ldr     x19, [sp]
+        ldr        x19, [sp, #16]
         cbz     x19, 1f
         stp        x0, x1, [x19, #16 * 0]
         stp        x2, x3, [x19, #16 * 1]
         stp        x4, x5, [x19, #16 * 2]
         stp        x6, x7, [x19, #16 * 3]
         stp        x8, x9, [x19, #16 * 4]
         stp        x10, x11, [x19, #16 * 5]
         stp        x12, x13, [x19, #16 * 6]
         stp        x14, x15, [x19, #16 * 7]
         stp        x16, x17, [x19, #16 * 8]
-1:        ldp        xzr, x19, [sp], #16
+#ifdef KMSAN
+        mov     x0, x19
+        mov     x1, #(ARM_SMCCC_1_2_REGS_SIZE)
+        mov     x2, #(KMSAN_STATE_INITED)
+        bl      kmsan_mark
+        /* Restore x0 as the return value */
+        ldr     x0, [x19]
+#endif
+1:
+        ldr             x19, [sp, #24]
+        ldp        x29, x30, [sp], #32
         ret
+#ifdef KMSAN
+.Lfunc_name_\insn:
+        .asciz  "arm_smccc_1_2_\insn"
+#endif
 END(arm_smccc_1_2_\insn)
 .endm
 /* int arm_smccc_1_2_*(const struct arm_smccc_1_2_regs *args,
  *     struct arm_smccc_1_2_regs *res)
  */
 arm_smccc_1_2   hvc
 arm_smccc_1_2   smc
 
 GNU_PROPERTY_AARCH64_FEATURE_1_NOTE(GNU_PROPERTY_AARCH64_FEATURE_1_VAL)