sambuc/codezero
1
0
Fork 0
mirror of https://github.com/drasko/codezero.git synced 2026-01-12 02:43:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

All address parameters in class Container converted to integers

Browse Source
This commit is contained in:
Bahadir Balban
2009-09-24 19:07:29 +03:00
parent 8ce7aef6b7
commit 37507c006a
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
config/configuration.py
View File

@@ -72,23 +72,23 @@ class configuration:
# TODO: Carry this over to Container() as static method???
def get_container_parameter(self, id, param, val):
if param[:len("PAGER_LMA")] == "PAGER_LMA":
self.containers[id].pager_lma = val
self.containers[id].pager_lma = int(val, 0)
elif param[:len("PAGER_VMA")] == "PAGER_VMA":
self.containers[id].pager_vma = val
self.containers[id].pager_vma = int(val, 0)
elif param[:len("PAGER_SIZE")] == "PAGER_SIZE":
self.containers[id].pager_size = val
self.containers[id].pager_size = int(val, 0)
elif param[:len("LINUX_MAPSIZE")] == "LINUX_MAPSIZE":
self.containers[id].linux_mapsize = val
self.containers[id].linux_mapsize = int(val, 0)
elif param[:len("LINUX_PAGE_OFFSET")] == "LINUX_PAGE_OFFSET":
self.containers[id].linux_page_offset = val
self.containers[id].pager_vma += val
self.containers[id].linux_page_offset = int(val, 0)
self.containers[id].pager_vma += int(val, 0)
elif param[:len("LINUX_PHYS_OFFSET")] == "LINUX_PHYS_OFFSET":
self.containers[id].linux_phys_offset = val
self.containers[id].pager_lma += val
self.containers[id].linux_phys_offset = int(val, 0)
self.containers[id].pager_lma += int(val, 0)
elif param[:len("LINUX_TEXT_OFFSET")] == "LINUX_TEXT_OFFSET":
self.containers[id].linux_text_offset = val
self.containers[id].pager_lma += val
self.containers[id].pager_vma += val
self.containers[id].linux_text_offset = int(val, 0)
self.containers[id].pager_lma += int(val, 0)
self.containers[id].pager_vma += int(val, 0)
elif re.match(r"(VIRT|PHYS){1}([0-9]){1}(_){1}(START|END){1}", param):
matchobj = re.match(r"(VIRT|PHYS){1}([0-9]){1}(_){1}(START|END){1}", param)
virtphys, regionidstr, discard1, startend = matchobj.groups()

6
scripts/bare/bare_generator.py
View File

@@ -65,11 +65,11 @@ class BareContGenerator:
fout.write(name_header)
fout.write('\t' + cont.name + '\n')
fout.write(pager_lma_header)
fout.write('\t' + cont.pager_lma + '\n')
fout.write('\t' + hex(cont.pager_lma) + '\n')
fout.write(pager_size_header)
fout.write('\t' + cont.pager_size + '\n')
fout.write('\t' + hex(cont.pager_size) + '\n')
fout.write(pager_vma_header)
fout.write('\t' + cont.pager_vma + '\n')
fout.write('\t' + hex(cont.pager_vma) + '\n')
for ireg in range(cont.virt_regions):
fout.write(pager_virtmem_header % ireg)
fout.write('\t' + cont.virtmem["START"][ireg] + ' - ' + cont.virtmem["END"][ireg] + '\n')