xemacs-beta: src/unexcw.c comparison

comparison src/unexcw.c @ 444:576fb035e263 r21-2-37

Import from CVS: tag r21-2-37

author	cvs
date	Mon, 13 Aug 2007 11:36:19 +0200
parents	abe6d1db359e
children	1ccc32a20af4

comparison

equal deleted inserted replaced

-:a8296e22da4e
+:576fb035e263
 #define ALLOC_UNIT 0xFFFF
 #define ALLOC_MASK ~((unsigned long)(ALLOC_UNIT))
 #define ALIGN_ALLOC(addr) \
 ((((unsigned long)addr) + ALLOC_UNIT) & ALLOC_MASK)
+/* Note that all sections must be aligned on a 0x1000 boundary so
+this is the minimum size that our dummy bss can be. */
+#define BSS_PAD_SIZE	0x1000
 /* To prevent zero-initialized variables from being placed into the bss
 section, use non-zero values to represent an uninitialized state.  */
 #define UNINIT_PTR ((void *) 0xF0A0F0A0)
 #define UNINIT_LONG (0xF0A0F0A0L)
 int i;
 void* empty_space;
 extern int static_heap_dumped;
 SCNHDR section;
-/* calculate new sizes f_ohdr.dsize is the total initialized data
+/* calculate new sizes:
-size on disk which is f_data.s_size + f_idata.s_size.
-f_ohdr.data_start is the base addres of all data and so should
+f_ohdr.dsize is the total initialized data size on disk which is
-not be changed. *.s_vaddr is the virtual address of the start
+f_data.s_size + f_idata.s_size.
-of the section normalzed from f_ohdr.ImageBase. *.s_paddr
-appears to be the number of bytes in the section actually used
+f_ohdr.data_start is the base addres of all data and so should
-(whereas *.s_size is aligned).
+not be changed.
+*.s_vaddr is the virtual address of the start of the section
+*normalized from f_ohdr.ImageBase.
+*.s_paddr appears to be the number of bytes in the section
+*actually used (whereas *.s_size is aligned).
 bsize is now 0 since subsumed into .data
 dsize is dsize + (f_data.s_vaddr - f_bss.s_vaddr)
 f_data.s_vaddr is f_bss.s_vaddr
 f_data.s_size is new dsize maybe.
 {
 new_bss_size = f_nextdata.s_vaddr - f_bss.s_vaddr;
 data_padding = (f_bss.s_vaddr - f_data.s_vaddr) - f_data.s_size;
 }
-file_sz_change=new_bss_size + data_padding;
+file_sz_change=(new_bss_size + data_padding) - BSS_PAD_SIZE;
 new_data_size=f_ohdr.dsize + file_sz_change;
 if (!sections_reversed)
 {
 f_data.s_vaddr = f_bss.s_vaddr;
 #endif
 f_data.s_size += file_sz_change;
 lseek (a_new, 0, SEEK_SET);
 /* write file header */
 f_hdr.f_symptr += file_sz_change;
-f_hdr.f_nscns--;
 printf("writing file header\n");
 if (write(a_new, &f_hdr, sizeof(f_hdr)) != sizeof(f_hdr))
 {
 PERROR("failed to write file header");
 }
 if (new_data_size < f_ohdr.dsize + f_ohdr.bsize )
 {
 PERROR("new data size is < approx");
 }
 f_ohdr.dsize=new_data_size;
-f_ohdr.bsize=0;
+f_ohdr.bsize=BSS_PAD_SIZE;
 if (write(a_new, &f_ohdr, sizeof(f_ohdr)) != sizeof(f_ohdr))
 {
 PERROR("failed to write optional header");
 }
 /* write text as is */
 if (write(a_new, &f_text, sizeof(f_text)) != sizeof(f_text))
 {
 PERROR("failed to write text header");
 }
