Skip to content

Commit 47f4fc0

Browse files
lupyuenlupyuen
committed
Display text OK
1 parent 278bbc6 commit 47f4fc0

File tree

8 files changed

+34850
-34827
lines changed

8 files changed

+34850
-34827
lines changed

‎logs/libapp-demangle.S‎

Lines changed: 44 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -12632,7 +12632,6 @@ app-e8778d9de5b9c761.499my7he7zu10zd3.rcgu.o: file format elf32-littlearm
1263212632
SYMBOL TABLE:
1263312633
00000000 l df *ABS* 00000000 499my7he7zu10zd3
1263412634
000006ee l .debug_str 00000000
12635-
00000fac l .debug_str 00000000
1263612635
00000fb1 l .debug_str 00000000
1263712636
00000fb7 l .debug_str 00000000
1263812637
00000fbe l .debug_str 00000000
@@ -12746,15 +12745,15 @@ SYMBOL TABLE:
1274612745
00000e96 l .debug_str 00000000
1274712746
00000f73 l .debug_str 00000000
1274812747
00000f7d l .debug_str 00000000
12749-
00000000 l O .rodata.cst16 00000010 .Lanon.ad439f8c054f0fe063633b63cf325e77.0
12748+
00000fac l .debug_str 00000000
1275012749
00000000 l d .text._ZN5druid6window19Window$LT$T$C$W$GT$3new17h0b9be2cce058e2b0E 00000000 .text._ZN5druid6window19Window$LT$T$C$W$GT$3new17h0b9be2cce058e2b0E
1275112750
00000000 l d .debug_loc 00000000 .debug_loc
1275212751
00000000 l d .debug_abbrev 00000000 .debug_abbrev
1275312752
00000000 l d .debug_info 00000000 .debug_info
1275412753
00000000 l d .debug_frame 00000000 .debug_frame
1275512754
00000000 l d .debug_line 00000000 .debug_line
1275612755
00000000 *UND* 00000000 druid::WidgetPod<T,W>::new
12757-
00000000 g F .text._ZN5druid6window19Window$LT$T$C$W$GT$3new17h0b9be2cce058e2b0E 00000052 druid::window::Window<T,W>::new
12756+
00000000 g F .text._ZN5druid6window19Window$LT$T$C$W$GT$3new17h0b9be2cce058e2b0E 0000006e druid::window::Window<T,W>::new
1275812757
00000000 *UND* 00000000 __aeabi_memcpy8
1275912758

1276012759

