diff options
| author | blasty <blasty@local> | 2026-07-23 20:35:13 +0200 |
|---|---|---|
| committer | blasty <blasty@local> | 2026-07-23 20:35:13 +0200 |
| commit | f5aaf50476e5bf72eaec0c09ddd984b28960ca8d (patch) | |
| tree | 223ec22ab0692a88397fbaabd55c805636c36e4c /idatui/app.py | |
| parent | listing: two-level indent, address on headers, drop 'near', opcode cap+cycle (diff) | |
| download | ida-tui-f5aaf50476e5bf72eaec0c09ddd984b28960ca8d.tar.gz ida-tui-f5aaf50476e5bf72eaec0c09ddd984b28960ca8d.tar.xz ida-tui-f5aaf50476e5bf72eaec0c09ddd984b28960ca8d.zip | |
listing: code labels on their own line; search loaded portion (no wedge)
Code labels (loc_XXX/jump targets) get their OWN line at depth 0, like IDA,
instead of inline with the instruction: the heads walker (annotate) emits a
kind=label row ('loc_XXX:') before a named non-function-start code head and
strips the name from the instruction. ListingModel doesn't index label rows
(goto/xref/follow still land on the code); ListingView renders them at depth 0.
Also fix a search regression the extra rows exposed: search no longer forces a
blocking full-segment load_all (which stalled/thrashed the worker and wedged the
session on the larger annotated listing). It searches the loaded portion; the
background grower streams the rest and unloaded lines are skipped until they
arrive.
Verified: labels on their own line; search 2.9s (was 51.9s+wedge); search/mouse/
rename_history/continuous_view/func_banners/follow_xrefs 26/0.
Diffstat (limited to 'idatui/app.py')
| -rw-r--r-- | idatui/app.py | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/idatui/app.py b/idatui/app.py index 59f0af3..396e466 100644 --- a/idatui/app.py +++ b/idatui/app.py @@ -975,9 +975,9 @@ class ListingView(SearchMixin, NavMixin, ColumnCursor, ScrollView, can_focus=Tru h = self._head(idx) if h is None: return None - # Function-name headers sit at depth 0 (with the address); everything - # else is indented one level, code/data opcode+text included. - if h.kind == "funchdr": + # Function headers and code labels sit at depth 0 (with the address); + # everything else is indented one level (opcode+text included). + if h.kind in ("funchdr", "label"): return f"{h.ea:08X} {h.text}" base = f"{h.ea:08X} " + _LST_INDENT if h.kind == "sep": @@ -1090,19 +1090,11 @@ class ListingView(SearchMixin, NavMixin, ColumnCursor, ScrollView, can_focus=Tru return self._line_plain(i) def _search_ensure(self, done) -> None: - # Search needs the whole segment; finish loading it first if streaming. - if self.model is not None and not self.model.complete: - self._search_load_all(done) - else: - done() - - @work(thread=True, exclusive=True, group="listing-search-load") - def _search_load_all(self, done) -> None: # type: ignore[no-untyped-def] - model = self.model - if model is not None: - model.load_all() - self.app.call_from_thread(self._grew, len(model)) - self.app.call_from_thread(done) + # Search the currently-loaded portion; the background grower streams the + # rest of the segment in on its own (a blocking full load_all here would + # stall/thrash on a big segment). Unloaded lines read back as None from + # _search_line_text and are skipped until they arrive. + done() # -- rendering --------------------------------------------------------- # def render_line(self, y: int) -> Strip: @@ -1124,6 +1116,10 @@ class ListingView(SearchMixin, NavMixin, ColumnCursor, ScrollView, can_focus=Tru # depth-0: address + 'name proc'/'endp' (no indent) strip = Strip([Segment(f"{h.ea:08X} ", _S_ADDR), Segment(h.text, _S_FUNCHDR)]) + elif h.kind == "label": + # depth-0: address + 'loc_XXX:' on its own line + strip = Strip([Segment(f"{h.ea:08X} ", _S_ADDR), + Segment(h.text, _S_LABEL)]) else: # depth-1: address, one indent, then opcode+text segs: list[Segment] = [Segment(f"{h.ea:08X} ", _S_ADDR), |
