From 37507c006a42b053a1a5075dfb0c84514975c29a Mon Sep 17 00:00:00 2001 From: Bahadir Balban Date: Thu, 24 Sep 2009 19:07:29 +0300 Subject: [PATCH] All address parameters in class Container converted to integers --- config/configuration.py | 22 +++++++++++----------- scripts/bare/bare_generator.py | 6 +++--- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/config/configuration.py b/config/configuration.py index 1781127..f81e390 100644 --- a/config/configuration.py +++ b/config/configuration.py @@ -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() diff --git a/scripts/bare/bare_generator.py b/scripts/bare/bare_generator.py index 539b119..23e424d 100755 --- a/scripts/bare/bare_generator.py +++ b/scripts/bare/bare_generator.py @@ -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')