From 00ac1bcf178f91b75452f2bacc92b1bfad2fe477 Mon Sep 17 00:00:00 2001 From: disinvite Date: Wed, 31 Jan 2024 11:51:55 -0500 Subject: [PATCH] Use average address for library order --- tools/roadmap/roadmap.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/roadmap/roadmap.py b/tools/roadmap/roadmap.py index 5cf23e0b..5eaae874 100644 --- a/tools/roadmap/roadmap.py +++ b/tools/roadmap/roadmap.py @@ -264,7 +264,7 @@ def suggest_order(results: List[RoadmapRow], module_map: ModuleMap, match_type: # Now display the order of all libaries in the final file. library_order = {} - for module, start in dc.earliest.items(): + for start, module in computed_order: lib = module_map.get_lib_for_module(module) if lib is None: lib = get_cmakefiles_prefix(module) @@ -272,7 +272,7 @@ def suggest_order(results: List[RoadmapRow], module_map: ModuleMap, match_type: if start < library_order.get(lib, 0xFFFFFFFFF): library_order[lib] = start - print("Library order (earliest address shown):") + print("Library order (average address shown):") for lib, start in sorted(library_order.items(), key=lambda x: x[1]): # Strip off any OS path for brevity if not lib.startswith("CMakeFiles"):