add some properties to Segment/Section protocol

p-x9 · Mar 23, 2024 · d0c5d59 · d0c5d59
1 parent 40a61a9
commit d0c5d59
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 5 deletions.
diff --git a/Sources/MachOKit/LoadCommand/Model/Section.swift b/Sources/MachOKit/LoadCommand/Model/Section.swift
@@ -11,8 +11,9 @@ import Foundation
 public protocol SectionProtocol: LayoutWrapper {
     var sectionName: String { get }
     var segmentName: String { get }
-    var offset: Int { get }
+    var address: Int { get }
     var size: Int { get }
+    var offset: Int { get }
     var flags: SectionFlags { get }
 
     var indirectSymbolIndex: Int? { get }
@@ -64,14 +65,18 @@ extension Section {
         .init(tuple: layout.segname)
     }
 
-    public var offset: Int {
-        numericCast(layout.offset)
+    public var address: Int {
+        numericCast(layout.addr)
     }
 
     public var size: Int {
         numericCast(layout.size)
     }
 
+    public var offset: Int {
+        numericCast(layout.offset)
+    }
+
     public var flags: SectionFlags {
         .init(rawValue: layout.flags)
     }
@@ -118,14 +123,18 @@ extension Section64 {
         .init(tuple: layout.segname)
     }
 
-    public var offset: Int {
-        numericCast(layout.offset)
+    public var address: Int {
+        numericCast(layout.addr)
     }
 
     public var size: Int {
         numericCast(layout.size)
     }
 
+    public var offset: Int {
+        numericCast(layout.offset)
+    }
+
     public var flags: SectionFlags {
         .init(rawValue: layout.flags)
     }

diff --git a/Sources/MachOKit/LoadCommand/SegmentCommand.swift b/Sources/MachOKit/LoadCommand/SegmentCommand.swift
@@ -17,6 +17,7 @@ public protocol SegmentCommandProtocol: LoadCommandWrapper {
     var fileSize: Int { get }
     var maxProtection: VMProtection { get }
     var initialProtection: VMProtection { get }
+    var numberOfSections: Int { get }
     var flags: SegmentCommandFlags { get }
 
     func startPtr(vmaddrSlide: Int) -> UnsafeRawPointer?
@@ -76,6 +77,10 @@ public struct SegmentCommand: SegmentCommandProtocol {
         .init(rawValue: layout.initprot)
     }
 
+    public var numberOfSections: Int {
+        numericCast(layout.nsects)
+    }
+
     public var flags: SegmentCommandFlags {
         .init(rawValue: layout.flags)
     }
@@ -121,6 +126,10 @@ public struct SegmentCommand64: SegmentCommandProtocol {
         .init(rawValue: layout.initprot)
     }
 
+    public var numberOfSections: Int {
+        numericCast(layout.nsects)
+    }
+
     public var flags: SegmentCommandFlags {
         .init(rawValue: layout.flags)
     }