mirror of
https://github.com/isledecomp/isle.git
synced 2026-01-28 18:51:16 +00:00
Include more modules in the list
This commit is contained in:
parent
8a9809814e
commit
60a7f60cd4
@ -38,6 +38,13 @@ def __init__(self, pdb, binfile) -> None:
|
|||||||
if binfile.is_valid_section(sizeref.section)
|
if binfile.is_valid_section(sizeref.section)
|
||||||
]
|
]
|
||||||
|
|
||||||
|
def get_all_cmake_modules(self) -> List[str]:
|
||||||
|
return [
|
||||||
|
obj
|
||||||
|
for (_, (__, obj)) in self.module_lookup.items()
|
||||||
|
if obj.startswith("CMakeFiles")
|
||||||
|
]
|
||||||
|
|
||||||
def get_module(self, addr: int) -> Optional[str]:
|
def get_module(self, addr: int) -> Optional[str]:
|
||||||
for start, size, module_id in self.section_contrib:
|
for start, size, module_id in self.section_contrib:
|
||||||
if start <= addr < start + size:
|
if start <= addr < start + size:
|
||||||
@ -132,14 +139,14 @@ def read_row(self, row: RoadmapRow):
|
|||||||
self.disp_map[row.module].append(row.displacement)
|
self.disp_map[row.module].append(row.displacement)
|
||||||
|
|
||||||
|
|
||||||
def suggest_order(results: List[RoadmapRow], match_type: str):
|
def suggest_order(results: List[RoadmapRow], cmake_modules: List[str], match_type: str):
|
||||||
"""Suggest the order of modules for CMakeLists.txt"""
|
"""Suggest the order of modules for CMakeLists.txt"""
|
||||||
|
|
||||||
dc = DeltaCollector(match_type)
|
dc = DeltaCollector(match_type)
|
||||||
for row in results:
|
for row in results:
|
||||||
dc.read_row(row)
|
dc.read_row(row)
|
||||||
|
|
||||||
leftover_modules = set(mod for mod in dc.seen if mod.startswith("CMakeFiles"))
|
leftover_modules = set(cmake_modules)
|
||||||
|
|
||||||
# A little convoluted, but we want to take the first two tokens
|
# A little convoluted, but we want to take the first two tokens
|
||||||
# of the string with '/' as the delimiter.
|
# of the string with '/' as the delimiter.
|
||||||
@ -358,7 +365,7 @@ def to_roadmap_row(match):
|
|||||||
results = list(map(to_roadmap_row, engine.get_all()))
|
results = list(map(to_roadmap_row, engine.get_all()))
|
||||||
|
|
||||||
if args.order is not None:
|
if args.order is not None:
|
||||||
suggest_order(results, args.order)
|
suggest_order(results, module_map.get_all_cmake_modules(), args.order)
|
||||||
return
|
return
|
||||||
|
|
||||||
if args.csv is None:
|
if args.csv is None:
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user