readobj/macho: fix section index (gimli-rs#674)

mcbegamerxx954 · Apr 30, 2024 · b6e2710 · b6e2710
1 parent 1851689
commit b6e2710
Show file tree

Hide file tree

Showing 15 changed files with 63 additions and 63 deletions.
diff --git a/crates/examples/src/readobj/macho.rs b/crates/examples/src/readobj/macho.rs
@@ -609,8 +609,8 @@ fn print_segment<S: Segment>(
         }
         if let Some(sections) = segment.sections(endian, section_data).print_err(p) {
             for section in sections {
-                print_section(p, endian, data, section, state);
                 state.section_index += 1;
+                print_section(p, endian, data, section, state);
             }
         }
     });

diff --git a/crates/examples/testfiles/macho/base-aarch64-debug.o.readobj b/crates/examples/testfiles/macho/base-aarch64-debug.o.readobj
@@ -28,7 +28,7 @@ SegmentCommand {
     NumberOfSections: 11
     Flags: 0x0
     Section {
-        Index: 0
+        Index: 1
         SectionName: "__text"
         SegmentName: "__TEXT"
         Address: 0x0
@@ -67,7 +67,7 @@ SegmentCommand {
         }
     }
     Section {
-        Index: 1
+        Index: 2
         SectionName: "__cstring"
         SegmentName: "__TEXT"
         Address: 0x34
@@ -79,7 +79,7 @@ SegmentCommand {
         Flags: S_CSTRING_LITERALS (0x2)
     }
     Section {
-        Index: 2
+        Index: 3
         SectionName: "__debug_abbrev"
         SegmentName: "__DWARF"
         Address: 0x41
@@ -93,7 +93,7 @@ SegmentCommand {
             S_ATTR_DEBUG (0x2000000)
     }
     Section {
-        Index: 3
+        Index: 4
         SectionName: "__debug_info"
         SegmentName: "__DWARF"
         Address: 0x7B
@@ -123,7 +123,7 @@ SegmentCommand {
         }
     }
     Section {
-        Index: 4
+        Index: 5
         SectionName: "__debug_str"
         SegmentName: "__DWARF"
         Address: 0xCE
@@ -137,7 +137,7 @@ SegmentCommand {
             S_ATTR_DEBUG (0x2000000)
     }
     Section {
-        Index: 5
+        Index: 6
         SectionName: "__apple_names"
         SegmentName: "__DWARF"
         Address: 0x199
@@ -151,7 +151,7 @@ SegmentCommand {
             S_ATTR_DEBUG (0x2000000)
     }
     Section {
-        Index: 6
+        Index: 7
         SectionName: "__apple_objc"
         SegmentName: "__DWARF"
         Address: 0x1D5
@@ -165,7 +165,7 @@ SegmentCommand {
             S_ATTR_DEBUG (0x2000000)
     }
     Section {
-        Index: 7
+        Index: 8
         SectionName: "__apple_namespac"
         SegmentName: "__DWARF"
         Address: 0x1F9
@@ -179,7 +179,7 @@ SegmentCommand {
             S_ATTR_DEBUG (0x2000000)
     }
     Section {
-        Index: 8
+        Index: 9
         SectionName: "__apple_types"
         SegmentName: "__DWARF"
         Address: 0x21D
@@ -193,7 +193,7 @@ SegmentCommand {
             S_ATTR_DEBUG (0x2000000)
     }
     Section {
-        Index: 9
+        Index: 10
         SectionName: "__compact_unwind"
         SegmentName: "__LD"
         Address: 0x268
@@ -215,7 +215,7 @@ SegmentCommand {
         }
     }
     Section {
-        Index: 10
+        Index: 11
         SectionName: "__debug_line"
         SegmentName: "__DWARF"
         Address: 0x288

diff --git a/crates/examples/testfiles/macho/base-aarch64.o.objcopy b/crates/examples/testfiles/macho/base-aarch64.o.objcopy
@@ -28,7 +28,7 @@ SegmentCommand {
     NumberOfSections: 3
     Flags: 0x0
     Section {
-        Index: 0
+        Index: 1
         SectionName: "__text"
         SegmentName: "__TEXT"
         Address: 0x0
@@ -67,7 +67,7 @@ SegmentCommand {
         }
     }
     Section {
-        Index: 1
+        Index: 2
         SectionName: "__cstring"
         SegmentName: "__TEXT"
         Address: 0x34
@@ -79,7 +79,7 @@ SegmentCommand {
         Flags: S_CSTRING_LITERALS (0x2)
     }
     Section {
-        Index: 2
+        Index: 3
         SectionName: "__compact_unwind"
         SegmentName: "__LD"
         Address: 0x48

diff --git a/crates/examples/testfiles/macho/base-aarch64.o.readobj b/crates/examples/testfiles/macho/base-aarch64.o.readobj
@@ -28,7 +28,7 @@ SegmentCommand {
     NumberOfSections: 3
     Flags: 0x0
     Section {
-        Index: 0
+        Index: 1
         SectionName: "__text"
         SegmentName: "__TEXT"
         Address: 0x0
@@ -67,7 +67,7 @@ SegmentCommand {
         }
     }
     Section {
-        Index: 1
+        Index: 2
         SectionName: "__cstring"
         SegmentName: "__TEXT"
         Address: 0x34
@@ -79,7 +79,7 @@ SegmentCommand {
         Flags: S_CSTRING_LITERALS (0x2)
     }
     Section {
-        Index: 2
+        Index: 3
         SectionName: "__compact_unwind"
         SegmentName: "__LD"
         Address: 0x48

diff --git a/crates/examples/testfiles/macho/base-aarch64.readobj b/crates/examples/testfiles/macho/base-aarch64.readobj
@@ -39,7 +39,7 @@ SegmentCommand {
     NumberOfSections: 4
     Flags: 0x0
     Section {
-        Index: 0
+        Index: 1
         SectionName: "__text"
         SegmentName: "__TEXT"
         Address: 0x100003F68
@@ -54,7 +54,7 @@ SegmentCommand {
             S_ATTR_SOME_INSTRUCTIONS (0x400)
     }
     Section {
-        Index: 1
+        Index: 2
         SectionName: "__stubs"
         SegmentName: "__TEXT"
         Address: 0x100003F9C
@@ -69,7 +69,7 @@ SegmentCommand {
             S_ATTR_SOME_INSTRUCTIONS (0x400)
     }
     Section {
-        Index: 2
+        Index: 3
         SectionName: "__cstring"
         SegmentName: "__TEXT"
         Address: 0x100003FA8
@@ -81,7 +81,7 @@ SegmentCommand {
         Flags: S_CSTRING_LITERALS (0x2)
     }
     Section {
-        Index: 3
+        Index: 4
         SectionName: "__unwind_info"
         SegmentName: "__TEXT"
         Address: 0x100003FB8
@@ -111,7 +111,7 @@ SegmentCommand {
     Flags: 0x10
         SG_READ_ONLY (0x10)
     Section {
-        Index: 4
+        Index: 5
         SectionName: "__got"
         SegmentName: "__DATA_CONST"
         Address: 0x100004000

diff --git a/crates/examples/testfiles/macho/base-x86_64-debug.o.readobj b/crates/examples/testfiles/macho/base-x86_64-debug.o.readobj
@@ -28,7 +28,7 @@ SegmentCommand {
     NumberOfSections: 12
     Flags: 0x0
     Section {
-        Index: 0
+        Index: 1
         SectionName: "__text"
         SegmentName: "__TEXT"
         Address: 0x0
@@ -59,7 +59,7 @@ SegmentCommand {
         }
     }
     Section {
-        Index: 1
+        Index: 2
         SectionName: "__cstring"
         SegmentName: "__TEXT"
         Address: 0x25
@@ -71,7 +71,7 @@ SegmentCommand {
         Flags: S_CSTRING_LITERALS (0x2)
     }
     Section {
-        Index: 2
+        Index: 3
         SectionName: "__debug_abbrev"
         SegmentName: "__DWARF"
         Address: 0x32
@@ -85,7 +85,7 @@ SegmentCommand {
             S_ATTR_DEBUG (0x2000000)
     }
     Section {
-        Index: 3
+        Index: 4
         SectionName: "__debug_info"
         SegmentName: "__DWARF"
         Address: 0x6C
@@ -115,7 +115,7 @@ SegmentCommand {
         }
     }
     Section {
-        Index: 4
+        Index: 5
         SectionName: "__debug_str"
         SegmentName: "__DWARF"
         Address: 0xBF
@@ -129,7 +129,7 @@ SegmentCommand {
             S_ATTR_DEBUG (0x2000000)
     }
     Section {
-        Index: 5
+        Index: 6
         SectionName: "__apple_names"
         SegmentName: "__DWARF"
         Address: 0x187
@@ -143,7 +143,7 @@ SegmentCommand {
             S_ATTR_DEBUG (0x2000000)
     }
     Section {
-        Index: 6
+        Index: 7
         SectionName: "__apple_objc"
         SegmentName: "__DWARF"
         Address: 0x1C3
@@ -157,7 +157,7 @@ SegmentCommand {
             S_ATTR_DEBUG (0x2000000)
     }
     Section {
-        Index: 7
+        Index: 8
         SectionName: "__apple_namespac"
         SegmentName: "__DWARF"
         Address: 0x1E7
@@ -171,7 +171,7 @@ SegmentCommand {
             S_ATTR_DEBUG (0x2000000)
     }
     Section {
-        Index: 8
+        Index: 9
         SectionName: "__apple_types"
         SegmentName: "__DWARF"
         Address: 0x20B
@@ -185,7 +185,7 @@ SegmentCommand {
             S_ATTR_DEBUG (0x2000000)
     }
     Section {
-        Index: 9
+        Index: 10
         SectionName: "__compact_unwind"
         SegmentName: "__LD"
         Address: 0x258
@@ -207,7 +207,7 @@ SegmentCommand {
         }
     }
     Section {
-        Index: 10
+        Index: 11
         SectionName: "__eh_frame"
         SegmentName: "__TEXT"
         Address: 0x278
@@ -223,7 +223,7 @@ SegmentCommand {
             S_ATTR_LIVE_SUPPORT (0x8000000)
     }
     Section {
-        Index: 11
+        Index: 12
         SectionName: "__debug_line"
         SegmentName: "__DWARF"
         Address: 0x2B8

diff --git a/crates/examples/testfiles/macho/base-x86_64.o.objcopy b/crates/examples/testfiles/macho/base-x86_64.o.objcopy
@@ -28,7 +28,7 @@ SegmentCommand {
     NumberOfSections: 4
     Flags: 0x0
     Section {
-        Index: 0
+        Index: 1
         SectionName: "__text"
         SegmentName: "__TEXT"
         Address: 0x0
@@ -59,7 +59,7 @@ SegmentCommand {
         }
     }
     Section {
-        Index: 1
+        Index: 2
         SectionName: "__cstring"
         SegmentName: "__TEXT"
         Address: 0x25
@@ -71,7 +71,7 @@ SegmentCommand {
         Flags: S_CSTRING_LITERALS (0x2)
     }
     Section {
-        Index: 2
+        Index: 3
         SectionName: "__compact_unwind"
         SegmentName: "__LD"
         Address: 0x38
@@ -93,7 +93,7 @@ SegmentCommand {
         }
     }
     Section {
-        Index: 3
+        Index: 4
         SectionName: "__eh_frame"
         SegmentName: "__TEXT"
         Address: 0x58

diff --git a/crates/examples/testfiles/macho/base-x86_64.o.readobj b/crates/examples/testfiles/macho/base-x86_64.o.readobj
@@ -28,7 +28,7 @@ SegmentCommand {
     NumberOfSections: 4
     Flags: 0x0
     Section {
-        Index: 0
+        Index: 1
         SectionName: "__text"
         SegmentName: "__TEXT"
         Address: 0x0
@@ -59,7 +59,7 @@ SegmentCommand {
         }
     }
     Section {
-        Index: 1
+        Index: 2
         SectionName: "__cstring"
         SegmentName: "__TEXT"
         Address: 0x25
@@ -71,7 +71,7 @@ SegmentCommand {
         Flags: S_CSTRING_LITERALS (0x2)
     }
     Section {
-        Index: 2
+        Index: 3
         SectionName: "__compact_unwind"
         SegmentName: "__LD"
         Address: 0x38
@@ -93,7 +93,7 @@ SegmentCommand {
         }
     }
     Section {
-        Index: 3
+        Index: 4
         SectionName: "__eh_frame"
         SegmentName: "__TEXT"
         Address: 0x58