Skip to content

Commit

Permalink
python: cleanup variable names
Browse files Browse the repository at this point in the history
Signed-off-by: Axel Heider <[email protected]>
  • Loading branch information
axel-h committed Jan 26, 2024
1 parent c981dbb commit 7e18bb0
Showing 1 changed file with 14 additions and 16 deletions.
30 changes: 14 additions & 16 deletions tools/hardware/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,18 +47,17 @@ def align_memory(self, regions: Set[Region]) -> (List[Region], Set[Region], int)
'''On ARM the ELF loader expects to be able to map a supersection page
to load the kernel and 'physBase' must be the physical load address of
the kernel. '''
ret = sorted(regions)
regions = sorted(regions)
extra_reserved = set()

# kernel is in the first region
new = ret[0].align_base(self.SUPERSECTION_BITS)
resv = Region(ret[0].base, new.base - ret[0].base)
extra_reserved.add(resv)
ret[0] = new

physBase = ret[0].base
reg = regions[0]
reg_aligned = reg.align_base(self.SUPERSECTION_BITS)
regions[0] = reg_aligned
physBase = reg_aligned.base
extra_reserved.add(Region(reg.base, reg_aligned.base - reg.base))

return ret, extra_reserved, physBase
return regions, extra_reserved, physBase


class RISCVConfig(Config):
Expand All @@ -74,20 +73,19 @@ def align_memory(self, regions: Set[Region]) -> (List[Region], Set[Region], int)
is exactly a megapage. On rv32 we use the same value for now, as this
seems to work nicely - even if this is just half of the 4 MiByte
magepages that exist there.'''
ret = sorted(regions)
regions = sorted(regions)
extra_reserved = set()

# kernel is in the first region
physBase = ret[0].base

reg = regions[0]
physBase = reg.base
# reserve space for bootloader in the region
len_bootloader_reserved = 1 << self.MEGAPAGE_BITS_RV64
resv = Region(ret[0].base, len_bootloader_reserved)
extra_reserved.add(resv)
ret[0].base += len_bootloader_reserved
ret[0].size -= len_bootloader_reserved
extra_reserved.add(Region(reg.base, len_bootloader_reserved))
reg.base += len_bootloader_reserved
reg.size -= len_bootloader_reserved

return ret, extra_reserved, physBase
return regions, extra_reserved, physBase

def get_device_page_bits(self) -> int:
''' Get page size in bits for mapping devices for this arch '''
Expand Down

0 comments on commit 7e18bb0

Please sign in to comment.