chore(core/emulator): recognize rust layouts in memory dumps

trezor · Oct 5, 2021 · 65657b7 · matejcik · Oct 5, 2021 · mmilata
1 parent 062e921
commit 65657b7
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 0 deletions.
diff --git a/core/embed/extmod/modtrezorutils/modtrezorutils-meminfo.h b/core/embed/extmod/modtrezorutils/modtrezorutils-meminfo.h
@@ -640,6 +640,13 @@ void dump_value_opt(FILE *out, mp_const_obj_t value, bool eval_short) {
     dump_protodef(out, value);
   }
 
+#if TREZOR_MODEL == 1
+  else if (mp_obj_is_type(value, ui_debug_layout_type())) {
+    print_type(out, "uilayout", NULL, value, true);
+    fprintf(out, ",\n");
+  }
+#endif
+
   else {
     print_type(out, "unknown", NULL, value, true);
     fprintf(out, ",\n");

diff --git a/core/embed/rust/librust.h b/core/embed/rust/librust.h
@@ -13,3 +13,7 @@ mp_obj_t protobuf_debug_msg_def_type();
 #endif
 
 mp_obj_t ui_layout_new_example(mp_obj_t);
+
+#ifdef TREZOR_EMULATOR
+mp_obj_t ui_debug_layout_type();
+#endif
diff --git a/core/embed/rust/src/ui/layout/obj.rs b/core/embed/rust/src/ui/layout/obj.rs
@@ -334,6 +334,11 @@ extern "C" fn ui_layout_paint(this: Obj) -> Obj {
     unsafe { util::try_or_raise(block) }
 }
 
+#[no_mangle]
+pub extern "C" fn ui_debug_layout_type() -> &'static Type {
+    LayoutObj::obj_type()
+}
+
 #[cfg(feature = "ui_debug")]
 extern "C" fn ui_layout_trace(this: Obj, callback: Obj) -> Obj {
     let block = || {

diff --git a/core/tools/analyze-memory-dump.py b/core/tools/analyze-memory-dump.py
@@ -194,6 +194,7 @@ def ptrval(self):
     "qstrdata": "q",
     "protomsg": "P",
     "protodef": "p",
+    "uilayout": "u",
 }
 
 pixels_per_line = len(