History

tccpe: get rid of kludgy export-symbol sort

grischka committed 17 years ago

Commit dcfad3a1 parent 370cdeb1 file · +20 −13Browse files

Unified · Split

tccpe.c+20−13
@@ -755,10 +755,16 @@ ST_FN void pe_build_imports(struct pe_info *pe) · 754 unmodified lines
755755 *(int*)something
756756 */
757757
758+struct pe_sort_sym
759+{
760+ int index;
761+ const char *name;
762+};
763+
758764 ST_FN int sym_cmp(const void *va, const void *vb)
759765 {
760− const char *ca = ((const char **)va)[1];
761− const char *cb = ((const char **)vb)[1];
766+ const char *ca = (*(struct pe_sort_sym**)va)->name;
767+ const char *cb = (*(struct pe_sort_sym**)vb)->name;
762768 return strcmp(ca, cb);
763769 }
764770
@@ -768,7 +774,8 @@ ST_FN void pe_build_exports(struct pe_info *pe) · 3 unmodified lines
768774 int sym_index, sym_end;
769775 DWORD rva_base, func_o, name_o, ord_o, str_o;
770776 struct pe_export_header *hdr;
771− int sym_count, n, ord, *sorted, *sp;
777+ int sym_count, ord;
778+ struct pe_sort_sym **sorted, *p;
772779
773780 FILE *op;
774781 char buf[MAX_PATH];
@@ -776,7 +783,7 @@ ST_FN void pe_build_exports(struct pe_info *pe) · 1 unmodified line
776783 const char *name;
777784
778785 rva_base = pe->thunk->sh_addr - pe->imagebase;
779− sym_count = 0, n = 1, sorted = NULL, op = NULL;
786+ sym_count = 0, sorted = NULL, op = NULL;
780787
781788 sym_end = symtab_section->data_offset / sizeof(Elf32_Sym);
782789 for (sym_index = 1; sym_index < sym_end; ++sym_index) {
@@ -785,10 +792,11 @@ ST_FN void pe_build_exports(struct pe_info *pe) · 2 unmodified lines
785792 if ((sym->st_other & 1)
786793 /* export only symbols from actually written sections */
787794 && pe->s1->sections[sym->st_shndx]->sh_addr) {
788− dynarray_add((void***)&sorted, &sym_count, (void*)n);
789− dynarray_add((void***)&sorted, &sym_count, (void*)name);
795+ p = tcc_malloc(sizeof *p);
796+ p->index = sym_index;
797+ p->name = name;
798+ dynarray_add((void***)&sorted, &sym_count, p);
790799 }
791− ++n;
792800 #if 0
793801 if (sym->st_other & 1)
794802 printf("export: %s\n", name);
@@ -799,9 +807,9 @@ ST_FN void pe_build_exports(struct pe_info *pe) · 4 unmodified lines
799807
800808 if (0 == sym_count)
801809 return;
802− sym_count /= 2;
803810
804− qsort (sorted, sym_count, 2 * sizeof sorted[0], sym_cmp);
811+ qsort (sorted, sym_count, sizeof *sorted, sym_cmp);
812+
805813 pe_align_section(pe->thunk, 16);
806814 dllname = tcc_basename(pe->filename);
807815
@@ -836,9 +844,9 @@ ST_FN void pe_build_exports(struct pe_info *pe) · 28 unmodified lines
836844 }
837845 #endif
838846
839− for (sp = sorted, ord = 0; ord < sym_count; ++ord, sp += 2)
847+ for (ord = 0; ord < sym_count; ++ord)
840848 {
841− sym_index = sp[0], name = (const char *)sp[1];
849+ p = sorted[ord], sym_index = p->index, name = p->name;
842850 /* insert actual address later in pe_relocate_rva */
843851 put_elf_reloc(symtab_section, pe->thunk,
844852 func_o, R_386_RELATIVE, sym_index);
@@ -850,12 +858,11 @@ ST_FN void pe_build_exports(struct pe_info *pe) · 5 unmodified lines
850858 func_o += sizeof (DWORD);
851859 name_o += sizeof (DWORD);
852860 ord_o += sizeof (WORD);
853−
854861 if (op)
855862 fprintf(op, "%s\n", name);
856863 }
857864 pe->exp_size = pe->thunk->data_offset - pe->exp_offs;
858− tcc_free(sorted);
865+ dynarray_reset(&sorted, &sym_count);
859866 }
860867
861868 /* ------------------------------------------------------------- */

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t