From dc527a36194986622757589136129bf660f894f6 Mon Sep 17 00:00:00 2001 From: bunnie Date: Sat, 23 Oct 2021 18:36:31 +0800 Subject: [PATCH] Rust 1.56 results in a bigger loader. Presumably because "optimization". This causes the font maps to shift down. Allocate some "room to grow" as Rust gets more "optimal". --- loader/link.x | 2 +- loader/src/fonts.rs | 0 loader/src/fonts/bold.rs | 0 loader/src/fonts/emoji.rs | 0 loader/src/fonts/hanzi.rs | 0 loader/src/fonts/regular.rs | 0 loader/src/fonts/small.rs | 0 loader/src/generate_fonts.py | 2 +- services/graphics-server/src/fontmap.rs | 2 +- 9 files changed, 3 insertions(+), 3 deletions(-) mode change 100644 => 100755 loader/src/fonts.rs mode change 100644 => 100755 loader/src/fonts/bold.rs mode change 100644 => 100755 loader/src/fonts/emoji.rs mode change 100644 => 100755 loader/src/fonts/hanzi.rs mode change 100644 => 100755 loader/src/fonts/regular.rs mode change 100644 => 100755 loader/src/fonts/small.rs mode change 100644 => 100755 services/graphics-server/src/fontmap.rs diff --git a/loader/link.x b/loader/link.x index 0664ad85d..1aa46fa9a 100644 --- a/loader/link.x +++ b/loader/link.x @@ -90,7 +90,7 @@ SECTIONS _edata = .; } > REGION_DATA AT > REGION_RODATA - .fonts ALIGN(131072) : SUBALIGN(131072) + .fonts ALIGN(65536) : SUBALIGN(65536) { KEEP(*(.fontdata)); } > REGION_RODATA diff --git a/loader/src/fonts.rs b/loader/src/fonts.rs old mode 100644 new mode 100755 diff --git a/loader/src/fonts/bold.rs b/loader/src/fonts/bold.rs old mode 100644 new mode 100755 diff --git a/loader/src/fonts/emoji.rs b/loader/src/fonts/emoji.rs old mode 100644 new mode 100755 diff --git a/loader/src/fonts/hanzi.rs b/loader/src/fonts/hanzi.rs old mode 100644 new mode 100755 diff --git a/loader/src/fonts/regular.rs b/loader/src/fonts/regular.rs old mode 100644 new mode 100755 diff --git a/loader/src/fonts/small.rs b/loader/src/fonts/small.rs old mode 100644 new mode 100755 diff --git a/loader/src/generate_fonts.py b/loader/src/generate_fonts.py index 72ef305e1..aac925080 100755 --- a/loader/src/generate_fonts.py +++ b/loader/src/generate_fonts.py @@ -73,7 +73,7 @@ def main(): mapfile.write("#![allow(dead_code)]\n") # Python iterators are deterministic, right......? so if I used the same iterator to make the link order it'll be the same here....right? offset = 0 - mapfile.write("pub const FONT_BASE: usize = 0x{:08x};\n".format(0x20520000)) + mapfile.write("pub const FONT_BASE: usize = 0x{:08x};\n".format(0x20530000)) for k,v in fontdict.items(): length = int(v) * 4 mapfile.write("pub const {}_OFFSET: usize = 0x{:08x};\n".format(k.upper(), offset)) diff --git a/services/graphics-server/src/fontmap.rs b/services/graphics-server/src/fontmap.rs old mode 100644 new mode 100755 index f1fc694ab..f56d41174 --- a/services/graphics-server/src/fontmap.rs +++ b/services/graphics-server/src/fontmap.rs @@ -1,7 +1,7 @@ // This file is autogenerated by xous-core/loader/src/generate_fonts.py. Do not edit. // This makes probably bad assumptions about how link order is computed. Be suspicious of these offsets. #![allow(dead_code)] -pub const FONT_BASE: usize = 0x20520000; +pub const FONT_BASE: usize = 0x20530000; pub const BOLD_OFFSET: usize = 0x00000000; pub const BOLD_LEN: usize = 0x00001774; pub const EMOJI_OFFSET: usize = 0x00001774;