arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-07-12 01:28:10 +00:00
Code Issues Releases Wiki Activity

fix

Browse Source
This commit is contained in:
tychovrahe 2022-11-09 12:06:17 +01:00
parent 6b0ddf6fbb
commit 762bc938e0
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/embed/bootloader/memory.ld
View File

@ -23,7 +23,7 @@ ccmram_end = ORIGIN(CCMRAM) + LENGTH(CCMRAM);
sram_start = ORIGIN(SRAM); sram_start = ORIGIN(SRAM);
sram_end = ORIGIN(SRAM) + LENGTH(SRAM); sram_end = ORIGIN(SRAM) + LENGTH(SRAM);
_codelen = SIZEOF(.flash) + SIZEOF(.data); _codelen = SIZEOF(.flash) + SIZEOF(.data) + SIZEOF(.exidx) + SIZEOF(.align);
SECTIONS { SECTIONS {
.header : ALIGN(4) { .header : ALIGN(4) {
@ -36,6 +36,15 @@ SECTIONS {
*(.text*); *(.text*);
. = ALIGN(4); . = ALIGN(4);
*(.rodata*); *(.rodata*);
. = ALIGN(4);
} >FLASH AT>FLASH
/* exception handling info generated by llvm which should consist of 8 bytes of "cantunwind" */
.exidx : ALIGN(4) {
*(.ARM.exidx*);
} >FLASH AT>FLASH
.align : ALIGN(4) {
. = ALIGN(512); . = ALIGN(512);
} >FLASH AT>FLASH } >FLASH AT>FLASH

2
core/embed/rust/src/ui/display/color.rs
View File

@ -1,6 +1,5 @@
use crate::ui::lerp::Lerp; use crate::ui::lerp::Lerp;
#[macro_export] #[macro_export]
macro_rules! alpha { macro_rules! alpha {
($n: expr) => { ($n: expr) => {
@ -12,7 +11,6 @@ macro_rules! alpha {
}; };
} }
#[derive(Copy, Clone, PartialEq, Eq)] #[derive(Copy, Clone, PartialEq, Eq)]
pub struct Color(u16); pub struct Color(u16);

7
core/embed/rust/src/ui/display/mod.rs
View File

@ -296,7 +296,12 @@ impl<T: AsRef<str>> TextOverlay<T> {
let p_rel = Point::new(p.x - self.area.x0, p.y - self.area.y0); let p_rel = Point::new(p.x - self.area.x0, p.y - self.area.y0);
for g in self.text.as_ref().bytes().filter_map(|c| self.font.get_glyph(c)) { for g in self
.text
.as_ref()
.bytes()
.filter_map(|c| self.font.get_glyph(c))
{
let top = self.max_height - self.baseline - g.bearing_y; let top = self.max_height - self.baseline - g.bearing_y;
let char_area = Rect::new( let char_area = Rect::new(
Point::new(tot_adv + g.bearing_x, top), Point::new(tot_adv + g.bearing_x, top),