@@ -12771,49 +12770,63 @@ impl<T: Data + 'static, W: Widget<T> + 'static> Window<T, W> { ////
1277112770
////impl<T: Data> Window<T> {
1277212771
pub fn new(
1277312772
0: b580 push {r7, lr}
12774-
2: f5ad 6d8e sub.w sp, sp, #1136 ; 0x470
12775-
6: 460a mov r2, r1
12776-
8: ab96 add r3, sp, #600 ; 0x258
12777-
a: f44f 7c04 mov.w ip, #528 ; 0x210
12773+
2: f5ad 6d90 sub.w sp, sp, #1152 ; 0x480
12774+
/Users/Luppy/mynewt/druid-embedded/druid/src/window.rs:1
12775+
// Copyright 2019 The xi-editor Authors.
12776+
6: f50d 628d add.w r2, sp, #1128 ; 0x468
12777+
a: 460b mov r3, r1
12778+
c: f50d 7c16 add.w ip, sp, #600 ; 0x258
12779+
10: f44f 7e04 mov.w lr, #528 ; 0x210
1277812780
/Users/Luppy/mynewt/druid-embedded/druid/src/window.rs:61
1277912781
////root: &dyn Widget<T>,
1278012782
////title: LocalizedString<T>,
1278112783
////menu: Option<MenuDesc<T>>,
1278212784
) -> Self {
1278312785
Window {
1278412786
root: WidgetPod::new(root), ////
12785-
e: 9003 str r0, [sp, #12]
12786-
10: 4618 mov r0, r3
12787-
12: 9202 str r2, [sp, #8]
12788-
14: 4662 mov r2, ip
12789-
16: 9301 str r3, [sp, #4]
12790-
18: f7ff fffe bl 0 <__aeabi_memcpy8>
12791-
1c: a804 add r0, sp, #16
12792-
1e: 9901 ldr r1, [sp, #4]
12793-
20: f7ff fffe bl 0 <druid::WidgetPod<T,W>::new>
12794-
24: e7ff b.n 26 <druid::window::Window<T,W>::new+0x26>
12795-
26: a904 add r1, sp, #16
12796-
28: f44f 7212 mov.w r2, #584 ; 0x248
12787+
14: 9003 str r0, [sp, #12]
12788+
16: 4660 mov r0, ip
12789+
18: 9202 str r2, [sp, #8]
12790+
1a: 4672 mov r2, lr
12791+
1c: 9301 str r3, [sp, #4]
12792+
1e: f8cd c000 str.w ip, [sp]
12793+
22: f7ff fffe bl 0 <__aeabi_memcpy8>
12794+
26: a804 add r0, sp, #16
12795+
28: 9900 ldr r1, [sp, #0]
12796+
2a: f7ff fffe bl 0 <druid::WidgetPod<T,W>::new>
12797+
2e: e7ff b.n 30 <druid::window::Window<T,W>::new+0x30>
12798+
30: 2000 movs r0, #0
12799+
32: f2c4 006e movt r0, #16494 ; 0x406e
12800+
/Users/Luppy/mynewt/druid-embedded/druid/src/window.rs:64
12801+
////root: WidgetPod::new(WidgetBox::new(root)), ////
12802+
////root: WidgetPod::new(Box::new(root)),
12803+
size: Size { //// TODO: Allow auto size
12804+
36: f8cd 046c str.w r0, [sp, #1132] ; 0x46c
12805+
3a: 2100 movs r1, #0
12806+
3c: f8cd 1468 str.w r1, [sp, #1128] ; 0x468
12807+
40: f8cd 0474 str.w r0, [sp, #1140] ; 0x474
12808+
44: f8cd 1470 str.w r1, [sp, #1136] ; 0x470
12809+
48: a904 add r1, sp, #16
12810+
4a: f44f 7212 mov.w r2, #584 ; 0x248
1279712811
/Users/Luppy/mynewt/druid-embedded/druid/src/window.rs:60
1279812812
Window {
12799-
2c: 9803 ldr r0, [sp, #12]
12800-
2e: f7ff fffe bl 0 <__aeabi_memcpy8>
12801-
32: f240 0000 movw r0, #0
12802-
36: f2c0 0000 movt r0, #0
12803-
3a: ed90 0b00 vldr d0, [r0]
12804-
3e: ed90 1b02 vldr d1, [r0, #8]
12805-
42: 9803 ldr r0, [sp, #12]
12806-
44: ed80 0b92 vstr d0, [r0, #584] ; 0x248
12807-
48: ed80 1b94 vstr d1, [r0, #592] ; 0x250
12808-
/Users/Luppy/mynewt/druid-embedded/druid/src/window.rs:70
12813+
4e: 9803 ldr r0, [sp, #12]
12814+
50: f7ff fffe bl 0 <__aeabi_memcpy8>
12815+
54: 9802 ldr r0, [sp, #8]
12816+
56: ed90 0b00 vldr d0, [r0]
12817+
5a: ed90 1b02 vldr d1, [r0, #8]
12818+
5e: 9903 ldr r1, [sp, #12]
12819+
60: ed81 0b92 vstr d0, [r1, #584] ; 0x248
12820+
64: ed81 1b94 vstr d1, [r1, #592] ; 0x250
12821+
/Users/Luppy/mynewt/druid-embedded/druid/src/window.rs:74
1280912822
////title,
1281012823
////menu,
1281112824
////context_menu: None,
1281212825
phantom_data: PhantomData, ////
1281312826
}
1281412827
}
12815-
4c: f50d 6d8e add.w sp, sp, #1136 ; 0x470
12816-
50: bd80 pop {r7, pc}
12828+
68: f50d 6d90 add.w sp, sp, #1152 ; 0x480
12829+
6c: bd80 pop {r7, pc}
1281712830

1281812831
app-e8778d9de5b9c761.4gj7jcuyk8wgzbvy.rcgu.o: file format elf32-littlearm
1281912832

‎logs/libapp.S‎

Lines changed: 44 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -12632,7 +12632,6 @@ app-e8778d9de5b9c761.499my7he7zu10zd3.rcgu.o: file format elf32-littlearm
1263212632
SYMBOL TABLE:
1263312633
00000000 l df *ABS* 00000000 499my7he7zu10zd3
1263412634
000006ee l .debug_str 00000000
12635-
00000fac l .debug_str 00000000
1263612635
00000fb1 l .debug_str 00000000
1263712636
00000fb7 l .debug_str 00000000
1263812637
00000fbe l .debug_str 00000000
@@ -12746,15 +12745,15 @@ SYMBOL TABLE:
1274612745
00000e96 l .debug_str 00000000
1274712746
00000f73 l .debug_str 00000000
1274812747
00000f7d l .debug_str 00000000
12749-
00000000 l O .rodata.cst16 00000010 .Lanon.ad439f8c054f0fe063633b63cf325e77.0
12748+
00000fac l .debug_str 00000000
1275012749
00000000 l d .text._ZN5druid6window19Window$LT$T$C$W$GT$3new17h0b9be2cce058e2b0E 00000000 .text._ZN5druid6window19Window$LT$T$C$W$GT$3new17h0b9be2cce058e2b0E
1275112750
00000000 l d .debug_loc 00000000 .debug_loc
1275212751
00000000 l d .debug_abbrev 00000000 .debug_abbrev
1275312752
00000000 l d .debug_info 00000000 .debug_info
1275412753
00000000 l d .debug_frame 00000000 .debug_frame
1275512754
00000000 l d .debug_line 00000000 .debug_line
1275612755
00000000 *UND* 00000000 _ZN5druid22WidgetPod$LT$T$C$W$GT$3new17h8ba74bf1189ade89E
12757-
00000000 g F .text._ZN5druid6window19Window$LT$T$C$W$GT$3new17h0b9be2cce058e2b0E 00000052 _ZN5druid6window19Window$LT$T$C$W$GT$3new17h0b9be2cce058e2b0E
12756+
00000000 g F .text._ZN5druid6window19Window$LT$T$C$W$GT$3new17h0b9be2cce058e2b0E 0000006e _ZN5druid6window19Window$LT$T$C$W$GT$3new17h0b9be2cce058e2b0E
1275812757
00000000 *UND* 00000000 __aeabi_memcpy8
1275912758

1276012759

@@ -12771,49 +12770,63 @@ impl<T: Data + 'static, W: Widget<T> + 'static> Window<T, W> { ////
1277112770
////impl<T: Data> Window<T> {
1277212771
pub fn new(
1277312772
0: b580 push {r7, lr}
12774-
2: f5ad 6d8e sub.w sp, sp, #1136 ; 0x470
12775-
6: 460a mov r2, r1
12776-
8: ab96 add r3, sp, #600 ; 0x258
12777-
a: f44f 7c04 mov.w ip, #528 ; 0x210
12773+
2: f5ad 6d90 sub.w sp, sp, #1152 ; 0x480
12774+
/Users/Luppy/mynewt/druid-embedded/druid/src/window.rs:1
12775+
// Copyright 2019 The xi-editor Authors.
12776+
6: f50d 628d add.w r2, sp, #1128 ; 0x468
12777+
a: 460b mov r3, r1
12778+
c: f50d 7c16 add.w ip, sp, #600 ; 0x258
12779+
10: f44f 7e04 mov.w lr, #528 ; 0x210
1277812780
/Users/Luppy/mynewt/druid-embedded/druid/src/window.rs:61
1277912781
////root: &dyn Widget<T>,
1278012782
////title: LocalizedString<T>,
1278112783
////menu: Option<MenuDesc<T>>,
1278212784
) -> Self {
1278312785
Window {
1278412786
root: WidgetPod::new(root), ////
12785-
e: 9003 str r0, [sp, #12]
12786-
10: 4618 mov r0, r3
12787-
12: 9202 str r2, [sp, #8]
12788-
14: 4662 mov r2, ip
12789-
16: 9301 str r3, [sp, #4]
12790-
18: f7ff fffe bl 0 <__aeabi_memcpy8>
12791-
1c: a804 add r0, sp, #16
12792-
1e: 9901 ldr r1, [sp, #4]
12793-
20: f7ff fffe bl 0 <_ZN5druid22WidgetPod$LT$T$C$W$GT$3new17h8ba74bf1189ade89E>
12794-
24: e7ff b.n 26 <_ZN5druid6window19Window$LT$T$C$W$GT$3new17h0b9be2cce058e2b0E+0x26>
12795-
26: a904 add r1, sp, #16
12796-
28: f44f 7212 mov.w r2, #584 ; 0x248
12787+
14: 9003 str r0, [sp, #12]
12788+
16: 4660 mov r0, ip
12789+
18: 9202 str r2, [sp, #8]
12790+
1a: 4672 mov r2, lr
12791+
1c: 9301 str r3, [sp, #4]
12792+
1e: f8cd c000 str.w ip, [sp]
12793+
22: f7ff fffe bl 0 <__aeabi_memcpy8>
12794+
26: a804 add r0, sp, #16
12795+
28: 9900 ldr r1, [sp, #0]
12796+
2a: f7ff fffe bl 0 <_ZN5druid22WidgetPod$LT$T$C$W$GT$3new17h8ba74bf1189ade89E>
12797+
2e: e7ff b.n 30 <_ZN5druid6window19Window$LT$T$C$W$GT$3new17h0b9be2cce058e2b0E+0x30>
12798+
30: 2000 movs r0, #0
12799+
32: f2c4 006e movt r0, #16494 ; 0x406e
12800+
/Users/Luppy/mynewt/druid-embedded/druid/src/window.rs:64
12801+
////root: WidgetPod::new(WidgetBox::new(root)), ////
12802+
////root: WidgetPod::new(Box::new(root)),
12803+
size: Size { //// TODO: Allow auto size
12804+
36: f8cd 046c str.w r0, [sp, #1132] ; 0x46c
12805+
3a: 2100 movs r1, #0
12806+
3c: f8cd 1468 str.w r1, [sp, #1128] ; 0x468
12807+
40: f8cd 0474 str.w r0, [sp, #1140] ; 0x474
12808+
44: f8cd 1470 str.w r1, [sp, #1136] ; 0x470
12809+
48: a904 add r1, sp, #16
12810+
4a: f44f 7212 mov.w r2, #584 ; 0x248
1279712811
/Users/Luppy/mynewt/druid-embedded/druid/src/window.rs:60
1279812812
Window {
12799-
2c: 9803 ldr r0, [sp, #12]
12800-
2e: f7ff fffe bl 0 <__aeabi_memcpy8>
12801-
32: f240 0000 movw r0, #0
12802-
36: f2c0 0000 movt r0, #0
12803-
3a: ed90 0b00 vldr d0, [r0]
12804-
3e: ed90 1b02 vldr d1, [r0, #8]
12805-
42: 9803 ldr r0, [sp, #12]
12806-
44: ed80 0b92 vstr d0, [r0, #584] ; 0x248
12807-
48: ed80 1b94 vstr d1, [r0, #592] ; 0x250
12808-
/Users/Luppy/mynewt/druid-embedded/druid/src/window.rs:70
12813+
4e: 9803 ldr r0, [sp, #12]
12814+
50: f7ff fffe bl 0 <__aeabi_memcpy8>
12815+
54: 9802 ldr r0, [sp, #8]
12816+
56: ed90 0b00 vldr d0, [r0]
12817+
5a: ed90 1b02 vldr d1, [r0, #8]
12818+
5e: 9903 ldr r1, [sp, #12]
12819+
60: ed81 0b92 vstr d0, [r1, #584] ; 0x248
12820+
64: ed81 1b94 vstr d1, [r1, #592] ; 0x250
12821+
/Users/Luppy/mynewt/druid-embedded/druid/src/window.rs:74
1280912822
////title,
1281012823
////menu,
1281112824
////context_menu: None,
1281212825
phantom_data: PhantomData, ////
1281312826
}
1281412827
}
12815-
4c: f50d 6d8e add.w sp, sp, #1136 ; 0x470
12816-
50: bd80 pop {r7, pc}
12828+
68: f50d 6d90 add.w sp, sp, #1152 ; 0x480
12829+
6c: bd80 pop {r7, pc}
1281712830

1281812831
app-e8778d9de5b9c761.4gj7jcuyk8wgzbvy.rcgu.o: file format elf32-littlearm
1281912832

0 commit comments

Comments
 (0)