Use the new -A cpu filter when using -r and -S.

[ldid.git] / ldid.cpp

diff --git a/ldid.cpp b/ldid.cpp
index d5c3240401033fc7a3ee90f8ab2ae8a3d5c5888b..3845e2c5ebaa4566392114ce9138184b36650c98 100644 (file)
--- a/ldid.cpp
+++ b/ldid.cpp
@@ -88,6 +88,7 @@ struct load_command {
 #define LC_CODE_SIGNATURE     uint32_t(0x1d)
 #define LC_SEGMENT_SPLIT_INFO uint32_t(0x1e)
 #define LC_REEXPORT_DYLIB     uint32_t(0x1f | LC_REQ_DYLD)
+#define LC_ENCRYPTION_INFO    uint32_t(0x21)
 #define LC_DYLD_INFO          uint32_t(0x22)
 #define LC_DYLD_INFO_ONLY     uint32_t(0x22 | LC_REQ_DYLD)
 
@@ -216,7 +217,7 @@ struct segment_command {
     uint32_t initprot;
     uint32_t nsects;
     uint32_t flags;
-};
+} _packed;
 
 struct segment_command_64 {
     uint32_t cmd;
@@ -230,7 +231,7 @@ struct segment_command_64 {
     uint32_t initprot;
     uint32_t nsects;
     uint32_t flags;
-};
+} _packed;
 
 struct section {
     char sectname[16];
@@ -244,7 +245,7 @@ struct section {
     uint32_t flags;
     uint32_t reserved1;
     uint32_t reserved2;
-};
+} _packed;
 
 struct section_64 {
     char sectname[16];
@@ -258,7 +259,7 @@ struct section_64 {
     uint32_t flags;
     uint32_t reserved1;
     uint32_t reserved2;
-};
+} _packed;
 
 struct linkedit_data_command {
     uint32_t cmd;
@@ -267,6 +268,14 @@ struct linkedit_data_command {
     uint32_t datasize;
 } _packed;
 
+struct encryption_info_command {
+    uint32_t cmd;
+    uint32_t cmdsize;
+    uint32_t cryptoff;
+    uint32_t cryptsize;
+    uint32_t cryptid;
+} _packed;
+
 uint16_t Swap_(uint16_t value) {
     return
         ((value >>  8) & 0x00ff) |
@@ -685,6 +694,17 @@ int main(int argc, const char *argv[]) {
     bool flag_S(false);
     bool flag_s(false);
 
+    bool flag_O(false);
+
+    bool flag_D(false);
+    bool flag_d(false);
+
+    bool flag_A(false);
+    bool flag_a(false);
+
+    uint32_t flag_CPUType(_not(uint32_t));
+    uint32_t flag_CPUSubtype(_not(uint32_t));
+
     bool timeh(false);
     uint32_t timev(0);
 
@@ -715,6 +735,26 @@ int main(int argc, const char *argv[]) {
             case 'u': flag_u = true; break;
             case 'p': flag_p = true; break;
             case 'e': flag_e = true; break;
+            case 'O': flag_O = true; break;
+
+            case 'D': flag_D = true; break;
+            case 'd': flag_d = true; break;
+
+            case 'a': flag_a = true; break;
+
+            case 'A':
+                flag_A = true;
+                if (argv[argi][2] != '\0') {
+                    const char *cpu = argv[argi] + 2;
+                    const char *colon = strchr(cpu, ':');
+                    _assert(colon != NULL);
+                    char *arge;
+                    flag_CPUType = strtoul(cpu, &arge, 0);
+                    _assert(arge == colon);
+                    flag_CPUSubtype = strtoul(colon + 1, &arge, 0);
+                    _assert(arge == argv[argi] + strlen(argv[argi]));
+                }
+            break;
 
             case 's':
                 _assert(!flag_S);
@@ -779,6 +819,13 @@ int main(int argc, const char *argv[]) {
             uint32_t clip(0); {
                 FatHeader fat_header(Map(path));
                 _foreach (mach_header, fat_header.GetMachHeaders()) {
+                    if (flag_A) {
+                        if (mach_header.GetCPUType() != flag_CPUType)
+                            continue;
+                        if (mach_header.GetCPUSubtype() != flag_CPUSubtype)
+                            continue;
+                    }
+
                     mach_header->flags = mach_header.Swap(mach_header.Swap(mach_header->flags) | MH_DYLDLINK);
 
                     uint32_t size(_not(uint32_t)); {
@@ -825,8 +872,8 @@ int main(int argc, const char *argv[]) {
                 }
             }
 
-            _assert(clip != 0);
-            _syscall(truncate(path, clip));
+            if (clip != 0)
+                _syscall(truncate(path, clip));
         }
 
         if (flag_S) {
@@ -838,6 +885,13 @@ int main(int argc, const char *argv[]) {
             std::vector<CodesignAllocation> allocations; {
                 FatHeader fat_header(Map(path));
                 _foreach (mach_header, fat_header.GetMachHeaders()) {
+                    if (flag_A) {
+                        if (mach_header.GetCPUType() != flag_CPUType)
+                            continue;
+                        if (mach_header.GetCPUSubtype() != flag_CPUSubtype)
+                            continue;
+                    }
+
                     mach_header->flags = mach_header.Swap(mach_header.Swap(mach_header->flags) | MH_DYLDLINK);
 
                     size_t size(_not(size_t)); {
@@ -859,6 +913,8 @@ int main(int argc, const char *argv[]) {
                 }
             }
 
+            if (!allocations.empty()) {
+
             pid_t pid = fork();
             _syscall(pid);
             if (pid == 0) {
@@ -931,15 +987,34 @@ int main(int argc, const char *argv[]) {
             _syscall(waitpid(pid, &status, 0));
             _assert(WIFEXITED(status));
             _assert(WEXITSTATUS(status) == 0);
+
+            }
         }
 
         if (flag_p)
             printf("path%zu='%s'\n", filei, file.c_str());
 
-        FatHeader fat_header(Map(temp == NULL ? path : temp, !(flag_R | flag_T | flag_s | flag_S)));
+        FatHeader fat_header(Map(temp == NULL ? path : temp, !(flag_R | flag_T | flag_s | flag_S | flag_O | flag_D)));
         struct linkedit_data_command *signature(NULL);
 
         _foreach (mach_header, fat_header.GetMachHeaders()) {
+            if (flag_A) {
+                if (mach_header.GetCPUType() != flag_CPUType)
+                    continue;
+                if (mach_header.GetCPUSubtype() != flag_CPUSubtype)
+                    continue;
+            }
+
+            if (flag_a)
+                printf("cpu=0x%x:0x%x\n", mach_header.GetCPUType(), mach_header.GetCPUSubtype());
+
+            if (flag_d) {
+                if (struct fat_arch *fat_arch = mach_header.GetFatArch())
+                    printf("offset=0x%x\n", Swap(fat_arch->offset));
+                else
+                    printf("offset=0x0\n");
+            }
+
             if (woffset != _not(uintptr_t)) {
                 Pointer<uint32_t> wvalue(mach_header.GetPointer<uint32_t>(woffset));
                 if (wvalue == NULL)
@@ -951,6 +1026,17 @@ int main(int argc, const char *argv[]) {
             if (noffset != _not(uintptr_t))
                 printf("%s\n", &*mach_header.GetPointer<char>(noffset));
 
+            if (flag_d)
+                _foreach(segment, mach_header.GetSegments("__TEXT")) {
+                    printf("vmaddr=0x%x\n", mach_header.Swap(segment->vmaddr));
+                    printf("fileoff=0x%x\n", mach_header.Swap(segment->fileoff));
+                }
+
+            if (flag_O) {
+                _foreach(section, mach_header.GetSections("__TEXT", "__text"))
+                    section->addr = mach_header.Swap(0);
+            }
+
             _foreach (load_command, mach_header.GetLoadCommands()) {
                 uint32_t cmd(mach_header.Swap(load_command->cmd));
 
@@ -987,6 +1073,17 @@ int main(int argc, const char *argv[]) {
 
                         dylib_command->dylib.timestamp = mach_header.Swap(timed);
                     }
+                } else if (cmd == LC_ENCRYPTION_INFO) {
+                    volatile struct encryption_info_command *encryption_info_command(reinterpret_cast<struct encryption_info_command *>(load_command));
+
+                    if (flag_D)
+                        encryption_info_command->cryptid = mach_header.Swap(0);
+
+                    if (flag_d) {
+                        printf("cryptoff=0x%x\n", mach_header.Swap(encryption_info_command->cryptoff));
+                        printf("cryptsize=0x%x\n", mach_header.Swap(encryption_info_command->cryptsize));
+                        printf("cryptid=0x%x\n", mach_header.Swap(encryption_info_command->cryptid));
+                    }
                 }
             }