Merge pull request #182 from matthiesenj/master

Show hunk allocation size memory attributes
cnvogelg · Mar 2, 2024 · 912855f · 912855f
2 parents 3bb72d0 + cf9d2a6
commit 912855f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/amitools/binfmt/hunk/HunkReader.py b/amitools/binfmt/hunk/HunkReader.py
@@ -770,6 +770,7 @@ def build_loadseg(self):
                     seek_begin = False
                     e["hunk_no"] = hunk_no
                     e["alloc_size"] = self.header["hunks"][hunk_no]["size"]
+                    e["alloc_type"] = self.header["hunks"][hunk_no]["memf"]
                     hunk_no += 1
                 # add an extra overlay "hunk"
                 elif hunk_type == HUNK_OVERLAY:
@@ -815,6 +816,7 @@ def build_loadseg(self):
                     seek_begin = False
                     e["hunk_no"] = hunk_no
                     e["alloc_size"] = self.header["hunks"][hunk_no]["size"]
+                    e["alloc_type"] = self.header["hunks"][hunk_no]["memf"]
                     hunk_no += 1
                 # unecpected hunk?!
                 else:

diff --git a/amitools/binfmt/hunk/HunkShow.py b/amitools/binfmt/hunk/HunkShow.py
@@ -95,6 +95,11 @@ def show_segment(self, hunk, seg_list):
         else:
             alloc_size = None
 
+        if "alloc_type" in main:
+            alloc_type = main["alloc_type"]
+        else:
+            alloc_type = None
+
         self.print_segment_header(
             hunk_no,
             type_name,
@@ -103,6 +108,7 @@ def show_segment(self, hunk, seg_list):
             data_file_offset,
             hunk_file_offset,
             alloc_size,
+            alloc_type,
         )
         if self.hexdump and "data" in main:
             print_hex(main["data"], indent=8)
@@ -239,10 +245,14 @@ def print_segment_header(
         data_file_offset,
         hunk_file_offset,
         alloc_size,
+        alloc_type,
     ):
         extra = ""
         if alloc_size != None:
-            extra += "alloc size %08x  " % alloc_size
+            if alloc_type:
+                extra += "alloc size (%s) %08x " % (alloc_type, alloc_size)
+            else:
+                extra += "alloc size %08x  " % alloc_size
         extra += "file header @%08x" % hunk_file_offset
         if data_file_offset != None:
             extra += "  data @%08x" % data_file_offset