Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FdSizeReport: Handle empty FV sections in Build Report #664

Merged
merged 1 commit into from
Jan 3, 2024
Merged

FdSizeReport: Handle empty FV sections in Build Report #664

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions BaseTools/Plugin/FdSizeReport/FdSizeReportGenerator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@ class FdRegion:
as we can pseudo treat it like a factory class.
"""
FD_REGION = r"Type:\s+(.*?)(?:\r?\n|\r)Base Address:\s+(.*?)(?:\r?\n|\r)Size:\s+(.*?)(?:\r?\n|\r)"
FD_EMPTY_REGION = r"Type:\s+(.*?)(?:\r?\n|\r)Base Address:\s+(.*?)(?:\r?\n|\r)"

TYPE_FV = r"Fv Name:\s+(.*?)(?:\r?\n|\r)Occupied Size:\s+(.*?)(?:\r?\n|\r)Free Size:\s+(.*?)(?:\r?\n|\r)"
TYPE_CAPSULE = r"Capsule Name:\s+(.*?)(?:\r?\n|\r)?Capsule Size:\s+(.*?)"
Expand Down Expand Up @@ -257,7 +258,7 @@ def parse_capsule_file_type_region(match: re.Match) -> 'FdRegion':
# "Capsule Size:" or "File Size:", `0x348000 (3360K)` -> `0x348000`
region.size = match.group(5).strip().split()[0]

def parse_generic_region(match: re.match) -> 'FdRegion':
def parse_generic_region(match: re.match, empty: bool) -> 'FdRegion':
"""Parses a generic FD region header.

Args:
Expand All @@ -269,7 +270,8 @@ def parse_generic_region(match: re.match) -> 'FdRegion':
region.base = match.group(2).strip()

# `0x348000 (3360K)` -> `0x348000`
region.size = match.group(3).strip().split()[0]
if not empty:
region.size = match.group(3).strip().split()[0]
return region

def from_raw(raw_region: str, nested):
Expand Down Expand Up @@ -303,7 +305,12 @@ def from_raw(raw_region: str, nested):
match = re.search(FdRegion.FD_REGION, raw_region, re.DOTALL)
if match:
logging.debug("Generic FD Region found.")
return FdRegion.parse_generic_region(match)
return FdRegion.parse_generic_region(match, False)

match = re.search(FdRegion.FD_EMPTY_REGION, raw_region, re.DOTALL)
if match:
logging.debug("Empty FD Region found.")
return FdRegion.parse_generic_region(match, True)

logging.error("No match found for FD Region")
return None
Expand Down