fix: dyld info seg names

Author: blacktop

cmd/ipsw/cmd/dyld_info.go

@@ -177,7 +177,6 @@ var dyldInfoCmd = &cobra.Command{
 		if showDylibs {
 			fmt.Println("Images")
 			fmt.Println("======")
-			w := tabwriter.NewWriter(os.Stdout, 0, 0, 1, ' ', tabwriter.DiscardEmptyColumns)
 			for idx, img := range f.Images {
 				if f.FormatVersion.IsDylibsExpectedOnDisk() {
 					m, err := macho.Open(img.Name)
@@ -189,23 +188,25 @@ var dyldInfoCmd = &cobra.Command{
 						if err != nil {
 							return errors.Wrapf(err, "failed to open Fat MachO %s", img.Name)
 						}
-						fmt.Fprintf(w, "%4d:\t0x%0X\t(%s)\t%s\n", idx+1, img.Info.Address, fat.Arches[0].DylibID().CurrentVersion, img.Name)
+						fmt.Printf("%4d:  %#0X  (%s)  %s\n", idx+1, img.Info.Address, fat.Arches[0].DylibID().CurrentVersion, img.Name)
 						fat.Close()
 						continue
 					}
-					fmt.Fprintf(w, "%4d:\t0x%0X\t(%s)\t%s\n", idx+1, img.Info.Address, m.DylibID().CurrentVersion, img.Name)
+					fmt.Printf("%4d:  %#0X  (%s)  %s\n", idx+1, img.Info.Address, m.DylibID().CurrentVersion, img.Name)
 					m.Close()
 				} else {
 					m, err := img.GetPartialMacho()
 					if err != nil {
 						return errors.Wrap(err, "failed to create MachO")
 					}
-					fmt.Fprintf(w, "%4d:\t0x%0X\t%s\t(%s)\n", idx+1, img.Info.Address, img.Name, m.DylibID().CurrentVersion)
+					if Verbose {
+						fmt.Printf("%4d:  %#0X  %s  (%s)\n", idx+1, img.Info.Address, img.Name, m.DylibID().CurrentVersion)
+					} else {
+						fmt.Printf("%4d:  %s  (%s)\n", idx+1, img.Name, m.DylibID().CurrentVersion)
+					}
 					m.Close()
 				}
-				// w.Flush()
 			}
-			w.Flush()
 		}
 		return nil
 	},

pkg/dyld/file.go

@@ -248,12 +248,19 @@ func NewFile(r io.ReaderAt, userConfig ...*Config) (*File, error) {
 				return nil, err
 			}
 			cm := &CacheMappingWithSlideInfo{CacheMappingAndSlideInfo: cxmInfo}
-			if cxmInfo.InitProt.Execute() {
+			if cxmInfo.MaxProt.Execute() {
 				cm.Name = "__TEXT"
-			} else if cxmInfo.InitProt.Write() && cm.Flags != 1 {
-				cm.Name = "__DATA"
-			} else if cxmInfo.InitProt.Write() && cm.Flags == 1 {
-				cm.Name = "__AUTH"
+			} else if cxmInfo.MaxProt.Write() {
+				if cm.Flags.IsAuthData() {
+					cm.Name = "__AUTH"
+				} else {
+					cm.Name = "__DATA"
+				}
+				if cm.Flags.IsDirtyData() {
+					cm.Name += "_DIRTY"
+				} else if cm.Flags.IsConstData() {
+					cm.Name += "_CONST"
+				}
 			} else if cxmInfo.InitProt.Read() {
 				cm.Name = "__LINKEDIT"
 			}

pkg/dyld/types.go

@@ -134,11 +134,25 @@ type CacheMappingInfo struct {
 type CacheMappingFlag uint64
 
 const (
+	DYLD_CACHE_MAPPING_NONE       CacheMappingFlag = 0
 	DYLD_CACHE_MAPPING_AUTH_DATA  CacheMappingFlag = 1
 	DYLD_CACHE_MAPPING_DIRTY_DATA CacheMappingFlag = 2
 	DYLD_CACHE_MAPPING_CONST_DATA CacheMappingFlag = 4
 )
 
+func (f CacheMappingFlag) IsNone() bool {
+	return f == DYLD_CACHE_MAPPING_NONE
+}
+func (f CacheMappingFlag) IsAuthData() bool {
+	return (f & DYLD_CACHE_MAPPING_AUTH_DATA) != 0
+}
+func (f CacheMappingFlag) IsDirtyData() bool {
+	return (f & DYLD_CACHE_MAPPING_DIRTY_DATA) != 0
+}
+func (f CacheMappingFlag) IsConstData() bool {
+	return (f & DYLD_CACHE_MAPPING_CONST_DATA) != 0
+}
+
 type CacheMappingAndSlideInfo struct {
 	Address         uint64
 	Size            uint64