Changeset 795

Timestamp:

12/09/10 01:33:26 (14 years ago)

Author:

walter

Message:

bugzilla 5331 mach format problem

Files:

• branches/dmd-1.x/src/backend/machobj.c (modified) (1 diff)
• trunk/src/backend/machobj.c (modified) (1 diff)

branches/dmd-1.x/src/backend/machobj.c

@@ -745 +745 @@
-            }
-            else
-            {
-                psechdr->offset = foffset;
-                psechdr->size = 0;
-                //printf("\tsection name %s,", psechdr->sectname);
-                if (pseg->SDbuf && pseg->SDbuf->size())
-                {
-                    //printf("\tsize %d\n", pseg->SDbuf->size());
-                    psechdr->size = pseg->SDbuf->size();
-                    fobjbuf->write(pseg->SDbuf->buf, psechdr->size);
-                    foffset += psechdr->size;
-                }
-            }
-            psechdr->addr = vmaddr;
-            vmaddr += psechdr->size;
-            //printf(" assigned offset %d, size %d\n", foffset, psechdr->sh_size);
-        }
-    }
-
-
+
+
+
-     * error, and is happening sometimes.
-     */
-segment_cmd.vmsize = vmaddr;
-segment_cmd.filesize = foffset - segment_cmd.fileoff
+if (segment_cmd.filesize > vmaddr)
+    segment_cmd.vmsize = segment_cmd.filesize
-
-    // Put out relocation data
-    mach_numbersyms();
-    for (int seg = 1; seg <= seg_count; seg++)
-    {
-        seg_data *pseg = SegData[seg];
-        struct section *psechdr = &SecHdrTab[pseg->SDshtidx];   // corresponding section
-        //printf("psechdr->addr = x%x\n", psechdr->addr);
-        foffset = elf_align(I64 ? 8 : 4, foffset);
-        unsigned reloff = foffset;
-        unsigned nreloc = 0;
-        if (pseg->SDrel)
-        {   Relocation *r = (Relocation *)pseg->SDrel->buf;
-            Relocation *rend = (Relocation *)(pseg->SDrel->buf + pseg->SDrel->size());
-            for (; r != rend; r++)
-            {   const char *rs = r->rtype == RELaddr ? "addr" : "rel";
-                symbol *s = r->targsym;
-                //printf("%d:x%04x : tseg %d tsym %p REL%s\n",
-                    //seg, r->offset, r->targseg, s, rs);
-                relocation_info rel;

trunk/src/backend/machobj.c

@@ -745 +745 @@
-            }
-            else
-            {
-                psechdr->offset = foffset;
-                psechdr->size = 0;
-                //printf("\tsection name %s,", psechdr->sectname);
-                if (pseg->SDbuf && pseg->SDbuf->size())
-                {
-                    //printf("\tsize %d\n", pseg->SDbuf->size());
-                    psechdr->size = pseg->SDbuf->size();
-                    fobjbuf->write(pseg->SDbuf->buf, psechdr->size);
-                    foffset += psechdr->size;
-                }
-            }
-            psechdr->addr = vmaddr;
-            vmaddr += psechdr->size;
-            //printf(" assigned offset %d, size %d\n", foffset, psechdr->sh_size);
-        }
-    }
-
-
+
+
+
-     * error, and is happening sometimes.
-     */
-segment_cmd.vmsize = vmaddr;
-segment_cmd.filesize = foffset - segment_cmd.fileoff
+if (segment_cmd.filesize > vmaddr)
+    segment_cmd.vmsize = segment_cmd.filesize
-
-    // Put out relocation data
-    mach_numbersyms();
-    for (int seg = 1; seg <= seg_count; seg++)
-    {
-        seg_data *pseg = SegData[seg];
-        struct section *psechdr = &SecHdrTab[pseg->SDshtidx];   // corresponding section
-        //printf("psechdr->addr = x%x\n", psechdr->addr);
-        foffset = elf_align(I64 ? 8 : 4, foffset);
-        unsigned reloff = foffset;
-        unsigned nreloc = 0;
-        if (pseg->SDrel)
-        {   Relocation *r = (Relocation *)pseg->SDrel->buf;
-            Relocation *rend = (Relocation *)(pseg->SDrel->buf + pseg->SDrel->size());
-            for (; r != rend; r++)
-            {   const char *rs = r->rtype == RELaddr ? "addr" : "rel";
-                symbol *s = r->targsym;
-                //printf("%d:x%04x : tseg %d tsym %p REL%s\n",
-                    //seg, r->offset, r->targseg, s, rs);
-                relocation_info rel;