WebSVN – Kolibri OS – Diff – /programs/develop/ktcc/trunk/source/tccpe.c

 /*
- *  TCCPE.C - PE file output for the TinyC Compiler
+ *  TCCPE.C - PE file output for the Tiny C Compiler
+ *
- *  Copyright (c) 2005 grischka
+ *  Copyright (c) 2005-2007 grischka
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-typedef unsigned char BYTE;
-typedef unsigned short WORD;
-typedef unsigned long DWORD;
+#include "tcc.h"
-#define ST static
+#ifndef _WIN32
+#define stricmp strcasecmp
+#define strnicmp strncasecmp
+#endif
+#ifndef MAX_PATH
+#define MAX_PATH 260
+#endif
+#define PE_MERGE_DATA
+/* #define PE_PRINT_SECTIONS */
+#ifdef TCC_TARGET_X86_64
+# define ADDR3264 ULONGLONG
+# define REL_TYPE_DIRECT R_X86_64_64
+# define R_XXX_THUNKFIX R_X86_64_PC32
+# define R_XXX_RELATIVE R_X86_64_RELATIVE
+# define IMAGE_FILE_MACHINE 0x8664
+# define RSRC_RELTYPE 3
+#elif defined TCC_TARGET_ARM
+# define ADDR3264 DWORD
+# define REL_TYPE_DIRECT R_ARM_ABS32
+# define R_XXX_THUNKFIX R_ARM_ABS32
+# define R_XXX_RELATIVE R_ARM_RELATIVE
+# define IMAGE_FILE_MACHINE 0x01C0
+# define RSRC_RELTYPE 7 /* ??? (not tested) */
+#elif defined TCC_TARGET_I386
+# define ADDR3264 DWORD
+# define REL_TYPE_DIRECT R_386_32
+# define R_XXX_THUNKFIX R_386_32
+# define R_XXX_RELATIVE R_386_RELATIVE
+# define IMAGE_FILE_MACHINE 0x014C
+# define RSRC_RELTYPE 7 /* DIR32NB */
+#endif
+#ifdef _WIN32
+void dbg_printf (const char *fmt, ...)
+{
+    char buffer[4000];
+    va_list arg;
+    int x;
+    va_start(arg, fmt);
+    x = vsprintf (buffer, fmt, arg);
+    strcpy(buffer+x, "\n");
+    OutputDebugString(buffer);
+}
+#endif
-/* XXX: move that to TCC ? */
+/* ----------------------------------------------------------- */
+#ifndef IMAGE_NT_SIGNATURE
+/* ----------------------------------------------------------- */
+/* definitions below are from winnt.h */
+typedef unsigned char BYTE;
+typedef unsigned short WORD;
-int verbose = 0;
+typedef unsigned int DWORD;
 typedef unsigned long long ULONGLONG;
-/* definitions below are from winnt.h */
+#pragma pack(push, 1)
-typedef struct _IMAGE_DOS_HEADER {	/* DOS .EXE header */
+typedef struct _IMAGE_DOS_HEADER {  /* DOS .EXE header */
-    WORD e_res[4];		/* Reserved words */
+    WORD e_res[4];        /* Reserved words */
-    WORD e_oemid;		/* OEM identifier (for e_oeminfo) */
+    WORD e_oemid;         /* OEM identifier (for e_oeminfo) */
-    WORD e_oeminfo;		/* OEM information; e_oemid specific */
+    WORD e_oeminfo;       /* OEM information; e_oemid specific */
-    WORD e_res2[10];		/* Reserved words */
+    WORD e_res2[10];      /* Reserved words */
-    DWORD e_lfanew;		/* File address of new exe header */
+    DWORD e_lfanew;        /* File address of new exe header */
-    BYTE e_code[0x40];
 } IMAGE_DOS_HEADER, *PIMAGE_DOS_HEADER;
-#define IMAGE_NT_SIGNATURE  0x00004550	/* PE00 */
+#define IMAGE_NT_SIGNATURE  0x00004550  /* PE00 */
-    DWORD SizeOfCode;
+    DWORD   SizeOfCode;
-    DWORD SizeOfInitializedData;
+    DWORD   SizeOfInitializedData;
-    DWORD SizeOfUninitializedData;
+    DWORD   SizeOfUninitializedData;
-    DWORD AddressOfEntryPoint;
+    DWORD   AddressOfEntryPoint;
-    DWORD BaseOfCode;
+    DWORD   BaseOfCode;
+#ifndef TCC_TARGET_X86_64
-    DWORD BaseOfData;
+    DWORD   BaseOfData;
+#endif
     /* NT additional fields. */
-    DWORD ImageBase;
+    ADDR3264 ImageBase;
-    DWORD SectionAlignment;
+    DWORD   SectionAlignment;
-    DWORD FileAlignment;
+    DWORD   FileAlignment;
-    WORD MajorOperatingSystemVersion;
+    WORD    MajorOperatingSystemVersion;
-    WORD MinorOperatingSystemVersion;
+    WORD    MinorOperatingSystemVersion;
-    WORD MajorImageVersion;
+    WORD    MajorImageVersion;
-    DWORD SizeOfImage;
+    DWORD   SizeOfImage;
-    DWORD SizeOfHeaders;
+    DWORD   SizeOfHeaders;
-    DWORD CheckSum;
+    DWORD   CheckSum;
-    WORD Subsystem;
+    WORD    Subsystem;
-    WORD DllCharacteristics;
+    WORD    DllCharacteristics;
-    DWORD SizeOfStackReserve;
+    ADDR3264 SizeOfStackReserve;
-    DWORD SizeOfStackCommit;
+    ADDR3264 SizeOfStackCommit;
-    DWORD SizeOfHeapReserve;
+    ADDR3264 SizeOfHeapReserve;
-    DWORD SizeOfHeapCommit;
+    ADDR3264 SizeOfHeapCommit;
-    DWORD LoaderFlags;
+    DWORD   LoaderFlags;
-    DWORD NumberOfRvaAndSizes;
+    DWORD   NumberOfRvaAndSizes;
     IMAGE_DATA_DIRECTORY DataDirectory[16];
-} IMAGE_OPTIONAL_HEADER32, *PIMAGE_OPTIONAL_HEADER32;
+} IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, IMAGE_OPTIONAL_HEADER;
-#define IMAGE_DIRECTORY_ENTRY_EXPORT          0	/* Export Directory */
+#define IMAGE_DIRECTORY_ENTRY_EXPORT          0   /* Export Directory */
-#define IMAGE_DIRECTORY_ENTRY_IMPORT          1	/* Import Directory */
+#define IMAGE_DIRECTORY_ENTRY_IMPORT          1   /* Import Directory */
-#define IMAGE_DIRECTORY_ENTRY_RESOURCE        2	/* Resource Directory */
+#define IMAGE_DIRECTORY_ENTRY_RESOURCE        2   /* Resource Directory */
-    DWORD Characteristics;
+    DWORD   Characteristics;
 } IMAGE_SECTION_HEADER, *PIMAGE_SECTION_HEADER;
+#define IMAGE_SIZEOF_SECTION_HEADER     40
+typedef struct _IMAGE_EXPORT_DIRECTORY {
+    DWORD Characteristics;
+    DWORD TimeDateStamp;
+    WORD MajorVersion;
+    WORD MinorVersion;
+    DWORD Name;
+    DWORD Base;
+    DWORD NumberOfFunctions;
+    DWORD NumberOfNames;
+    DWORD AddressOfFunctions;
-#define IMAGE_SIZEOF_SECTION_HEADER          40
+    DWORD AddressOfNames;
+    DWORD AddressOfNameOrdinals;
+} IMAGE_EXPORT_DIRECTORY,*PIMAGE_EXPORT_DIRECTORY;
+typedef struct _IMAGE_IMPORT_DESCRIPTOR {
+    union {
+        DWORD Characteristics;
+        DWORD OriginalFirstThunk;
+    };
+    DWORD TimeDateStamp;
+    DWORD ForwarderChain;
+    DWORD Name;
+    DWORD FirstThunk;
 } IMAGE_IMPORT_DESCRIPTOR;
 /* ----------------------------------------------------------- */
 typedef struct _IMAGE_BASE_RELOCATION {
-    DWORD VirtualAddress;
+    DWORD   VirtualAddress;
-    DWORD SizeOfBlock;
+    DWORD   SizeOfBlock;
-#define IMAGE_REL_BASED_HIGHADJ               4
+#define IMAGE_REL_BASED_HIGHADJ          4
-#define IMAGE_REL_BASED_MIPS_JMPADDR          5
+#define IMAGE_REL_BASED_MIPS_JMPADDR     5
-#define IMAGE_REL_BASED_SECTION               6
+#define IMAGE_REL_BASED_SECTION          6
-#define IMAGE_REL_BASED_REL32                 7
+#define IMAGE_REL_BASED_REL32            7
-/* ----------------------------------------------------------- */
+#pragma pack(pop)
-/* ----------------------------------------------------------- */
-IMAGE_DOS_HEADER pe_dos_hdr = {
-x5A4D,			/*WORD e_magic;         Magic number */
-x0090,			/*WORD e_cblp;          Bytes on last page of file */
-x0003,			/*WORD e_cp;            Pages in file */
-x0000,			/*WORD e_crlc;          Relocations */
-x0004,			/*WORD e_cparhdr;       Size of header in paragraphs */
-x0000,			/*WORD e_minalloc;      Minimum extra paragraphs needed */
-xFFFF,			/*WORD e_maxalloc;      Maximum extra paragraphs needed */
-x0000,			/*WORD e_ss;            Initial (relative) SS value */
-x00B8,			/*WORD e_sp;            Initial SP value */
-x0000,			/*WORD e_csum;          Checksum */
-x0000,			/*WORD e_ip;            Initial IP value */
-x0000,			/*WORD e_cs;            Initial (relative) CS value */
-x0040,			/*WORD e_lfarlc;        File address of relocation table */
-x0000,			/*WORD e_ovno;          Overlay number */
-    {0, 0, 0, 0},		/*WORD e_res[4];     Reserved words */
-x0000,			/*WORD e_oemid;         OEM identifier (for e_oeminfo) */
-x0000,			/*WORD e_oeminfo;       OEM information; e_oemid specific */
-    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0},	/*WORD e_res2[10];      Reserved words */
-x00000080,			/*DWORD   e_lfanew;        File address of new exe header */
-    {				/* 14 code bytes + "This program cannot be run in DOS mode.\r\r\n$" + 6 * 0x00 */
-     /*0040 */ 0x0e, 0x1f, 0xba, 0x0e, 0x00, 0xb4, 0x09, 0xcd, 0x21, 0xb8,
-x01, 0x4c, 0xcd, 0x21, 0x54, 0x68,
-     /*0050 */ 0x69, 0x73, 0x20, 0x70, 0x72, 0x6f, 0x67, 0x72, 0x61, 0x6d,
-x20, 0x63, 0x61, 0x6e, 0x6e, 0x6f,
-     /*0060 */ 0x74, 0x20, 0x62, 0x65, 0x20, 0x72, 0x75, 0x6e, 0x20, 0x69,
-x6e, 0x20, 0x44, 0x4f, 0x53, 0x20,
-     /*0070 */ 0x6d, 0x6f, 0x64, 0x65, 0x2e, 0x0d, 0x0d, 0x0a, 0x24, 0x00,
-x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-     /*0080 */
-     }
-};
-DWORD pe_magic = IMAGE_NT_SIGNATURE;
-IMAGE_FILE_HEADER pe_file_hdr = {
-x014C,			/*WORD    Machine; */
-x0003,			/*WORD    NumberOfSections; */
+/* ----------------------------------------------------------- */
-x00000000,			/*DWORD   TimeDateStamp; */
-x00000000,			/*DWORD   PointerToSymbolTable; */
-x00000000,			/*DWORD   NumberOfSymbols; */
-x00E0,			/*WORD    SizeOfOptionalHeader; */
-x030F			/*WORD    Characteristics; */
-};
+#endif /* ndef IMAGE_NT_SIGNATURE */
-IMAGE_OPTIONAL_HEADER32 pe_opt_hdr = {
-    /* Standard fields. */
-x010B,			/*WORD    Magic; */
-x06,			/*BYTE    MajorLinkerVersion; */
-x00,			/*BYTE    MinorLinkerVersion; */
-x00000000,			/*DWORD   SizeOfCode; */
-x00000000,			/*DWORD   SizeOfInitializedData; */
-x00000000,			/*DWORD   SizeOfUninitializedData; */
-x00000000,			/*DWORD   AddressOfEntryPoint; */
-x00000000,			/*DWORD   BaseOfCode; */
-x00000000,			/*DWORD   BaseOfData; */
-    /* NT additional fields. */
-x00400000,			/*DWORD   ImageBase; */
-x00001000,			/*DWORD   SectionAlignment; */
-x00000200,			/*DWORD   FileAlignment; */
-x0004,			/*WORD    MajorOperatingSystemVersion; */
-x0000,			/*WORD    MinorOperatingSystemVersion; */
-x0000,			/*WORD    MajorImageVersion; */
-x0000,			/*WORD    MinorImageVersion; */
-x0004,			/*WORD    MajorSubsystemVersion; */
-x0000,			/*WORD    MinorSubsystemVersion; */
-x00000000,			/*DWORD   Win32VersionValue; */
-x00000000,			/*DWORD   SizeOfImage; */
-x00000200,			/*DWORD   SizeOfHeaders; */
-x00000000,			/*DWORD   CheckSum; */
-x0002,			/*WORD    Subsystem; */
-x0000,			/*WORD    DllCharacteristics; */
-x00100000,			/*DWORD   SizeOfStackReserve; */
-x00001000,			/*DWORD   SizeOfStackCommit; */
-x00100000,			/*DWORD   SizeOfHeapReserve; */
-x00001000,			/*DWORD   SizeOfHeapCommit; */
+/* ----------------------------------------------------------- */
+#pragma pack(push, 1)
+struct pe_header
+{
-x00000000,			/*DWORD   LoaderFlags; */
+    IMAGE_DOS_HEADER doshdr;
+    BYTE dosstub[0x40];
-x00000010,			/*DWORD   NumberOfRvaAndSizes; */
+    DWORD nt_sig;
+    IMAGE_FILE_HEADER filehdr;
+#ifdef TCC_TARGET_X86_64
+    IMAGE_OPTIONAL_HEADER64 opthdr;
+#else
+#ifdef _WIN64
+    IMAGE_OPTIONAL_HEADER32 opthdr;
+#else
-    /* IMAGE_DATA_DIRECTORY DataDirectory[16]; */
+    IMAGE_OPTIONAL_HEADER opthdr;
-    {{0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0},
-     {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}}
-};
-/*----------------------------------------------------------------------------*/
+#endif
+#endif
-/*----------------------------------------------------------------------------*/
+};
-struct pe_import_header {
-    DWORD first_entry;
     DWORD time_date;
-    DWORD forwarder;
+struct pe_reloc_header {
-    DWORD lib_name_offset;
-    DWORD first_thunk;
-};
-struct pe_export_header {
-    DWORD Characteristics;
+    DWORD offset;
-    DWORD TimeDateStamp;
-    DWORD Version;
+    DWORD size;
-    DWORD Name;
-    DWORD Base;
-    DWORD NumberOfFunctions;
+};
-    DWORD NumberOfNames;
-    DWORD AddressOfFunctions;
+struct pe_rsrc_header {
-    DWORD AddressOfNames;
+    struct _IMAGE_FILE_HEADER filehdr;
+    struct _IMAGE_SECTION_HEADER sectionhdr;
-    DWORD AddressOfNameOrdinals;
+};
+struct pe_rsrc_reloc {
-};
+    DWORD offset;
     DWORD size;
+    WORD type;
-struct pe_reloc_header {
+};
-    DWORD offset;
-    DWORD size;
+#pragma pack(pop)
-};
+/* ------------------------------------------------------------- */
-/* ------------------------------------------------------------- */
+/* internal temporary structures */
-/* internal temporary structures */
+/*
-ST const char *pe_sec_names[] = {
+#define IMAGE_SCN_CNT_CODE                  0x00000020
-    ".text",
+#define IMAGE_SCN_CNT_INITIALIZED_DATA      0x00000040
-    ".data",
+#define IMAGE_SCN_CNT_UNINITIALIZED_DATA    0x00000080
-    ".bss",
+#define IMAGE_SCN_MEM_DISCARDABLE           0x02000000
-    ".rsrc",
+#define IMAGE_SCN_MEM_SHARED                0x10000000
+#define IMAGE_SCN_MEM_EXECUTE               0x20000000
+#define IMAGE_SCN_MEM_READ                  0x40000000
+#define IMAGE_SCN_MEM_WRITE                 0x80000000
-    ".reloc",
+*/
-    ".stab",
     ".stabstr"