+/* Write small bss section. */
+if (!sections_reversed)
+{
+f_bss.s_size = BSS_PAD_SIZE;
+f_bss.s_paddr = BSS_PAD_SIZE;
+f_bss.s_vaddr = f_data.s_vaddr - BSS_PAD_SIZE;
+if (write(a_new, &f_bss, sizeof(f_bss)) != sizeof(f_bss))
+	{
+	  PERROR("failed to write bss header");
+	}
+}
 /* write new data header */
 printf("writing .data header\n");
 if (write(a_new, &f_data, sizeof(f_data)) != sizeof(f_data))
 {
 PERROR("failed to write data header");
+}
+/* Write small bss section. */
+if (sections_reversed)
+{
+f_bss.s_size = BSS_PAD_SIZE;
+f_bss.s_paddr = BSS_PAD_SIZE;
+f_bss.s_vaddr = f_nextdata.s_vaddr - BSS_PAD_SIZE;
+if (write(a_new, &f_bss, sizeof(f_bss)) != sizeof(f_bss))
+	{
+	  PERROR("failed to write bss header");
+	}
 }
 printf("writing following data header\n");
 f_nextdata.s_scnptr += file_sz_change;
 if (f_nextdata.s_lnnoptr != 0) f_nextdata.s_lnnoptr += file_sz_change;
 	{
 	  PERROR("failed to write data header");
 	}
 }
-/* dump bss to maintain offsets */
-memset(&f_bss, 0, sizeof(f_bss));
-if (write(a_new, &f_bss, sizeof(f_bss)) != sizeof(f_bss))
-{
-PERROR("failed to write bss header");
-}
 size=lseek(a_new, 0, SEEK_CUR);
 CHECK_AOUT_POS(size);
 /* copy eveything else until start of data */
 size = f_data_s_scnptr - lseek (a_out, 0, SEEK_CUR);
 CHECK_AOUT_POS(f_data_s_scnptr);
 if (!sections_reversed)
 {
-/* dump bss + padding between sections */
+/* dump bss + padding between sections, sans small bss pad */
 printf ("dumping .bss into executable... %lx bytes\n", bss_size);
 if (write(a_new, bss_start, bss_size) != (int)bss_size)
 	{
 	  PERROR("failed to write bss section");
 	}
 /* pad, needs to be zero */
-bss_padding = new_bss_size - bss_size;
+bss_padding = (new_bss_size - bss_size) - BSS_PAD_SIZE;
+if (bss_padding < 0)
+	{
+	  PERROR("padded .bss too small");
+	}
 printf ("padding .bss ... %lx bytes\n", bss_padding);
 empty_space = malloc(bss_padding);
 memset(empty_space, 0, bss_padding);
 if (write(a_new, empty_space, bss_padding) != (int)bss_padding)
 	{
 size = f_nextdata_s_scnptr - size;
 dup_file_area(a_out, a_new, size);
 }
 else
 {
-/* need to bad to bss with data in file */
+/* need to pad to bss with data in file */
 printf ("padding .data ... %lx bytes\n", data_padding);
 size = (f_bss_s_vaddr - f_data_s_vaddr) - data_size;
 dup_file_area(a_out, a_new, size);
 /* dump bss + padding between sections */
 	{
 	  PERROR("failed to write bss section");
 	}
 /* pad, needs to be zero */
-bss_padding = new_bss_size - bss_size;
+bss_padding = (new_bss_size - bss_size) - BSS_PAD_SIZE;
+if (bss_padding < 0)
+	{
+	  PERROR("padded .bss too small");
+	}
 printf ("padding .bss ... %lx bytes\n", bss_padding);
 empty_space = malloc(bss_padding);
 memset(empty_space, 0, bss_padding);
 if (write(a_new, empty_space, bss_padding) != (int)bss_padding)
 	{

Mercurial > hg > xemacs-beta

comparison src/unexcw.c @ 444:576fb035e263 r21-2-37