-};
+enum {
+    sec_text = 0,
-enum {
+    sec_data ,
-    sec_text = 0,
+    sec_bss ,
-    sec_data,
+    sec_idata ,
-    sec_bss,
+    sec_pdata ,
-    sec_rsrc,
+    sec_other ,
+    sec_rsrc ,
+    sec_stab ,
+    sec_reloc ,
-    sec_reloc,
+    sec_last
-    sec_stab,
-    sec_stabstr,
+};
-    pe_sec_number
-};
+static const DWORD pe_sec_flags[] = {
 x60000020, /* ".text"     , */
-ST DWORD pe_flags[] = {
+xC0000040, /* ".data"     , */
-x60000020,			/* ".text", */
+xC0000080, /* ".bss"      , */
-xC0000040,			/* ".data", */
+x40000040, /* ".idata"    , */
-xC0000080,			/* ".bss", */
+x40000040, /* ".pdata"    , */
+xE0000060, /* < other >   , */
-x40000040,			/* ".rsrc", */
+x40000040, /* ".rsrc"     , */
-x42000040,			/* ".reloc", */
+x42000802, /* ".stab"     , */
+x42000040, /* ".reloc"    , */
-x42000802,			/* ".stab", */
+};
 x42000802			/* ".stabstr", */
-};
+struct section_info {
+    int cls, ord;
+    char name[32];
-struct section_info {
+    DWORD sh_addr;
-    struct section_info *next;
+    DWORD sh_size;
-    int id;
+    DWORD sh_flags;
-    DWORD sh_addr;
+    unsigned char *data;
-    DWORD sh_size;
+    DWORD data_size;
-    unsigned char *data;
+    IMAGE_SECTION_HEADER ish;
-    DWORD data_size;
+};
+struct import_symbol {
+    int sym_index;
-};
+    int iat_index;
+    int thk_offset;
 };
-struct import_symbol {
-    int sym_index;
+struct pe_import_info {
-    int offset;
+    int dll_index;
-};
+    int sym_count;
     struct import_symbol **symbols;
-struct pe_import_info {
+};
     int dll_index;
-    int sym_count;
+struct pe_info {
+    TCCState *s1;
+    Section *reloc;
+    Section *thunk;
-    struct import_symbol **symbols;
+    const char *filename;
-};
+    int type;
     DWORD sizeofheaders;
-struct pe_info {
+    ADDR3264 imagebase;
-    const char *filename;
-    DWORD sizeofheaders;
-    DWORD imagebase;
     DWORD start_addr;
-    DWORD imp_offs;
-    DWORD imp_size;
-    DWORD iat_offs;
-    DWORD iat_size;
-    DWORD exp_offs;
-    DWORD exp_size;
-    struct section_info sh_info[pe_sec_number];
-    int sec_count;
-    struct pe_import_info **imp_info;
-    int imp_count;
-    Section *reloc;
-    Section *thunk;
-    TCCState *s1;
+    DWORD imp_offs;
-};
+    DWORD imp_size;
     DWORD iat_offs;
-/* ------------------------------------------------------------- */
+    DWORD iat_size;
+    DWORD exp_offs;
+    DWORD exp_size;
+    int subsystem;
-#define PE_MERGE_DATA
+    DWORD section_align;
-// #define PE_PRINT_SECTIONS
+    DWORD file_align;
+    struct section_info *sec_info;
-#ifndef MAX_PATH
-#define MAX_PATH 260
+    int sec_count;
-#endif
-void error_noabort(const char *, ...);
-ST char pe_type;
-#define PE_NUL 0
-#define PE_DLL 1
-#define PE_GUI 2
+    struct pe_import_info **imp_info;
-#define PE_EXE 3
+    int imp_count;
 };
-ST int pe_find_import(TCCState * s1, const char *symbol, char *ret)
-{
-    int sym_index = find_elf_sym(s1->dynsymtab_section, symbol);
-    if (0 == sym_index) {
-	/* Hm, maybe it's '_symbol' instead of 'symbol' or '__imp__symbol' */
-	char buffer[100];
+#define PE_NUL 0
-	if (0 == memcmp(symbol, "__imp__", 7))
+#define PE_DLL 1
-	    symbol += 6;
+#define PE_GUI 2
-	else
-	    buffer[0] = '_', strcpy(buffer + 1, symbol), symbol = buffer;
+#define PE_EXE 3
-	sym_index = find_elf_sym(s1->dynsymtab_section, symbol);
-    }
-    if (ret)
+#define PE_RUN 4
-	strcpy(ret, symbol);
-    return sym_index;
+/* --------------------------------------------*/
-}
+static const char *pe_export_name(TCCState *s1, ElfW(Sym) *sym)
+{
-#ifdef WIN32
+    const char *name = symtab_section->link->data + sym->st_name;
-ST void **pe_imp;
+    if (s1->leading_underscore && name[0] == '_' && !(sym->st_other & ST_PE_STDCALL))
-ST int nb_pe_imp;
+        return name + 1;
+    return name;
+}
-void *resolve_sym(struct TCCState *s1, const char *symbol, int type)
-{
+static int pe_find_import(TCCState * s1, ElfW(Sym) *sym)
+{
-    char buffer[100], *p = buffer;
+    char buffer[200];
-    void *a = NULL;
+    const char *s, *p;
+    int sym_index = 0, n = 0;
-    int sym_index = pe_find_import(s1, symbol, p);
-    int dll_index;
+    do {
+        s = pe_export_name(s1, sym);
-    const char *dll_name;
+        if (n) {
+            /* second try: */
+	    if (sym->st_other & ST_PE_STDCALL) {
+                /* try w/0 stdcall deco (windows API convention) */
-    void *hm;
+	        p = strrchr(s, '@');
 	        if (!p || s[0] != '_')
-    if (sym_index) {
-	dll_index = ((Elf32_Sym *) s1->dynsymtab_section->data)[sym_index].
-	    st_other;
-        dll_name = s1->loaded_dlls[dll_index]->name;
-	hm = GetModuleHandleA(dll_name);
-        if (NULL == hm)
-            hm = LoadLibraryA(dll_name);
-        if (hm) {
-            a = GetProcAddress(hm, buffer);
-            if (a && STT_OBJECT == type) {
-                // need to return a pointer to the address for data objects
-                dynarray_add(&pe_imp, &nb_pe_imp, a);
+	            break;
-                a = &pe_imp[nb_pe_imp - 1];
-            }
-        }
-    }
-    return a;
-}
-#endif
-#define for_sym_in_symtab(sym) \
-for (sym = (Elf32_Sym *)symtab_section->data + 1; \
+	        strcpy(buffer, s+1)[p-s-1] = 0;
-	 sym < (Elf32_Sym *)(symtab_section->data + \
+	    } else if (s[0] != '_') { /* try non-ansi function */
-		symtab_section->data_offset); \
+	        buffer[0] = '_', strcpy(buffer + 1, s);
-	 ++sym)
+	    } else if (0 == memcmp(s, "__imp__", 7)) { /* mingw 2.0 */
 	        strcpy(buffer, s + 6);
-#define pe_set_datadir(dir,addr,size) \
+	    } else if (0 == memcmp(s, "_imp___", 7)) { /* mingw 3.7 */
-	pe_opt_hdr.DataDirectory[dir].VirtualAddress = addr, \
+	        strcpy(buffer, s + 6);
-	pe_opt_hdr.DataDirectory[dir].Size = size
+	    } else {
 	        break;
-/*----------------------------------------------------------------------------*/
+	    }
-ST void dynarray_reset(void ***pp, int *n)
+	    s = buffer;
+        }
-    int i;
+        sym_index = find_elf_sym(s1->dynsymtab_section, s);
-    for (i = 0; i < *n; ++i)
+        // printf("find (%d) %d %s\n", n, sym_index, s);
-	tcc_free((*pp)[i]);
+    } while (0 == sym_index && ++n < 2);
-    tcc_free(*pp);
+    return sym_index;
     *pp = NULL;
     *n = 0;
-}
+/*----------------------------------------------------------------------------*/
-ST int dynarray_assoc(void **pp, int n, int key)
-{
+static int dynarray_assoc(void **pp, int n, int key)
-    int i;
     for (i = 0; i < n; ++i, ++pp)
-	if (key == **(int **) pp)
+    int i;
-	    return i;
+    for (i = 0; i < n; ++i, ++pp)
-    return -1;
+    if (key == **(int **) pp)
         return i;
-#if 0
-ST DWORD umin(DWORD a, DWORD b)
-{
-    return a < b ? a : b;
-}
+    return -1;
 #endif
-ST DWORD umax(DWORD a, DWORD b)
+#if 0
 ST_FN DWORD umin(DWORD a, DWORD b)
     return a < b ? b : a;
+    return a < b ? a : b;
+}
+#endif
+static DWORD umax(DWORD a, DWORD b)
+{
+    return a < b ? b : a;
+}
+static DWORD pe_file_align(struct pe_info *pe, DWORD n)
+{
+    return (n + (pe->file_align - 1)) & ~(pe->file_align - 1);
+}
+static DWORD pe_virtual_align(struct pe_info *pe, DWORD n)
+{
+    return (n + (pe->section_align - 1)) & ~(pe->section_align - 1);
+}
+static void pe_align_section(Section *s, int a)
+{
+    int i = s->data_offset & (a-1);
+    if (i)
+        section_ptr_add(s, a - i);
+}
+static void pe_set_datadir(struct pe_header *hdr, int dir, DWORD addr, DWORD size)
+{
+    hdr->opthdr.DataDirectory[dir].VirtualAddress = addr;
+    hdr->opthdr.DataDirectory[dir].Size = size;
+}
+static int pe_fwrite(void *data, unsigned len, FILE *fp, DWORD *psum)
+{
+    if (psum) {
+        DWORD sum = *psum;
+        WORD *p = data;
+        int i;
+        for (i = len; i > 0; i -= 2) {
+            sum += (i >= 2) ? *p++ : *(BYTE*)p;
+            sum = (sum + (sum >> 16)) & 0xFFFF;
+        }
+        *psum = sum;
+    }
+    return len == fwrite(data, 1, len, fp) ? 0 : -1;
+}
+static void pe_fpad(FILE *fp, DWORD new_pos)
+{
+    DWORD pos = ftell(fp);
+    while (++pos <= new_pos)
+        fputc(0, fp);
+}
+/*----------------------------------------------------------------------------*/
+static int pe_write(struct pe_info *pe)
+{
+    static const struct pe_header pe_template = {
+    {
+    /* IMAGE_DOS_HEADER doshdr */
+x5A4D, /*WORD e_magic;         Magic number */
+x0090, /*WORD e_cblp;          Bytes on last page of file */
+x0003, /*WORD e_cp;            Pages in file */
-ST void pe_fpad(FILE * fp, DWORD new_pos)
+x0000, /*WORD e_crlc;          Relocations */
+x0004, /*WORD e_cparhdr;       Size of header in paragraphs */
+x0000, /*WORD e_minalloc;      Minimum extra paragraphs needed */
+xFFFF, /*WORD e_maxalloc;      Maximum extra paragraphs needed */
+x0000, /*WORD e_ss;            Initial (relative) SS value */
+x00B8, /*WORD e_sp;            Initial SP value */
+x0000, /*WORD e_csum;          Checksum */
+x0000, /*WORD e_ip;            Initial IP value */
+x0000, /*WORD e_cs;            Initial (relative) CS value */
+x0040, /*WORD e_lfarlc;        File address of relocation table */
+x0000, /*WORD e_ovno;          Overlay number */
+    {0,0,0,0}, /*WORD e_res[4];     Reserved words */
+x0000, /*WORD e_oemid;         OEM identifier (for e_oeminfo) */
+x0000, /*WORD e_oeminfo;       OEM information; e_oemid specific */
+    {0,0,0,0,0,0,0,0,0,0}, /*WORD e_res2[10];      Reserved words */
+x00000080  /*DWORD   e_lfanew;        File address of new exe header */
+    },{
+    /* BYTE dosstub[0x40] */
+    /* 14 code bytes + "This program cannot be run in DOS mode.\r\r\n$" + 6 * 0x00 */
+x0e,0x1f,0xba,0x0e,0x00,0xb4,0x09,0xcd,0x21,0xb8,0x01,0x4c,0xcd,0x21,0x54,0x68,
+x69,0x73,0x20,0x70,0x72,0x6f,0x67,0x72,0x61,0x6d,0x20,0x63,0x61,0x6e,0x6e,0x6f,
+x74,0x20,0x62,0x65,0x20,0x72,0x75,0x6e,0x20,0x69,0x6e,0x20,0x44,0x4f,0x53,0x20,
+x6d,0x6f,0x64,0x65,0x2e,0x0d,0x0d,0x0a,0x24,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+    },
+x00004550, /* DWORD nt_sig = IMAGE_NT_SIGNATURE */
+    {
+    /* IMAGE_FILE_HEADER filehdr */
+    IMAGE_FILE_MACHINE, /*WORD    Machine; */
+x0003, /*WORD    NumberOfSections; */
+x00000000, /*DWORD   TimeDateStamp; */
+x00000000, /*DWORD   PointerToSymbolTable; */
+x00000000, /*DWORD   NumberOfSymbols; */
+#if defined(TCC_TARGET_X86_64)
+x00F0, /*WORD    SizeOfOptionalHeader; */
+x022F  /*WORD    Characteristics; */
+#define CHARACTERISTICS_DLL 0x222E
+#elif defined(TCC_TARGET_I386)
+x00E0, /*WORD    SizeOfOptionalHeader; */
+x030F  /*WORD    Characteristics; */
+#define CHARACTERISTICS_DLL 0x230E
+#elif defined(TCC_TARGET_ARM)
+x00E0, /*WORD    SizeOfOptionalHeader; */
+x010F, /*WORD    Characteristics; */
+#define CHARACTERISTICS_DLL 0x230F
+#endif
+},{
+    /* IMAGE_OPTIONAL_HEADER opthdr */
+    /* Standard fields. */
+#ifdef TCC_TARGET_X86_64
+x020B, /*WORD    Magic; */
+#else
+x010B, /*WORD    Magic; */
+#endif
+x06, /*BYTE    MajorLinkerVersion; */
+x00, /*BYTE    MinorLinkerVersion; */
+x00000000, /*DWORD   SizeOfCode; */
+x00000000, /*DWORD   SizeOfInitializedData; */
+x00000000, /*DWORD   SizeOfUninitializedData; */
+x00000000, /*DWORD   AddressOfEntryPoint; */
+x00000000, /*DWORD   BaseOfCode; */
+#ifndef TCC_TARGET_X86_64
+x00000000, /*DWORD   BaseOfData; */
+#endif
+    /* NT additional fields. */
+#if defined(TCC_TARGET_ARM)
+x00100000,	    /*DWORD   ImageBase; */
+#else
+x00400000,	    /*DWORD   ImageBase; */
+#endif
+x00001000, /*DWORD   SectionAlignment; */
 x00000200, /*DWORD   FileAlignment; */
-    DWORD pos = ftell(fp);
+x0004, /*WORD    MajorOperatingSystemVersion; */
-    while (++pos <= new_pos)
+x0000, /*WORD    MinorOperatingSystemVersion; */
-	fputc(0, fp);
+x0000, /*WORD    MajorImageVersion; */
-}
+x0000, /*WORD    MinorImageVersion; */
 x0004, /*WORD    MajorSubsystemVersion; */
-ST DWORD pe_file_align(DWORD n)
+x0000, /*WORD    MinorSubsystemVersion; */
-{
+x00000000, /*DWORD   Win32VersionValue; */
-    return (n + (0x200 - 1)) & ~(0x200 - 1);
+x00000000, /*DWORD   SizeOfImage; */
 x00000200, /*DWORD   SizeOfHeaders; */
-ST DWORD pe_virtual_align(DWORD n)
-{
+x00000000, /*DWORD   CheckSum; */
-    return (n + (0x1000 - 1)) & ~(0x1000 - 1);
-}
+x0002, /*WORD    Subsystem; */
-ST void pe_align_section(Section * s, int a)
-{
-    int i = s->data_offset & (a - 1);
+x0000, /*WORD    DllCharacteristics; */
-    if (i)
+x00100000, /*DWORD   SizeOfStackReserve; */
-	section_ptr_add(s, a - i);
+x00001000, /*DWORD   SizeOfStackCommit; */
-}
+x00100000, /*DWORD   SizeOfHeapReserve; */
 x00001000, /*DWORD   SizeOfHeapCommit; */
-/*----------------------------------------------------------------------------*/
+x00000000, /*DWORD   LoaderFlags; */
-ST int pe_write_pe(struct pe_info *pe)
 x00000010, /*DWORD   NumberOfRvaAndSizes; */
+    /* IMAGE_DATA_DIRECTORY DataDirectory[16]; */
+    {{0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0},
-    int i;
+     {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}}
-    FILE *op;
+    }};
-    DWORD file_offset;
-    IMAGE_SECTION_HEADER ish[pe_sec_number], *psh;
+    struct pe_header pe_header = pe_template;
-    int sec_index = 0;
+    int i;
+    FILE *op;
-    op = fopen(pe->filename, "wb");
+    DWORD file_offset, sum;
-    if (NULL == op) {
+    struct section_info *si;
-	error_noabort("could not create file: %s", pe->filename);
+    IMAGE_SECTION_HEADER *psh;
 	return 1;
-    }
+    op = fopen(pe->filename, "wb");
+    if (NULL == op) {
-    memset(&ish, 0, sizeof ish);
+        tcc_error_noabort("could not write '%s': %s", pe->filename, strerror(errno));
         return -1;
-    pe->sizeofheaders = pe_file_align(sizeof pe_dos_hdr
-				      + sizeof pe_magic
+    }
-				      + sizeof pe_file_hdr
-				      + sizeof pe_opt_hdr
-				      +
-				      pe->sec_count *
-				      sizeof(IMAGE_SECTION_HEADER)
-	);
-    file_offset = pe->sizeofheaders;
-    pe_fpad(op, file_offset);
+    pe->sizeofheaders = pe_file_align(pe,
         sizeof (struct pe_header)
-    if (2 == verbose)
+        + pe->sec_count * sizeof (IMAGE_SECTION_HEADER)
-	printf("-------------------------------"
+        );
 	       "\n  virt   file   size  section" "\n");
+    file_offset = pe->sizeofheaders;
     for (i = 0; i < pe->sec_count; ++i) {
-	struct section_info *si = pe->sh_info + i;
+    if (2 == pe->s1->verbose)
-	const char *sh_name = pe_sec_names[si->id];
+        printf("-------------------------------"
-	unsigned long addr = si->sh_addr - pe->imagebase;
+               "\n  virt   file   size  section" "\n");
-	unsigned long size = si->sh_size;
+    for (i = 0; i < pe->sec_count; ++i) {
+        DWORD addr, size;
         const char *sh_name;
-	if (2 == verbose)
-	    printf("%6lx %6lx %6lx  %s\n",
+        si = pe->sec_info + i;
-		   addr, file_offset, size, sh_name);
+        sh_name = si->name;
+        addr = si->sh_addr - pe->imagebase;
+        size = si->sh_size;
+        psh = &si->ish;
+        if (2 == pe->s1->verbose)
+            printf("%6x %6x %6x  %s\n",
+                (unsigned)addr, (unsigned)file_offset, (unsigned)size, sh_name);
+        switch (si->cls) {
+            case sec_text:
+                pe_header.opthdr.BaseOfCode = addr;
+                pe_header.opthdr.AddressOfEntryPoint = addr + pe->start_addr;
+                break;
-	switch (si->id) {
-	case sec_text:
+            case sec_data:
-	    pe_opt_hdr.BaseOfCode = addr;
+#ifndef TCC_TARGET_X86_64
-	    pe_opt_hdr.AddressOfEntryPoint = addr + pe->start_addr;
+                pe_header.opthdr.BaseOfData = addr;
-	    break;
+#endif
+                break;
-	case sec_data:
 	    pe_opt_hdr.BaseOfData = addr;
-	    if (pe->imp_size) {
+            case sec_bss:
-		pe_set_datadir(IMAGE_DIRECTORY_ENTRY_IMPORT,
-			       pe->imp_offs + addr, pe->imp_size);
+                break;
 		pe_set_datadir(IMAGE_DIRECTORY_ENTRY_IAT,
-			       pe->iat_offs + addr, pe->iat_size);
             case sec_reloc:
-	    if (pe->exp_size) {
+                pe_set_datadir(&pe_header, IMAGE_DIRECTORY_ENTRY_BASERELOC, addr, size);
+                break;
+            case sec_rsrc:
+                pe_set_datadir(&pe_header, IMAGE_DIRECTORY_ENTRY_RESOURCE, addr, size);
+                break;
+            case sec_pdata:
+                pe_set_datadir(&pe_header, IMAGE_DIRECTORY_ENTRY_EXCEPTION, addr, size);
+                break;
+            case sec_stab:
+                break;
+        }
+        if (pe->thunk == pe->s1->sections[si->ord]) {
+            if (pe->imp_size) {
+                pe_set_datadir(&pe_header, IMAGE_DIRECTORY_ENTRY_IMPORT,
+                    pe->imp_offs + addr, pe->imp_size);
+                pe_set_datadir(&pe_header, IMAGE_DIRECTORY_ENTRY_IAT,
-		pe_set_datadir(IMAGE_DIRECTORY_ENTRY_EXPORT,
+                    pe->iat_offs + addr, pe->iat_size);
+            }
+            if (pe->exp_size) {
+                pe_set_datadir(&pe_header, IMAGE_DIRECTORY_ENTRY_EXPORT,
+                    pe->exp_offs + addr, pe->exp_size);
-			       pe->exp_offs + addr, pe->exp_size);
-	    }
-	    break;
+            }
-	case sec_bss:
-	    break;
-	case sec_reloc:
-	    pe_set_datadir(IMAGE_DIRECTORY_ENTRY_BASERELOC, addr, size);
-	    break;
-	case sec_rsrc:
+        }
-	    pe_set_datadir(IMAGE_DIRECTORY_ENTRY_RESOURCE, addr, size);
-	    break;
-	case sec_stab:
+        strncpy((char*)psh->Name, sh_name, sizeof psh->Name);
-	    break;
         psh->Characteristics = pe_sec_flags[si->cls];
-	case sec_stabstr:
+        psh->VirtualAddress = addr;
-	    break;
+        psh->Misc.VirtualSize = size;
         pe_header.opthdr.SizeOfImage =
             umax(pe_virtual_align(pe, size + addr), pe_header.opthdr.SizeOfImage);
 	psh = &ish[sec_index++];
+        if (si->data_size) {
-	strcpy((char *) psh->Name, sh_name);
+            psh->PointerToRawData = file_offset;
             file_offset = pe_file_align(pe, file_offset + si->data_size);
-	psh->Characteristics = pe_flags[si->id];
+            psh->SizeOfRawData = file_offset - psh->PointerToRawData;
 	psh->VirtualAddress = addr;
 	psh->Misc.VirtualSize = size;
 	pe_opt_hdr.SizeOfImage =
+    //pe_header.filehdr.TimeDateStamp = time(NULL);
+    pe_header.filehdr.NumberOfSections = pe->sec_count;
+    pe_header.opthdr.SizeOfHeaders = pe->sizeofheaders;
+    pe_header.opthdr.ImageBase = pe->imagebase;
-	    umax(psh->VirtualAddress + psh->Misc.VirtualSize,
-		 pe_opt_hdr.SizeOfImage);
-	if (si->data_size) {
+    pe_header.opthdr.Subsystem = pe->subsystem;
-	    psh->PointerToRawData = file_offset;
+    if (pe->s1->pe_stack_size)
-	    fwrite(si->data, 1, si->data_size, op);
+        pe_header.opthdr.SizeOfStackReserve = pe->s1->pe_stack_size;
-	    file_offset = pe_file_align(file_offset + si->data_size);
+    if (PE_DLL == pe->type)
-	    psh->SizeOfRawData = file_offset - psh->PointerToRawData;
+        pe_header.filehdr.Characteristics = CHARACTERISTICS_DLL;
-    dynarray_add((void ***) &pe->imp_info, &pe->imp_count, p);
+    dynarray_add((void***)&pe->imp_info, &pe->imp_count, p);
-  found_dll:
+found_dll:
-    i = dynarray_assoc((void **) p->symbols, p->sym_count, sym_index);
+    i = dynarray_assoc ((void**)p->symbols, p->sym_count, sym_index);
     if (-1 != i)
+        return p->symbols[i];
 	goto found_sym;
-    s = tcc_mallocz(sizeof *s);
-    s->sym_index = sym_index;
-    s->offset = offset;
+    s = tcc_mallocz(sizeof *s);
-    dynarray_add((void ***) &p->symbols, &p->sym_count, s);
+    dynarray_add((void***)&p->symbols, &p->sym_count, s);
-  found_sym:
+    s->sym_index = sym_index;
-    return 1;
+    return s;
+}
 /*----------------------------------------------------------------------------*/
-ST void pe_build_imports(struct pe_info *pe)
+static void pe_build_imports(struct pe_info *pe)
 {
     int thk_ptr, ent_ptr, dll_ptr, sym_cnt, i;
-    DWORD voffset = pe->thunk->sh_addr - pe->imagebase;
+    DWORD rva_base = pe->thunk->sh_addr - pe->imagebase;
     int ndlls = pe->imp_count;
-	return;
+        return;
     pe_align_section(pe->thunk, 16);
     pe->imp_offs = dll_ptr = pe->thunk->data_offset;
-    pe->imp_size = (ndlls + 1) * sizeof(struct pe_import_header);
+    pe->imp_size = (ndlls + 1) * sizeof(IMAGE_IMPORT_DESCRIPTOR);
     pe->iat_offs = dll_ptr + pe->imp_size;
-    pe->iat_size = (sym_cnt + ndlls) * sizeof(DWORD);
+    pe->iat_size = (sym_cnt + ndlls) * sizeof(ADDR3264);
-    section_ptr_add(pe->thunk, pe->imp_size + 2 * pe->iat_size);
+    section_ptr_add(pe->thunk, pe->imp_size + 2*pe->iat_size);
     thk_ptr = pe->iat_offs;
-    thk_ptr = pe->iat_offs;
+    ent_ptr = pe->iat_offs + pe->iat_size;
-    ent_ptr = pe->iat_offs + pe->iat_size;
+    for (i = 0; i < pe->imp_count; ++i) {
-    for (i = 0; i < pe->imp_count; ++i) {
+        IMAGE_IMPORT_DESCRIPTOR *hdr;
+        int k, n, dllindex;
+        ADDR3264 v;
+        struct pe_import_info *p = pe->imp_info[i];
+        const char *name;
+        DLLReference *dllref;
-	struct pe_import_header *hdr;
+        dllindex = p->dll_index;
+        if (dllindex)
-	int k, n, v;
+            name = (dllref = pe->s1->loaded_dlls[dllindex-1])->name;
-	struct pe_import_info *p = pe->imp_info[i];
-	const char *name = pe->s1->loaded_dlls[p->dll_index]->name;
         else
-	/* put the dll name into the import header */
-	if (0 == strncmp(name, "lib", 3))
+            name = "", dllref = NULL;
-	    name += 3;
-	v = put_elf_str(pe->thunk, name);
+        /* put the dll name into the import header */
+        v = put_elf_str(pe->thunk, name);
-	hdr = (struct pe_import_header *) (pe->thunk->data + dll_ptr);
+        hdr = (IMAGE_IMPORT_DESCRIPTOR*)(pe->thunk->data + dll_ptr);
-	hdr->first_thunk = thk_ptr + voffset;
+        hdr->FirstThunk = thk_ptr + rva_base;
-	hdr->first_entry = ent_ptr + voffset;
+        hdr->OriginalFirstThunk = ent_ptr + rva_base;
-	hdr->lib_name_offset = v + voffset;
+        hdr->Name = v + rva_base;
-	for (k = 0, n = p->sym_count; k <= n; ++k) {
-	    if (k < n) {
+        for (k = 0, n = p->sym_count; k <= n; ++k) {
-		DWORD offset = p->symbols[k]->offset;
-		int sym_index = p->symbols[k]->sym_index;
+            if (k < n) {
-		Elf32_Sym *sym =
-		    (Elf32_Sym *) pe->s1->dynsymtab_section->data +
-		    sym_index;
-		const char *name =
-		    pe->s1->dynsymtab_section->link->data + sym->st_name;
+                int iat_index = p->symbols[k]->iat_index;
-		if (offset & 0x80000000) {	/* ref to data */
-		    Elf32_Sym *sym =
-			&((Elf32_Sym *) symtab_section->
-			  data)[offset & 0x7FFFFFFF];
-		    sym->st_value = thk_ptr;
-		    sym->st_shndx = pe->thunk->sh_num;
-		} else {	/* ref to function */
+                int sym_index = p->symbols[k]->sym_index;
+                ElfW(Sym) *imp_sym = (ElfW(Sym) *)pe->s1->dynsymtab_section->data + sym_index;
+                ElfW(Sym) *org_sym = (ElfW(Sym) *)symtab_section->data + iat_index;
-		    char buffer[100];
+                const char *name = pe->s1->dynsymtab_section->link->data + imp_sym->st_name;
-		    sprintf(buffer, "IAT.%s", name);
+                int ordinal;
+                org_sym->st_value = thk_ptr;
+                org_sym->st_shndx = pe->thunk->sh_num;
+                if (dllref)
+                    v = 0, ordinal = imp_sym->st_value; /* ordinal from pe_load_def */
+                else
+                    ordinal = 0, v = imp_sym->st_value; /* address from tcc_add_symbol() */
 		    sym_index =
+#ifdef TCC_IS_NATIVE
+                if (pe->type == PE_RUN) {
+                    if (dllref) {
+                        if ( !dllref->handle )
+                            dllref->handle = LoadLibrary(dllref->name);
+                        v = (ADDR3264)GetProcAddress(dllref->handle, ordinal?(LPCSTR)NULL+ordinal:name);
+                    }
-			put_elf_sym(symtab_section, thk_ptr, sizeof(DWORD),
+                    if (!v)
-				    ELF32_ST_INFO(STB_GLOBAL, STT_OBJECT),
+                        tcc_error_noabort("can't build symbol '%s'", name);
-, pe->thunk->sh_num, buffer);
+                } else
+#endif
+                if (ordinal) {
                     v = ordinal | (ADDR3264)1 << (sizeof(ADDR3264)*8 - 1);
-		    put_elf_reloc(symtab_section, text_section, offset, R_386_32,	/*R_JMP_SLOT, */
+                } else {
-				  sym_index);
+                    v = pe->thunk->data_offset + rva_base;
+                    section_ptr_add(pe->thunk, sizeof(WORD)); /* hint, not used */
-		}
+                    put_elf_str(pe->thunk, name);
-		v = pe->thunk->data_offset + voffset;
+                }
-		section_ptr_add(pe->thunk, sizeof(WORD));	/* hint, not used */
-		put_elf_str(pe->thunk, name);
+            } else {
-	    } else {
+                v = 0; /* last entry is zero */
-		v = 0;		// last entry is zero
+            }
-	    }
-	    *(DWORD *) (pe->thunk->data + thk_ptr) =
+            *(ADDR3264*)(pe->thunk->data+thk_ptr) =
-		*(DWORD *) (pe->thunk->data + ent_ptr) = v;
+            *(ADDR3264*)(pe->thunk->data+ent_ptr) = v;
-	    thk_ptr += sizeof(DWORD);
+            thk_ptr += sizeof (ADDR3264);
-	    ent_ptr += sizeof(DWORD);
+            ent_ptr += sizeof (ADDR3264);
+        }
-	}
+        dll_ptr += sizeof(IMAGE_IMPORT_DESCRIPTOR);
-	dll_ptr += sizeof(struct pe_import_header);
+        dynarray_reset(&p->symbols, &p->sym_count);
+    }
-	dynarray_reset((void ***) &p->symbols, &p->sym_count);
+    dynarray_reset(&pe->imp_info, &pe->imp_count);
+}
-    }
+/* ------------------------------------------------------------- */
-    dynarray_reset((void ***) &pe->imp_info, &pe->imp_count);
+struct pe_sort_sym
-}
+{
     int index;
-/* ------------------------------------------------------------- */
+    const char *name;
-ST int sym_cmp(const void *va, const void *vb)
+};
-    Elf32_Sym *sa = (Elf32_Sym *)symtab_section->data + *(int*)va;
+static int sym_cmp(const void *va, const void *vb)
+{
-    Elf32_Sym *sb = (Elf32_Sym *)symtab_section->data + *(int*)vb;
+    const char *ca = (*(struct pe_sort_sym**)va)->name;
-    const char *ca = symtab_section->link->data + sa->st_name;
+    const char *cb = (*(struct pe_sort_sym**)vb)->name;
-    const char *cb = symtab_section->link->data + sb->st_name;
+    return strcmp(ca, cb);
+}
+static void pe_build_exports(struct pe_info *pe)
+{
+    ElfW(Sym) *sym;
+    int sym_index, sym_end;
-    return strcmp(ca, cb);
+    DWORD rva_base, func_o, name_o, ord_o, str_o;
-}
+    IMAGE_EXPORT_DIRECTORY *hdr;
+    int sym_count, ord;
-ST void pe_build_exports(struct pe_info *pe)
+    struct pe_sort_sym **sorted, *p;
+    FILE *op;
-{
+    char buf[MAX_PATH];
-    Elf32_Sym *sym;
+    const char *dllname;
-    DWORD func_offset, voffset;
-    struct pe_export_header *hdr;
+    const char *name;
-    int sym_count, n, ord, *sorted;
+    rva_base = pe->thunk->sh_addr - pe->imagebase;
+    sym_count = 0, sorted = NULL, op = NULL;
+    sym_end = symtab_section->data_offset / sizeof(ElfW(Sym));
+    for (sym_index = 1; sym_index < sym_end; ++sym_index) {
-    voffset = pe->thunk->sh_addr - pe->imagebase;
+        sym = (ElfW(Sym)*)symtab_section->data + sym_index;
+        name = pe_export_name(pe->s1, sym);
+        if ((sym->st_other & ST_PE_EXPORT)
+            /* export only symbols from actually written sections */
+            && pe->s1->sections[sym->st_shndx]->sh_addr) {
+            p = tcc_malloc(sizeof *p);
+            p->index = sym_index;
-    sym_count = 0, n = 1, sorted = NULL;
+            p->name = name;
             dynarray_add((void***)&sorted, &sym_count, p);
     // for simplicity only functions are exported
-    for_sym_in_symtab(sym)
+#if 0
+        if (sym->st_other & ST_PE_EXPORT)
             printf("export: %s\n", name);
+        if (sym->st_other & ST_PE_STDCALL)
-        if ((sym->st_other & 1)
+            printf("stdcall: %s\n", name);
-            && sym->st_shndx == text_section->sh_num)
+#endif
-            dynarray_add((void***)&sorted, &sym_count, (void*)n);
+    }
-        ++n;
-    }
+    if (0 == sym_count)
+        return;
     if (0 == sym_count)
-	return;
+    qsort (sorted, sym_count, sizeof *sorted, sym_cmp);
-    qsort (sorted, sym_count, sizeof sorted[0], sym_cmp);
+    pe_align_section(pe->thunk, 16);
-    pe_align_section(pe->thunk, 16);
+    dllname = tcc_basename(pe->filename);
     pe->exp_offs = pe->thunk->data_offset;
-    hdr = section_ptr_add(pe->thunk,
+    func_o = pe->exp_offs + sizeof(IMAGE_EXPORT_DIRECTORY);
-			  sizeof(struct pe_export_header) +
+    name_o = func_o + sym_count * sizeof (DWORD);
+    ord_o = name_o + sym_count * sizeof (DWORD);
+    str_o = ord_o + sym_count * sizeof(WORD);
+    hdr = section_ptr_add(pe->thunk, str_o - pe->exp_offs);
+    hdr->Characteristics        = 0;
+    hdr->Base                   = 1;
+    hdr->NumberOfFunctions      = sym_count;
+    hdr->NumberOfNames          = sym_count;
+    hdr->AddressOfFunctions     = func_o + rva_base;
+    hdr->AddressOfNames         = name_o + rva_base;
+    hdr->AddressOfNameOrdinals  = ord_o + rva_base;
+    hdr->Name                   = str_o + rva_base;
+    put_elf_str(pe->thunk, dllname);
-			  sym_count * (2 * sizeof(DWORD) + sizeof(WORD)));
+#if 1
     /* automatically write exports to .def */
-    func_offset = pe->exp_offs + sizeof(struct pe_export_header);
+    pstrcpy(buf, sizeof buf, pe->filename);
+    strcpy(tcc_fileextension(buf), ".def");
-    hdr->Characteristics = 0;
+    op = fopen(buf, "w");
-    hdr->Base = 1;
+    if (NULL == op) {
-    hdr->NumberOfFunctions = sym_count;
+        tcc_error_noabort("could not create '%s': %s", buf, strerror(errno));
-    hdr->NumberOfNames = sym_count;
+    } else {
-    hdr->AddressOfFunctions = func_offset + voffset;
+        fprintf(op, "LIBRARY %s\n\nEXPORTS\n", dllname);
-    hdr->AddressOfNames         = hdr->AddressOfFunctions + sym_count * sizeof(DWORD);
-    hdr->AddressOfNameOrdinals  = hdr->AddressOfNames + sym_count * sizeof(DWORD);
-    hdr->Name = pe->thunk->data_offset + voffset;
+        if (pe->s1->verbose)
-    put_elf_str(pe->thunk, tcc_basename(pe->filename));
+            printf("<- %s (%d symbols)\n", buf, sym_count);
+    }
+#endif
+    for (ord = 0; ord < sym_count; ++ord)
+    {
-    for (ord = 0; ord < sym_count; ++ord)
+        p = sorted[ord], sym_index = p->index, name = p->name;
         /* insert actual address later in pe_relocate_rva */
+        put_elf_reloc(symtab_section, pe->thunk,
+            func_o, R_XXX_RELATIVE, sym_index);
-        char *name; DWORD *p, *pfunc, *pname; WORD *pord;
+        *(DWORD*)(pe->thunk->data + name_o)
-        sym = (Elf32_Sym *)symtab_section->data + sorted[ord];
+            = pe->thunk->data_offset + rva_base;
-        name = symtab_section->link->data + sym->st_name;
+        *(WORD*)(pe->thunk->data + ord_o)
-        p = (DWORD*)(pe->thunk->data + func_offset);
+            = ord;
-        pfunc = p + ord;
-        pname = p + sym_count + ord;
+        put_elf_str(pe->thunk, name);
-        pord = (WORD *)(p + 2*sym_count) + ord;
+        func_o += sizeof (DWORD);
-        *pfunc = sym->st_value + pe->s1->sections[sym->st_shndx]->sh_addr - pe->imagebase;
+        name_o += sizeof (DWORD);
-	*pname = pe->thunk->data_offset + voffset;
+        ord_o += sizeof (WORD);
-        *pord  = ord;
+        if (op)
+            fprintf(op, "%s\n", name);
 	put_elf_str(pe->thunk, name);
-	/* printf("export: %s\n", name); */
+    pe->exp_size = pe->thunk->data_offset - pe->exp_offs;
+    dynarray_reset(&sorted, &sym_count);
     if (op)
-    pe->exp_size = pe->thunk->data_offset - pe->exp_offs;
+        fclose(op);
-    tcc_free(sorted);
+}
 /* ------------------------------------------------------------- */
-/* ------------------------------------------------------------- */
+static void pe_build_reloc (struct pe_info *pe)
 ST void pe_build_reloc(struct pe_info *pe, int *section_order,
-		       int section_count)
+    DWORD offset, block_ptr, addr;
     int count, i;
-    DWORD offset, block_ptr, addr;
+    ElfW_Rel *rel, *rel_end;
-    int count, i;
+    Section *s = NULL, *sr;
-		*wp = addr | IMAGE_REL_BASED_HIGHLOW << 12;
+                *wp = addr | IMAGE_REL_BASED_HIGHLOW<<12;
-		++count;
+                ++count;
-		continue;
+                continue;
+            }
-	    --rel;
+            -- rel;
-	} else if (i < section_count) {
+        } else if (i < pe->sec_count) {
-	    sr = (s = pe->s1->sections[section_order[i++]])->reloc;
+            sr = (s = pe->s1->sections[pe->sec_info[i++].ord])->reloc;
-	    if (sr) {
+            if (sr) {
-		rel = (Elf32_Rel *) sr->data;
+                rel = (ElfW_Rel *)sr->data;
-		rel_end = (Elf32_Rel *) (sr->data + sr->data_offset);
+                rel_end = (ElfW_Rel *)(sr->data + sr->data_offset);
+            }
-	    continue;
+            continue;
+        }
+        if (count) {
-	if (count) {		/* store the last block and ready for a new one */
+            /* store the last block and ready for a new one */
-	    struct pe_reloc_header *hdr;
+            struct pe_reloc_header *hdr;
-	    if (count & 1)
+            if (count & 1) /* align for DWORDS */
-		section_ptr_add(pe->reloc, 2), ++count;
+                section_ptr_add(pe->reloc, sizeof(WORD)), ++count;
-	    hdr = (struct pe_reloc_header *) (pe->reloc->data + block_ptr);
+            hdr = (struct pe_reloc_header *)(pe->reloc->data + block_ptr);
-	    hdr->offset = offset - pe->imagebase;
-	    hdr->size =
+            hdr -> offset = offset - pe->imagebase;
-		count * sizeof(WORD) + sizeof(struct pe_reloc_header);
+            hdr -> size = count * sizeof(WORD) + sizeof(struct pe_reloc_header);
-	    count = 0;
+            count = 0;
+        }
-	if (rel >= rel_end)
+        if (rel >= rel_end)
-	    break;
+            break;
+    }
+}
 /* ------------------------------------------------------------- */
+static int pe_section_class(Section *s)
+{
+    int type, flags;
+    const char *name;
+    type = s->sh_type;
+    flags = s->sh_flags;
+    name = s->name;
+    if (flags & SHF_ALLOC) {
+        if (type == SHT_PROGBITS) {
+            if (flags & SHF_EXECINSTR)
+                return sec_text;
+            if (flags & SHF_WRITE)
+                return sec_data;
+            if (0 == strcmp(name, ".rsrc"))
+                return sec_rsrc;
+            if (0 == strcmp(name, ".iedat"))
+                return sec_idata;
+            if (0 == strcmp(name, ".pdata"))
+                return sec_pdata;
+            return sec_other;
+        } else if (type == SHT_NOBITS) {
+            if (flags & SHF_WRITE)
+                return sec_bss;
+        }
+    } else {
+        if (0 == strcmp(name, ".reloc"))
+            return sec_reloc;
+        if (0 == strncmp(name, ".stab", 5)) /* .stab and .stabstr */
+            return sec_stab;
+    }
+    return -1;
+}
-ST int pe_assign_addresses(struct pe_info *pe)
+static int pe_assign_addresses (struct pe_info *pe)
+{
-    int i, k, n;
+    int i, k, o, c;
     DWORD addr;
+    int *section_order;
+    struct section_info *si;
+    Section *s;
+    // pe->thunk = new_section(pe->s1, ".iedat", SHT_PROGBITS, SHF_ALLOC);
+    section_order = tcc_malloc(pe->s1->nb_sections * sizeof (int));
+    for (o = k = 0 ; k < sec_last; ++k) {
+        for (i = 1; i < pe->s1->nb_sections; ++i) {
+            s = pe->s1->sections[i];
+            if (k == pe_section_class(s)) {
+                // printf("%s %d\n", s->name, k);
+                s->sh_addr = pe->imagebase;
+                section_order[o++] = i;
+            }
-    int section_order[pe_sec_number];
+        }
     struct section_info *si_data = NULL;
+    pe->sec_info = tcc_mallocz(o * sizeof (struct section_info));
+    addr = pe->imagebase + 1;
+    for (i = 0; i < o; ++i)
-    pe->imagebase = PE_DLL == pe_type ? 0x10000000 : 0x00400000;
+    {
-    addr = pe->imagebase + 1;
-    if (PE_DLL == pe_type)
-	pe->reloc = new_section(pe->s1, ".reloc", SHT_DYNAMIC, SHF_ALLOC);
-    for (n = k = 0; n < pe_sec_number; ++n) {
+        k = section_order[i];
-	for (i = 1; i < pe->s1->nb_sections; ++i) {
+        s = pe->s1->sections[k];
-	    Section *s = pe->s1->sections[i];
+        c = pe_section_class(s);
-	    if (0 == strcmp(s->name, pe_sec_names[n])) {
+        si = &pe->sec_info[pe->sec_count];
 		struct section_info *si = &pe->sh_info[pe->sec_count];
 #ifdef PE_MERGE_DATA
+        if (c == sec_bss && pe->sec_count && si[-1].cls == sec_data) {
-		if (n == sec_bss && si_data) {
+            /* append .bss to .data */
-		    /* append .bss to .data */
+            s->sh_addr = addr = ((addr-1) | (s->sh_addralign-1)) + 1;
+            addr += s->data_offset;
+            si[-1].sh_size = addr - si[-1].sh_addr;
-		    s->sh_addr = addr = ((addr - 1) | 15) + 1;
+            continue;
-		    addr += s->data_offset;
+        }
-		    si_data->sh_size = addr - si_data->sh_addr;
+#endif
-		} else
+        if (c == sec_stab && 0 == pe->s1->do_debug)
+            continue;
-#endif
+        strcpy(si->name, s->name);
         si->cls = c;
+        si->ord = k;
-		    si->sh_addr = s->sh_addr = addr =
+        si->sh_addr = s->sh_addr = addr = pe_virtual_align(pe, addr);
-			pe_virtual_align(addr);
+        si->sh_flags = s->sh_flags;
 		    si->id = n;
-		    if (n == sec_data) {
-			pe->thunk = s;
+        if (c == sec_data && NULL == pe->thunk)
+            pe->thunk = s;
+        if (s == pe->thunk) {
-			si_data = si;
+            pe_build_imports(pe);
+            pe_build_exports(pe);
-			pe_build_imports(pe);
+        }
 			pe_build_exports(pe);
-		    } else if (n == sec_reloc) {
+        if (c == sec_reloc)
-			pe_build_reloc(pe, section_order, k);
+            pe_build_reloc (pe);
         if (s->data_offset)
 		    if (s->data_offset) {
-			if (n != sec_bss) {
+            if (s->sh_type != SHT_NOBITS) {
-			    si->data = s->data;
+                si->data = s->data;
-			    si->data_size = s->data_offset;
+                si->data_size = s->data_offset;
+            }
+            addr += s->data_offset;
+            si->sh_size = s->data_offset;
-			}
+            ++pe->sec_count;
+        }
+        // printf("%08x %05x %s\n", si->sh_addr, si->sh_size, si->name);
+    }
+#if 0
+    for (i = 1; i < pe->s1->nb_sections; ++i) {
+        Section *s = pe->s1->sections[i];
+        int type = s->sh_type;
+        int flags = s->sh_flags;
+        printf("section %-16s %-10s %5x %s,%s,%s\n",
+            s->name,
+            type == SHT_PROGBITS ? "progbits" :
+            type == SHT_NOBITS ? "nobits" :
             type == SHT_SYMTAB ? "symtab" :
+            type == SHT_STRTAB ? "strtab" :
+            type == SHT_RELX ? "rel" : "???",
+            s->data_offset,
+            flags & SHF_ALLOC ? "alloc" : "",
+            flags & SHF_WRITE ? "write" : "",
+            flags & SHF_EXECINSTR ? "exec" : ""
+            );
+    }
+    pe->s1->verbose = 2;
+#endif
+    tcc_free(section_order);
+    return 0;
+}
+/* ------------------------------------------------------------- */
+static void pe_relocate_rva (struct pe_info *pe, Section *s)
+{
+    Section *sr = s->reloc;
+    ElfW_Rel *rel, *rel_end;
+    rel_end = (ElfW_Rel *)(sr->data + sr->data_offset);
+    for(rel = (ElfW_Rel *)sr->data; rel < rel_end; rel++) {
+        if (ELFW(R_TYPE)(rel->r_info) == R_XXX_RELATIVE) {
-			addr += s->data_offset;
+            int sym_index = ELFW(R_SYM)(rel->r_info);
-			si->sh_size = s->data_offset;
+            DWORD addr = s->sh_addr;
+            if (sym_index) {
+                ElfW(Sym) *sym = (ElfW(Sym) *)symtab_section->data + sym_index;
+                addr = sym->st_value;
+            }
+            // printf("reloc rva %08x %08x %s\n", (DWORD)rel->r_offset, addr, s->name);
+            *(DWORD*)(s->data + rel->r_offset) += addr - pe->imagebase;
+        }
+    }
+}
+/*----------------------------------------------------------------------------*/
+static int pe_isafunc(int sym_index)
+{
+    Section *sr = text_section->reloc;
-			++pe->sec_count;
+    ElfW_Rel *rel, *rel_end;
     Elf32_Word info = ELF32_R_INFO(sym_index, R_386_PC32);
-		    //printf("Section %08X %04X %s\n", si->sh_addr, si->data_size, s->name);
+    if (!sr)
-		}
+        return 0;
-		section_order[k] = i, ++k;
+    rel_end = (ElfW_Rel *)(sr->data + sr->data_offset);
-	    }
+    for (rel = (ElfW_Rel *)sr->data; rel < rel_end; rel++)
+        if (rel->r_info == info)
             return 1;
     return 0;
+}
-    return 0;
+/*----------------------------------------------------------------------------*/
+static int pe_check_symbols(struct pe_info *pe)
+{
+    ElfW(Sym) *sym;
+    int sym_index, sym_end;
-/*----------------------------------------------------------------------------*/
+    int ret = 0;
-ST int pe_check_symbols(struct pe_info *pe)
+    pe_align_section(text_section, 8);
+    sym_end = symtab_section->data_offset / sizeof(ElfW(Sym));
+    for (sym_index = 1; sym_index < sym_end; ++sym_index) {
+        sym = (ElfW(Sym) *)symtab_section->data + sym_index;
+        if (sym->st_shndx == SHN_UNDEF) {
+            const char *name = symtab_section->link->data + sym->st_name;
-{
+            unsigned type = ELFW(ST_TYPE)(sym->st_info);
+            int imp_sym = pe_find_import(pe->s1, sym);
+            struct import_symbol *is;
+            if (0 == imp_sym)
+                goto not_found;
     Elf32_Sym *sym;
-    int ret = 0;
+            if (type == STT_NOTYPE) {
+                /* symbols from assembler have no type, find out which */
+                if (pe_isafunc(sym_index))
+                    type = STT_FUNC;
+                else
+                    type = STT_OBJECT;
+            }
+            is = pe_add_import(pe, imp_sym);
     pe_align_section(text_section, 8);
+            if (type == STT_FUNC) {
+                unsigned long offset = is->thk_offset;
+                if (offset) {
+                    /* got aliased symbol, like stricmp and _stricmp */
+                } else {
-    for_sym_in_symtab(sym) {
+                    char buffer[100];
+                    WORD *p;
+                    offset = text_section->data_offset;
+                    /* add the 'jmp IAT[x]' instruction */
+#ifdef TCC_TARGET_ARM
+                    p = section_ptr_add(text_section, 8+4); // room for code and address
+                    (*(DWORD*)(p)) = 0xE59FC000; // arm code ldr ip, [pc] ; PC+8+0 = 0001xxxx
+                    (*(DWORD*)(p+2)) = 0xE59CF000; // arm code ldr pc, [ip]
+#else
+                    p = section_ptr_add(text_section, 8);
+                    *p = 0x25FF;
+#ifdef TCC_TARGET_X86_64
+                    *(DWORD*)(p+1) = (DWORD)-4;
+#endif
+#endif
+                    /* add a helper symbol, will be patched later in
+                       pe_build_imports */
+                    sprintf(buffer, "IAT.%s", name);
+                    is->iat_index = put_elf_sym(
-	if (sym->st_shndx == SHN_UNDEF) {
+                        symtab_section, 0, sizeof(DWORD),
+                        ELFW(ST_INFO)(STB_GLOBAL, STT_OBJECT),
+, SHN_UNDEF, buffer);
-	    const char *symbol = symtab_section->link->data + sym->st_name;
+#ifdef TCC_TARGET_ARM
+                    put_elf_reloc(symtab_section, text_section,
+                        offset + 8, R_XXX_THUNKFIX, is->iat_index); // offset to IAT position
-	    unsigned type = ELF32_ST_TYPE(sym->st_info);
+#else
+                    put_elf_reloc(symtab_section, text_section,
+                        offset + 2, R_XXX_THUNKFIX, is->iat_index);
-	    int sym_index = pe_find_import(pe->s1, symbol, NULL);
+#endif
-	    if (sym_index) {
+                    is->thk_offset = offset;
+                }
-		if (type == STT_FUNC) {
-		    unsigned long offset = text_section->data_offset;
+                /* tcc_realloc might have altered sym's address */
-		    if (pe_add_import(pe, sym_index, offset + 2)) {
-			/* add the 'jmp IAT[x]' instruction */
+                sym = (ElfW(Sym) *)symtab_section->data + sym_index;
-			*(WORD *) section_ptr_add(text_section, 8) =
-x25FF;
+                /* patch the original symbol */
-			/* patch the symbol */
+                sym->st_value = offset;
-			sym->st_shndx = text_section->sh_num;
+                sym->st_shndx = text_section->sh_num;
+                sym->st_other &= ~ST_PE_EXPORT; /* do not export */
+                continue;
-			sym->st_value = offset;
+            }
-			continue;
-		    }
+            if (type == STT_OBJECT) { /* data, ptr to that should be */
-		} else if (type == STT_OBJECT) {	/* data, ptr to that should be */
+                if (0 == is->iat_index) {
-		    if (pe_add_import(pe, sym_index,
+                    /* original symbol will be patched later in pe_build_imports */
-				      (sym -
+                    is->iat_index = sym_index;
-				      (Elf32_Sym *) symtab_section->data) |
+                    continue;
 x80000000))
 			continue;
         not_found:
-	    error_noabort("undefined symbol '%s'", symbol);
+            tcc_error_noabort("undefined symbol '%s'", name);
-	    ret = 1;
+            ret = -1;
-	} else
+        } else if (pe->s1->rdynamic
-	    if (pe->s1->rdynamic
+                   && ELFW(ST_BIND)(sym->st_info) != STB_LOCAL) {
-		&& ELF32_ST_BIND(sym->st_info) != STB_LOCAL) {
+            /* if -rdynamic option, then export all non local symbols */
-	    /* if -rdynamic option, then export all non local symbols */
+            sym->st_other |= ST_PE_EXPORT;
 	    sym->st_other |= 1;
+    }
     return ret;
     fprintf(f, "section  \"%s\"", s->name);
     if (s->link)
-	fprintf(f, "\nlink     \"%s\"", s->link->name);
+        fprintf(f, "\nlink     \"%s\"", s->link->name);
     if (s->reloc)
-	fprintf(f, "\nreloc    \"%s\"", s->reloc->name);
+        fprintf(f, "\nreloc    \"%s\"", s->reloc->name);
-    fprintf(f, "\nv_addr   %08X", s->sh_addr);
+    fprintf(f, "\nv_addr   %08X", (unsigned)s->sh_addr);
-    fprintf(f, "\ncontents %08X", l);
+    fprintf(f, "\ncontents %08X", (unsigned)l);
     fprintf(f, "\n\n");
     if (s->sh_type == SHT_NOBITS)
+        return;
+    if (0 == l)
-	return;
+        return;
     if (s->sh_type == SHT_SYMTAB)
-	m = sizeof(Elf32_Sym);
+        m = sizeof(ElfW(Sym));
-    if (s->sh_type == SHT_REL)
+    else if (s->sh_type == SHT_RELX)
-	m = sizeof(Elf32_Rel);
+        m = sizeof(ElfW_Rel);
+    else
+        m = 16;
+    fprintf(f, "%-8s", "offset");
+    for (i = 0; i < m; ++i)
+        fprintf(f, " %02x", i);
+    n = 56;
+    if (s->sh_type == SHT_SYMTAB || s->sh_type == SHT_RELX) {
+        const char *fields1[] = {
+            "name",
+            "value",
+            "size",
+            "bind",
+            "type",
+            "other",
+            "shndx",
+            NULL
+        };
+        const char *fields2[] = {
+            "offs",
+            "type",
+            "symb",
+            NULL
+        };
+        const char **p;
+        if (s->sh_type == SHT_SYMTAB)
+            p = fields1, n = 106;
+        else
+            p = fields2, n = 58;
+        for (i = 0; p[i]; ++i)
+            fprintf(f, "%6s", p[i]);
+        fprintf(f, "  symbol");
+    }
+    fprintf(f, "\n");
+    for (i = 0; i < n; ++i)
-    else
+        fprintf(f, "-");
+    fprintf(f, "\n");
 	m = 16;
     for (i = 0; i < l;)
     for (i = 0; i < l;) {
-	fprintf(f, "%08X", i);
+        fprintf(f, "%08X", i);
-	for (n = 0; n < m; ++n) {
+        for (n = 0; n < m; ++n) {
-	    if (n + i < l)
+            if (n + i < l)
-		fprintf(f, " %02X", p[i + n]);
+                fprintf(f, " %02X", p[i + n]);
-	    else
+            else
-		fprintf(f, "   ");
+                fprintf(f, "   ");
+        }
-	if (s->sh_type == SHT_SYMTAB) {
-	    Elf32_Sym *sym = (Elf32_Sym *) (p + i);
-	    const char *name = s->link->data + sym->st_name;
-	    fprintf(f,
+        if (s->sh_type == SHT_SYMTAB) {
-		    "  name:%04X"
-		    "  value:%04X"
-		    "  size:%04X"
+            ElfW(Sym) *sym = (ElfW(Sym) *) (p + i);
-		    "  bind:%02X"
-		    "  type:%02X"
+            const char *name = s->link->data + sym->st_name;
-		    "  other:%02X"
+            fprintf(f, "  %04X  %04X  %04X   %02X    %02X    %02X   %04X  \"%s\"",
-		    "  shndx:%04X"
+                    (unsigned)sym->st_name,
-		    "  \"%s\"",
+                    (unsigned)sym->st_value,
-		    sym->st_name,
+                    (unsigned)sym->st_size,
-		    sym->st_value,
+                    (unsigned)ELFW(ST_BIND)(sym->st_info),
+                    (unsigned)ELFW(ST_TYPE)(sym->st_info),
-		    sym->st_size,
+                    (unsigned)sym->st_other,
-		    ELF32_ST_BIND(sym->st_info),
+                    (unsigned)sym->st_shndx,
-		    ELF32_ST_TYPE(sym->st_info),
+                    name);
-		    sym->st_other, sym->st_shndx, name);
-	} else if (s->sh_type == SHT_REL) {
+        } else if (s->sh_type == SHT_RELX) {
-	    Elf32_Rel *rel = (Elf32_Rel *) (p + i);
-	    Elf32_Sym *sym =
+            ElfW_Rel *rel = (ElfW_Rel *) (p + i);
-		(Elf32_Sym *) s->link->data + ELF32_R_SYM(rel->r_info);
-	    const char *name = s->link->link->data + sym->st_name;
+            ElfW(Sym) *sym =
-	    fprintf(f,
-		    "  offset:%04X"
+                (ElfW(Sym) *) s->link->data + ELFW(R_SYM)(rel->r_info);
-		    "  type:%02X"
+            const char *name = s->link->link->data + sym->st_name;
-		    "  symbol:%04X"
+            fprintf(f, "  %04X   %02X   %04X  \"%s\"",
-		    "  \"%s\"",
+                    (unsigned)rel->r_offset,
-		    rel->r_offset,
+                    (unsigned)ELFW(R_TYPE)(rel->r_info),
-		    ELF32_R_TYPE(rel->r_info),
+                    (unsigned)ELFW(R_SYM)(rel->r_info),
-		    ELF32_R_SYM(rel->r_info), name);
+                    name);
-	} else {
+        } else {
-	i += m;
+        i += m;
-	fprintf(f, "\n");
+        fprintf(f, "\n");
+    }
     fprintf(f, "\n\n");
+}
+static void pe_print_sections(TCCState *s1, const char *fname)
+{
+    Section *s;
+    FILE *f;
+    int i;
+    f = fopen(fname, "w");
+    for (i = 1; i < s1->nb_sections; ++i) {
+        s = s1->sections[i];
+        pe_print_section(f, s);
+    }
+    pe_print_section(f, s1->dynsymtab_section);
+    fclose(f);
+}
 #endif
+/* ------------------------------------------------------------- */
+/* helper function for load/store to insert one more indirection */
-static int pe_test_cmd(const char **pp, const char *cmd)
+ST_FUNC SValue *pe_getimport(SValue *sv, SValue *v2)
 {
-    const char *p;
+    Sym *sym;
-    char *q, buf[16];
+    ElfW(Sym) *esym;
+    int r2;
+    if ((sv->r & (VT_VALMASK|VT_SYM)) != (VT_CONST|VT_SYM) || (sv->r2 != VT_CONST))
+        return sv;
+    sym = sv->sym;
+    if ((sym->type.t & (VT_EXTERN|VT_STATIC)) != VT_EXTERN)
+        return sv;
+    if (!sym->c)
+        put_extern_sym(sym, NULL, 0, 0);
+    esym = &((ElfW(Sym) *)symtab_section->data)[sym->c];
+    if (!(esym->st_other & ST_PE_IMPORT))
+        return sv;
+    // printf("import %04x %04x %04x %s\n", sv->type.t, sym->type.t, sv->r, get_tok_str(sv->sym->v, NULL));
+    memset(v2, 0, sizeof *v2);
+    v2->type.t = VT_PTR;
+    v2->r = VT_CONST | VT_SYM | VT_LVAL;
+    v2->sym = sv->sym;
+    r2 = get_reg(RC_INT);
+    load(r2, v2);
+    v2->r = r2;
+    if ((uint32_t)sv->c.i) {
+        vpushv(v2);
+        vpushi(sv->c.i);
+        gen_opi('+');
+        *v2 = *vtop--;
+    }
+    v2->type.t = sv->type.t;
+    v2->r |= sv->r & VT_LVAL;
+    return v2;
+}
+ST_FUNC int pe_putimport(TCCState *s1, int dllindex, const char *name, addr_t value)
+{
+    return add_elf_sym(
+        s1->dynsymtab_section,
+        value,
+        dllindex, /* st_size */
+        ELFW(ST_INFO)(STB_GLOBAL, STT_NOTYPE),
+,
+        value ? SHN_ABS : SHN_UNDEF,
+        name
+        );
+}
+static int add_dllref(TCCState *s1, const char *dllname)
-    int ret;
+{
+    DLLReference *dllref;
+    int i;
+    for (i = 0; i < s1->nb_loaded_dlls; ++i)
+        if (0 == strcmp(s1->loaded_dlls[i]->name, dllname))
+            return i + 1;
+    dllref = tcc_mallocz(sizeof(DLLReference) + strlen(dllname));
+    strcpy(dllref->name, dllname);
+    dynarray_add((void ***) &s1->loaded_dlls, &s1->nb_loaded_dlls, dllref);
+    return s1->nb_loaded_dlls;
+}
+/* ------------------------------------------------------------- */
+static int read_mem(int fd, unsigned offset, void *buffer, unsigned len)
+{
+    lseek(fd, offset, SEEK_SET);
+    return len == read(fd, buffer, len);
+}
+/* -------------------------------------------------------------
+ *  This is for compiled windows resources in 'coff' format
+ *  as generated by 'windres.exe -O coff ...'.
+ */
+static int pe_load_res(TCCState *s1, int fd)
+{
+    struct pe_rsrc_header hdr;
+    Section *rsrc_section;
+    int i, ret = -1;
+    BYTE *ptr;
-    p = *pp;
+    unsigned offs;
+    if (!read_mem(fd, 0, &hdr, sizeof hdr))
+        goto quit;
-    q = buf;
+    if (hdr.filehdr.Machine != IMAGE_FILE_MACHINE
-    while (*p != '\0' && !is_space(*p)) {
+        || hdr.filehdr.NumberOfSections != 1
+        || strcmp(hdr.sectionhdr.Name, ".rsrc") != 0)
+        goto quit;
+    rsrc_section = new_section(s1, ".rsrc", SHT_PROGBITS, SHF_ALLOC);
+    ptr = section_ptr_add(rsrc_section, hdr.sectionhdr.SizeOfRawData);
-        if ((q - buf) < sizeof(buf) - 1)
+    offs = hdr.sectionhdr.PointerToRawData;
+    if (!read_mem(fd, offs, ptr, hdr.sectionhdr.SizeOfRawData))
+        goto quit;
-            *q++ = toup(*p);
+    offs = hdr.sectionhdr.PointerToRelocations;
+    for (i = 0; i < hdr.sectionhdr.NumberOfRelocations; ++i)
+    {
+        struct pe_rsrc_reloc rel;
+        if (!read_mem(fd, offs, &rel, sizeof rel))
+            goto quit;
-        p++;
+        // printf("rsrc_reloc: %x %x %x\n", rel.offset, rel.size, rel.type);
+        if (rel.type != RSRC_RELTYPE)
+            goto quit;
-    }
+        put_elf_reloc(symtab_section, rsrc_section,
+            rel.offset, R_XXX_RELATIVE, 0);
-    *q = '\0';
+        offs += sizeof rel;
+    }
-    ret = !strcmp(buf, cmd);
+    ret = 0;
-    *pp = p;
+quit:
     return ret;
+}
-}
 /* ------------------------------------------------------------- */
-/* ------------------------------------------------------------- */
-int pe_load_def_file(TCCState * s1, FILE * fp)
+#ifndef TCC_TARGET_MEOS
-{
+static int pe_load_def(TCCState *s1, int fd)
-    DLLReference *dllref;
+{
+    int state = 0, ret = -1, dllindex = 0, ord;
-    int f = 0, sym_index;
+    char line[400], dllname[80], *p, *x;
-    char *p, line[120], dllname[40];
+    FILE *fp;
-    while (fgets(line, sizeof line, fp)) {
-	//p = strchr(line, 0);
-	while (p > line && p[-1] <= ' ')
+    fp = fdopen(dup(fd), "rb");
-	    --p;
+    while (fgets(line, sizeof line, fp))
-	*p = 0;
+    {
-	p = line;
-	while (*p && *p <= ' ')
+        p = trimfront(trimback(line, strchr(line, 0)));
-	    ++p;
+        if (0 == *p || ';' == *p)
+            continue;
-	if (*p && ';' != *p)
-	    switch (f) {
-	    case 0:
-                if (!pe_test_cmd((const char **)&p, "LIBRARY"))
+        switch (state) {
-		    return -1;
+        case 0:
-                while (is_space(*p))
+            if (0 != strnicmp(p, "LIBRARY", 7))
-                    p++;
+                goto quit;
-		pstrcpy(dllname, sizeof(dllname), p);
+            pstrcpy(dllname, sizeof dllname, trimfront(p+7));
-		++f;
+            ++state;
-		continue;
+            continue;
-	    case 1:
+        case 1:
-                if (!pe_test_cmd((const char **)&p, "EXPORTS"))
-		    return -1;
-		++f;
+            if (0 != stricmp(p, "EXPORTS"))
-		continue;
+                goto quit;
-	    case 2:
+            ++state;
-		dllref =
-		    tcc_malloc(sizeof(DLLReference) + strlen(dllname));
-		strcpy(dllref->name, dllname);
+            continue;
-		dllref->level = 0;
+        case 2:
-		dynarray_add((void ***) &s1->loaded_dlls,
+            dllindex = add_dllref(s1, dllname);
+            ++state;
-			     &s1->nb_loaded_dlls, dllref);
+            /* fall through */
-		++f;
+        default:
+            /* get ordinal and will store in sym->st_value */
-	    default:
+            ord = 0;
+            x = strchr(p, ' ');
+            if (x) {
+                *x = 0, x = strrchr(x + 1, '@');
+                if (x) {
-		/* tccpe needs to know from what dll it should import
+                    char *d;
-                   the sym */
+                    ord = (int)strtol(x + 1, &d, 10);
-		sym_index = add_elf_sym(s1->dynsymtab_section,
+                    if (*d)
-, 0, ELF32_ST_INFO(STB_GLOBAL,
+                        ord = 0;
+                }
+            }
+            pe_putimport(s1, dllindex, p, ord);
+            continue;
+        }
+    }
+    ret = 0;
+quit:
+    fclose(fp);
+    return ret;
+}
+#else
+static int pe_load_def(TCCState *s1, int fd)
+{ return 0; }
+#endif
+/* ------------------------------------------------------------- */
+#define TINY_IMPDEF_GET_EXPORT_NAMES_ONLY
+#include "win32/tools/tiny_impdef.c"
+static int pe_load_dll(TCCState *s1, const char *dllname, int fd)
+{
+    char *p, *q;
+    int index;
+    p = get_export_names(fd);
-							    STT_FUNC),
+    if (!p)
-                                        s1->nb_loaded_dlls - 1,
+        return -1;
-					text_section->sh_num, p);
+    index = add_dllref(s1, dllname);
-		continue;
+    for (q = p; *q; q += 1 + strlen(q))
         pe_putimport(s1, index, q, 0);
-    }
-    return 0;
+    tcc_free(p);
-}
+    return 0;
+}
-/* ------------------------------------------------------------- */
-void pe_guess_outfile(char *objfilename, int output_type)
-{
+/* ------------------------------------------------------------- */
-    char *ext = strrchr(objfilename, '.');
+ST_FUNC int pe_load_file(struct TCCState *s1, const char *filename, int fd)
-    if (NULL == ext)
-        //ext = strchr(objfilename, 0);
+{
-    if (output_type == TCC_OUTPUT_DLL)
+    int ret = -1;
-        strcpy(ext, ".dll");
+    char buf[10];
-    else
-    if (output_type == TCC_OUTPUT_EXE)
+    if (0 == strcmp(tcc_fileextension(filename), ".def"))
-        strcpy(ext, ".exe");
+        ret = pe_load_def(s1, fd);
+    else if (pe_load_res(s1, fd) == 0)
-    else
+        ret = 0;
+    else if (read_mem(fd, 0, buf, sizeof buf) && 0 == strncmp(buf, "MZ", 2))
+        ret = pe_load_dll(s1, tcc_basename(filename), fd);
+    return ret;
+}
+/* ------------------------------------------------------------- */
+#ifdef TCC_TARGET_X86_64
+static unsigned pe_add_uwwind_info(TCCState *s1)
+{
+    if (NULL == s1->uw_pdata) {
+        s1->uw_pdata = find_section(tcc_state, ".pdata");
+        s1->uw_pdata->sh_addralign = 4;
+        s1->uw_sym = put_elf_sym(symtab_section, 0, 0, 0, 0, text_section->sh_num, NULL);
+    }
+    if (0 == s1->uw_offs) {
+        /* As our functions all have the same stackframe, we use one entry for all */
+        static const unsigned char uw_info[] = {
+x01, // UBYTE: 3 Version , UBYTE: 5 Flags
+x04, // UBYTE Size of prolog
+x02, // UBYTE Count of unwind codes
+x05, // UBYTE: 4 Frame Register (rbp), UBYTE: 4 Frame Register offset (scaled)
+            // USHORT * n Unwind codes array
+            // 0x0b, 0x01, 0xff, 0xff, // stack size
+x04, 0x03, // set frame ptr (mov rsp -> rbp)
+x01, 0x50  // push reg (rbp)
+        };
+        Section *s = text_section;
+        unsigned char *p;
+        section_ptr_add(s, -s->data_offset & 3); /* align */
+        s1->uw_offs = s->data_offset;
+        p = section_ptr_add(s, sizeof uw_info);
+        memcpy(p, uw_info, sizeof uw_info);
+    }
+    return s1->uw_offs;
+}
+ST_FUNC void pe_add_unwind_data(unsigned start, unsigned end, unsigned stack)
+{
+    TCCState *s1 = tcc_state;
+    Section *pd;
+    unsigned o, n, d;
+    struct /* _RUNTIME_FUNCTION */ {
+      DWORD BeginAddress;
+      DWORD EndAddress;
+      DWORD UnwindData;
+    } *p;
+    d = pe_add_uwwind_info(s1);
+    pd = s1->uw_pdata;
+    o = pd->data_offset;
+    p = section_ptr_add(pd, sizeof *p);
+    /* record this function */
+    p->BeginAddress = start;
+    p->EndAddress = end;
+    p->UnwindData = d;
+    /* put relocations on it */
+    for (n = o + sizeof *p; o < n; o += sizeof p->BeginAddress)
+        put_elf_reloc(symtab_section, pd, o,  R_X86_64_RELATIVE, s1->uw_sym);
+}
+#endif
-    if (output_type == TCC_OUTPUT_OBJ && strcmp(ext, ".o"))
+/* ------------------------------------------------------------- */
-        strcpy(ext, ".o");
+#ifdef TCC_TARGET_X86_64
-    else
+#define PE_STDSYM(n,s) n
-        error("no outputfile given");
+#else
 #define PE_STDSYM(n,s) "_" n s
 #endif
-/* ------------------------------------------------------------- */
-unsigned long pe_add_runtime(TCCState * s1)
 static void pe_add_runtime(TCCState *s1, struct pe_info *pe)
-    const char *start_symbol;
+{
-    unsigned long addr;
+    const char *start_symbol;
     int pe_type = 0;
+    if (find_elf_sym(symtab_section, PE_STDSYM("WinMain","@16")))
-    if (find_elf_sym(symtab_section, "WinMain"))
+        pe_type = PE_GUI;
-	pe_type = PE_GUI;
+    else
-    else
+    if (TCC_OUTPUT_DLL == s1->output_type) {
-    if (TCC_OUTPUT_DLL == s1->output_type)
+        pe_type = PE_DLL;
-    {
+        /* need this for 'tccelf.c:relocate_section()' */
+        s1->output_type = TCC_OUTPUT_EXE;
+    }
+    else
+        pe_type = PE_EXE;
         pe_type = PE_DLL;
-        // need this for 'tccelf.c:relocate_section()'
+    start_symbol =
-        s1->output_type = TCC_OUTPUT_EXE;
+        TCC_OUTPUT_MEMORY == s1->output_type
         ? PE_GUI == pe_type ? "__runwinmain" : "_main"
+        : PE_DLL == pe_type ? PE_STDSYM("__dllstart","@12")
-    start_symbol =
+        : PE_GUI == pe_type ? "__winstart" : "__start"
+        ;
-	TCC_OUTPUT_MEMORY == s1->output_type
+    if (!s1->leading_underscore || strchr(start_symbol, '@'))
+        ++start_symbol;
+    /* grab the startup code from libtcc1 */
-	? PE_GUI == pe_type ? "_runwinmain" : NULL
+    if (TCC_OUTPUT_MEMORY != s1->output_type || PE_GUI == pe_type)
+        add_elf_sym(symtab_section,
-	: PE_DLL == pe_type ? "_dllstart"
+, 0,
-	: PE_GUI == pe_type ? "_winstart" : "_start";
+            ELFW(ST_INFO)(STB_GLOBAL, STT_NOTYPE), 0,
+            SHN_UNDEF, start_symbol);
-    /* grab the startup code from libtcc1 */
-    if (start_symbol)
+    tcc_add_pragma_libs(s1);
-	add_elf_sym(symtab_section,
+    if (0 == s1->nostdlib) {
-, 0,
+        static const char *libs[] = {
-		    ELF32_ST_INFO(STB_GLOBAL, STT_NOTYPE), 0,
-		    SHN_UNDEF, start_symbol);
-    if (0 == s1->nostdlib) {
+            "tcc1", "msvcrt", "kernel32", "", "user32", "gdi32", NULL
-	tcc_add_library(s1, "tcc1");
-	tcc_add_library(s1, "msvcrt");
+        };
-	if (PE_DLL == pe_type || PE_GUI == pe_type) {
+        const char **pp, *p;
-	    tcc_add_library(s1, "kernel32");
-	    tcc_add_library(s1, "user32");
+        for (pp = libs; 0 != (p = *pp); ++pp) {
-	    tcc_add_library(s1, "gdi32");
+            if (0 == *p) {
-	}
+                if (PE_DLL != pe_type && PE_GUI != pe_type)
+                    break;
             } else if (tcc_add_library_err(s1, p) < 0) {
+                break;
+            }
     addr = start_symbol ?
-	(unsigned long) tcc_get_symbol_err(s1, start_symbol) : 0;
+    }
-    if (s1->output_type == TCC_OUTPUT_MEMORY && addr) {
+    if (TCC_OUTPUT_MEMORY == s1->output_type) {
-	/* for -run GUI's, put '_runwinmain' instead of 'main' */
+        pe_type = PE_RUN;
-	add_elf_sym(symtab_section,
+#ifdef TCC_IS_NATIVE
+        s1->runtime_main = start_symbol;
-		    addr, 0,
+#endif
-		    ELF32_ST_INFO(STB_GLOBAL, STT_NOTYPE), 0,
+    } else {
-		    text_section->sh_num, "main");
+        pe->start_addr = (DWORD)(uintptr_t)tcc_get_symbol_err(s1, start_symbol);
+    }
-	/* FreeConsole(); */
+    pe->type = pe_type;
+}
 ST_FUNC int pe_output_file(TCCState * s1, const char *filename)
-    return addr;
+{
+    int ret;
+    struct pe_info pe;
+    int i;
+    memset(&pe, 0, sizeof pe);
+    pe.filename = filename;
+    pe.s1 = s1;
+    pe_add_runtime(s1, &pe);
+    tcc_add_bcheck(s1);
+    relocate_common_syms(); /* assign bss adresses */
+    tcc_add_linker_symbols(s1);
+    ret = pe_check_symbols(&pe);
+    if (ret)
+        ;
+    else if (filename) {
+        if (PE_DLL == pe.type) {
+            pe.reloc = new_section(pe.s1, ".reloc", SHT_PROGBITS, 0);
+            /* XXX: check if is correct for arm-pe target */
+            pe.imagebase = 0x10000000;
+        } else {
+#if defined(TCC_TARGET_ARM)
+            pe.imagebase = 0x00010000;
+#else
+            pe.imagebase = 0x00400000;
+#endif
+        }
+#if defined(TCC_TARGET_ARM)
+        /* we use "console" subsystem by default */
+        pe.subsystem = 9;
+#else
+        if (PE_DLL == pe.type || PE_GUI == pe.type)
+            pe.subsystem = 2;
+        else
+            pe.subsystem = 3;
+#endif
+        /* Allow override via -Wl,-subsystem=... option */
+        if (s1->pe_subsystem != 0)
+            pe.subsystem = s1->pe_subsystem;
+        /* set default file/section alignment */
+	if (pe.subsystem == 1) {
+	    pe.section_align = 0x20;
+	    pe.file_align = 0x20;
+	} else {
 	    pe.section_align = 0x1000;
 	    pe.file_align = 0x200;
 int tcc_output_pe(TCCState * s1, const char *filename)
-    int ret;
+        if (s1->section_align != 0)
-    struct pe_info pe;
+            pe.section_align = s1->section_align;
+        if (s1->pe_file_align != 0)
-    int i;
+            pe.file_align = s1->pe_file_align;
-    memset(&pe, 0, sizeof pe);
     pe.filename = filename;
-    pe.s1 = s1;
+        if ((pe.subsystem >= 10) && (pe.subsystem <= 12))
-    pe.start_addr = pe_add_runtime(s1);
+            pe.imagebase = 0;
-    relocate_common_syms();	/* assign bss adresses */
-    ret = pe_check_symbols(&pe);
+        if (s1->has_text_addr)
-    if (0 == ret) {
+            pe.imagebase = s1->text_addr;
-	pe_assign_addresses(&pe);
+        pe_assign_addresses(&pe);
-	relocate_syms(s1, 0);
+        relocate_syms(s1, 0);
-	for (i = 1; i < s1->nb_sections; ++i) {
-	    Section *s = s1->sections[i];
+        for (i = 1; i < s1->nb_sections; ++i) {
-	    if (s->reloc)
+            Section *s = s1->sections[i];
-		relocate_section(s1, s);
+            if (s->reloc) {
+                relocate_section(s1, s);
+                pe_relocate_rva(&pe, s);
+            }
+        }
-	ret = pe_write_pe(&pe);
+        if (s1->nb_errors)
             ret = -1;
-#ifdef PE_PRINT_SECTIONS
+        else

Subversion Repositories Kolibri OS

(root)/programs/develop/ktcc/trunk/source/tccpe.c – Rev 647 → 6429