aboutsummaryrefslogtreecommitdiff
path: root/tccpe.c
diff options
context:
space:
mode:
Diffstat (limited to 'tccpe.c')
-rw-r--r--tccpe.c1687
1 files changed, 997 insertions, 690 deletions
diff --git a/tccpe.c b/tccpe.c
index 2920417..25b5413 100644
--- a/tccpe.c
+++ b/tccpe.c
@@ -1,7 +1,7 @@
/*
- * TCCPE.C - PE file output for the TinyC Compiler
- *
- * Copyright (c) 2005 grischka
+ * TCCPE.C - PE file output for the Tiny C Compiler
+ *
+ * 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
@@ -18,251 +18,189 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-typedef unsigned char BYTE;
-typedef unsigned short WORD;
-typedef unsigned long DWORD;
-#define ST static
+#ifdef TCC_TARGET_PE
+
+#define ST_FN static
+#define ST_DATA static
+#define PUB_FN
-/* XXX: move that to TCC ? */
-int verbose = 0;
+#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
+
+/* ----------------------------------------------------------- */
+#ifndef IMAGE_NT_SIGNATURE
+/* ----------------------------------------------------------- */
/* definitions below are from winnt.h */
-typedef struct _IMAGE_DOS_HEADER { /* DOS .EXE header */
- WORD e_magic; /* Magic number */
- WORD e_cblp; /* Bytes on last page of file */
- WORD e_cp; /* Pages in file */
- WORD e_crlc; /* Relocations */
- WORD e_cparhdr; /* Size of header in paragraphs */
- WORD e_minalloc; /* Minimum extra paragraphs needed */
- WORD e_maxalloc; /* Maximum extra paragraphs needed */
- WORD e_ss; /* Initial (relative) SS value */
- WORD e_sp; /* Initial SP value */
- WORD e_csum; /* Checksum */
- WORD e_ip; /* Initial IP value */
- WORD e_cs; /* Initial (relative) CS value */
- WORD e_lfarlc; /* File address of relocation table */
- WORD e_ovno; /* Overlay number */
- WORD e_res[4]; /* Reserved words */
- WORD e_oemid; /* OEM identifier (for e_oeminfo) */
- WORD e_oeminfo; /* OEM information; e_oemid specific */
- WORD e_res2[10]; /* Reserved words */
- DWORD e_lfanew; /* File address of new exe header */
- BYTE e_code[0x40];
+typedef unsigned char BYTE;
+typedef unsigned short WORD;
+typedef unsigned long DWORD;
+#pragma pack(push, 1)
+typedef struct _IMAGE_DOS_HEADER { /* DOS .EXE header */
+ WORD e_magic; /* Magic number */
+ WORD e_cblp; /* Bytes on last page of file */
+ WORD e_cp; /* Pages in file */
+ WORD e_crlc; /* Relocations */
+ WORD e_cparhdr; /* Size of header in paragraphs */
+ WORD e_minalloc; /* Minimum extra paragraphs needed */
+ WORD e_maxalloc; /* Maximum extra paragraphs needed */
+ WORD e_ss; /* Initial (relative) SS value */
+ WORD e_sp; /* Initial SP value */
+ WORD e_csum; /* Checksum */
+ WORD e_ip; /* Initial IP value */
+ WORD e_cs; /* Initial (relative) CS value */
+ WORD e_lfarlc; /* File address of relocation table */
+ WORD e_ovno; /* Overlay number */
+ WORD e_res[4]; /* Reserved words */
+ WORD e_oemid; /* OEM identifier (for e_oeminfo) */
+ WORD e_oeminfo; /* OEM information; e_oemid specific */
+ WORD e_res2[10]; /* Reserved words */
+ DWORD e_lfanew; /* File address of new exe header */
} IMAGE_DOS_HEADER, *PIMAGE_DOS_HEADER;
#define IMAGE_NT_SIGNATURE 0x00004550 /* PE00 */
#define SIZE_OF_NT_SIGNATURE 4
typedef struct _IMAGE_FILE_HEADER {
- WORD Machine;
- WORD NumberOfSections;
- DWORD TimeDateStamp;
- DWORD PointerToSymbolTable;
- DWORD NumberOfSymbols;
- WORD SizeOfOptionalHeader;
- WORD Characteristics;
+ WORD Machine;
+ WORD NumberOfSections;
+ DWORD TimeDateStamp;
+ DWORD PointerToSymbolTable;
+ DWORD NumberOfSymbols;
+ WORD SizeOfOptionalHeader;
+ WORD Characteristics;
} IMAGE_FILE_HEADER, *PIMAGE_FILE_HEADER;
#define IMAGE_SIZEOF_FILE_HEADER 20
typedef struct _IMAGE_DATA_DIRECTORY {
- DWORD VirtualAddress;
- DWORD Size;
+ DWORD VirtualAddress;
+ DWORD Size;
} IMAGE_DATA_DIRECTORY, *PIMAGE_DATA_DIRECTORY;
typedef struct _IMAGE_OPTIONAL_HEADER {
/* Standard fields. */
- WORD Magic;
- BYTE MajorLinkerVersion;
- BYTE MinorLinkerVersion;
- DWORD SizeOfCode;
- DWORD SizeOfInitializedData;
- DWORD SizeOfUninitializedData;
- DWORD AddressOfEntryPoint;
- DWORD BaseOfCode;
- DWORD BaseOfData;
+ WORD Magic;
+ BYTE MajorLinkerVersion;
+ BYTE MinorLinkerVersion;
+ DWORD SizeOfCode;
+ DWORD SizeOfInitializedData;
+ DWORD SizeOfUninitializedData;
+ DWORD AddressOfEntryPoint;
+ DWORD BaseOfCode;
+ DWORD BaseOfData;
/* NT additional fields. */
- DWORD ImageBase;
- DWORD SectionAlignment;
- DWORD FileAlignment;
- WORD MajorOperatingSystemVersion;
- WORD MinorOperatingSystemVersion;
- WORD MajorImageVersion;
- WORD MinorImageVersion;
- WORD MajorSubsystemVersion;
- WORD MinorSubsystemVersion;
- DWORD Win32VersionValue;
- DWORD SizeOfImage;
- DWORD SizeOfHeaders;
- DWORD CheckSum;
- WORD Subsystem;
- WORD DllCharacteristics;
- DWORD SizeOfStackReserve;
- DWORD SizeOfStackCommit;
- DWORD SizeOfHeapReserve;
- DWORD SizeOfHeapCommit;
- DWORD LoaderFlags;
- DWORD NumberOfRvaAndSizes;
+ DWORD ImageBase;
+ DWORD SectionAlignment;
+ DWORD FileAlignment;
+ WORD MajorOperatingSystemVersion;
+ WORD MinorOperatingSystemVersion;
+ WORD MajorImageVersion;
+ WORD MinorImageVersion;
+ WORD MajorSubsystemVersion;
+ WORD MinorSubsystemVersion;
+ DWORD Win32VersionValue;
+ DWORD SizeOfImage;
+ DWORD SizeOfHeaders;
+ DWORD CheckSum;
+ WORD Subsystem;
+ WORD DllCharacteristics;
+ DWORD SizeOfStackReserve;
+ DWORD SizeOfStackCommit;
+ DWORD SizeOfHeapReserve;
+ DWORD SizeOfHeapCommit;
+ DWORD LoaderFlags;
+ DWORD NumberOfRvaAndSizes;
IMAGE_DATA_DIRECTORY DataDirectory[16];
-} IMAGE_OPTIONAL_HEADER32, *PIMAGE_OPTIONAL_HEADER32;
+} IMAGE_OPTIONAL_HEADER, *PIMAGE_OPTIONAL_HEADER;
-#define IMAGE_DIRECTORY_ENTRY_EXPORT 0 /* Export Directory */
-#define IMAGE_DIRECTORY_ENTRY_IMPORT 1 /* Import Directory */
-#define IMAGE_DIRECTORY_ENTRY_RESOURCE 2 /* Resource Directory */
-#define IMAGE_DIRECTORY_ENTRY_EXCEPTION 3 /* Exception Directory */
-#define IMAGE_DIRECTORY_ENTRY_SECURITY 4 /* Security Directory */
-#define IMAGE_DIRECTORY_ENTRY_BASERELOC 5 /* Base Relocation Table */
-#define IMAGE_DIRECTORY_ENTRY_DEBUG 6 /* Debug Directory */
+#define IMAGE_DIRECTORY_ENTRY_EXPORT 0 /* Export Directory */
+#define IMAGE_DIRECTORY_ENTRY_IMPORT 1 /* Import Directory */
+#define IMAGE_DIRECTORY_ENTRY_RESOURCE 2 /* Resource Directory */
+#define IMAGE_DIRECTORY_ENTRY_EXCEPTION 3 /* Exception Directory */
+#define IMAGE_DIRECTORY_ENTRY_SECURITY 4 /* Security Directory */
+#define IMAGE_DIRECTORY_ENTRY_BASERELOC 5 /* Base Relocation Table */
+#define IMAGE_DIRECTORY_ENTRY_DEBUG 6 /* Debug Directory */
/* IMAGE_DIRECTORY_ENTRY_COPYRIGHT 7 (X86 usage) */
-#define IMAGE_DIRECTORY_ENTRY_ARCHITECTURE 7 /* Architecture Specific Data */
-#define IMAGE_DIRECTORY_ENTRY_GLOBALPTR 8 /* RVA of GP */
-#define IMAGE_DIRECTORY_ENTRY_TLS 9 /* TLS Directory */
-#define IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG 10 /* Load Configuration Directory */
-#define IMAGE_DIRECTORY_ENTRY_BOUND_IMPORT 11 /* Bound Import Directory in headers */
-#define IMAGE_DIRECTORY_ENTRY_IAT 12 /* Import Address Table */
-#define IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT 13 /* Delay Load Import Descriptors */
-#define IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR 14 /* COM Runtime descriptor */
+#define IMAGE_DIRECTORY_ENTRY_ARCHITECTURE 7 /* Architecture Specific Data */
+#define IMAGE_DIRECTORY_ENTRY_GLOBALPTR 8 /* RVA of GP */
+#define IMAGE_DIRECTORY_ENTRY_TLS 9 /* TLS Directory */
+#define IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG 10 /* Load Configuration Directory */
+#define IMAGE_DIRECTORY_ENTRY_BOUND_IMPORT 11 /* Bound Import Directory in headers */
+#define IMAGE_DIRECTORY_ENTRY_IAT 12 /* Import Address Table */
+#define IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT 13 /* Delay Load Import Descriptors */
+#define IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR 14 /* COM Runtime descriptor */
/* Section header format. */
-#define IMAGE_SIZEOF_SHORT_NAME 8
+#define IMAGE_SIZEOF_SHORT_NAME 8
typedef struct _IMAGE_SECTION_HEADER {
- BYTE Name[IMAGE_SIZEOF_SHORT_NAME];
+ BYTE Name[IMAGE_SIZEOF_SHORT_NAME];
union {
- DWORD PhysicalAddress;
- DWORD VirtualSize;
+ DWORD PhysicalAddress;
+ DWORD VirtualSize;
} Misc;
- DWORD VirtualAddress;
- DWORD SizeOfRawData;
- DWORD PointerToRawData;
- DWORD PointerToRelocations;
- DWORD PointerToLinenumbers;
- WORD NumberOfRelocations;
- WORD NumberOfLinenumbers;
- DWORD Characteristics;
+ DWORD VirtualAddress;
+ DWORD SizeOfRawData;
+ DWORD PointerToRawData;
+ DWORD PointerToRelocations;
+ DWORD PointerToLinenumbers;
+ WORD NumberOfRelocations;
+ WORD NumberOfLinenumbers;
+ DWORD Characteristics;
} IMAGE_SECTION_HEADER, *PIMAGE_SECTION_HEADER;
-#define IMAGE_SIZEOF_SECTION_HEADER 40
+#define IMAGE_SIZEOF_SECTION_HEADER 40
-/* ----------------------------------------------------------- */
typedef struct _IMAGE_BASE_RELOCATION {
- DWORD VirtualAddress;
- DWORD SizeOfBlock;
+ DWORD VirtualAddress;
+ DWORD SizeOfBlock;
// WORD TypeOffset[1];
} IMAGE_BASE_RELOCATION;
-#define IMAGE_SIZEOF_BASE_RELOCATION 8
+#define IMAGE_SIZEOF_BASE_RELOCATION 8
-#define IMAGE_REL_BASED_ABSOLUTE 0
-#define IMAGE_REL_BASED_HIGH 1
-#define IMAGE_REL_BASED_LOW 2
-#define IMAGE_REL_BASED_HIGHLOW 3
-#define IMAGE_REL_BASED_HIGHADJ 4
-#define IMAGE_REL_BASED_MIPS_JMPADDR 5
-#define IMAGE_REL_BASED_SECTION 6
-#define IMAGE_REL_BASED_REL32 7
+#define IMAGE_REL_BASED_ABSOLUTE 0
+#define IMAGE_REL_BASED_HIGH 1
+#define IMAGE_REL_BASED_LOW 2
+#define IMAGE_REL_BASED_HIGHLOW 3
+#define IMAGE_REL_BASED_HIGHADJ 4
+#define IMAGE_REL_BASED_MIPS_JMPADDR 5
+#define IMAGE_REL_BASED_SECTION 6
+#define IMAGE_REL_BASED_REL32 7
-/* ----------------------------------------------------------- */
+#pragma pack(pop)
/* ----------------------------------------------------------- */
-IMAGE_DOS_HEADER pe_dos_hdr = {
- 0x5A4D, /*WORD e_magic; Magic number */
- 0x0090, /*WORD e_cblp; Bytes on last page of file */
- 0x0003, /*WORD e_cp; Pages in file */
- 0x0000, /*WORD e_crlc; Relocations */
-
- 0x0004, /*WORD e_cparhdr; Size of header in paragraphs */
- 0x0000, /*WORD e_minalloc; Minimum extra paragraphs needed */
- 0xFFFF, /*WORD e_maxalloc; Maximum extra paragraphs needed */
- 0x0000, /*WORD e_ss; Initial (relative) SS value */
-
- 0x00B8, /*WORD e_sp; Initial SP value */
- 0x0000, /*WORD e_csum; Checksum */
- 0x0000, /*WORD e_ip; Initial IP value */
- 0x0000, /*WORD e_cs; Initial (relative) CS value */
- 0x0040, /*WORD e_lfarlc; File address of relocation table */
- 0x0000, /*WORD e_ovno; Overlay number */
- {0, 0, 0, 0}, /*WORD e_res[4]; Reserved words */
- 0x0000, /*WORD e_oemid; OEM identifier (for e_oeminfo) */
- 0x0000, /*WORD e_oeminfo; OEM information; e_oemid specific */
- {0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, /*WORD e_res2[10]; Reserved words */
- 0x00000080, /*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,
- 0x01, 0x4c, 0xcd, 0x21, 0x54, 0x68,
- /*0050 */ 0x69, 0x73, 0x20, 0x70, 0x72, 0x6f, 0x67, 0x72, 0x61, 0x6d,
- 0x20, 0x63, 0x61, 0x6e, 0x6e, 0x6f,
- /*0060 */ 0x74, 0x20, 0x62, 0x65, 0x20, 0x72, 0x75, 0x6e, 0x20, 0x69,
- 0x6e, 0x20, 0x44, 0x4f, 0x53, 0x20,
- /*0070 */ 0x6d, 0x6f, 0x64, 0x65, 0x2e, 0x0d, 0x0d, 0x0a, 0x24, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- /*0080 */
- }
-};
-
-DWORD pe_magic = IMAGE_NT_SIGNATURE;
-
-IMAGE_FILE_HEADER pe_file_hdr = {
- 0x014C, /*WORD Machine; */
- 0x0003, /*WORD NumberOfSections; */
- 0x00000000, /*DWORD TimeDateStamp; */
- 0x00000000, /*DWORD PointerToSymbolTable; */
- 0x00000000, /*DWORD NumberOfSymbols; */
- 0x00E0, /*WORD SizeOfOptionalHeader; */
- 0x030F /*WORD Characteristics; */
-};
-
-IMAGE_OPTIONAL_HEADER32 pe_opt_hdr = {
- /* Standard fields. */
- 0x010B, /*WORD Magic; */
- 0x06, /*BYTE MajorLinkerVersion; */
- 0x00, /*BYTE MinorLinkerVersion; */
- 0x00000000, /*DWORD SizeOfCode; */
- 0x00000000, /*DWORD SizeOfInitializedData; */
- 0x00000000, /*DWORD SizeOfUninitializedData; */
- 0x00000000, /*DWORD AddressOfEntryPoint; */
- 0x00000000, /*DWORD BaseOfCode; */
- 0x00000000, /*DWORD BaseOfData; */
+#endif /* ndef IMAGE_NT_SIGNATURE */
+/* ----------------------------------------------------------- */
- /* NT additional fields. */
- 0x00400000, /*DWORD ImageBase; */
- 0x00001000, /*DWORD SectionAlignment; */
- 0x00000200, /*DWORD FileAlignment; */
- 0x0004, /*WORD MajorOperatingSystemVersion; */
- 0x0000, /*WORD MinorOperatingSystemVersion; */
- 0x0000, /*WORD MajorImageVersion; */
- 0x0000, /*WORD MinorImageVersion; */
- 0x0004, /*WORD MajorSubsystemVersion; */
- 0x0000, /*WORD MinorSubsystemVersion; */
- 0x00000000, /*DWORD Win32VersionValue; */
- 0x00000000, /*DWORD SizeOfImage; */
- 0x00000200, /*DWORD SizeOfHeaders; */
- 0x00000000, /*DWORD CheckSum; */
- 0x0002, /*WORD Subsystem; */
- 0x0000, /*WORD DllCharacteristics; */
- 0x00100000, /*DWORD SizeOfStackReserve; */
- 0x00001000, /*DWORD SizeOfStackCommit; */
- 0x00100000, /*DWORD SizeOfHeapReserve; */
- 0x00001000, /*DWORD SizeOfHeapCommit; */
- 0x00000000, /*DWORD LoaderFlags; */
- 0x00000010, /*DWORD NumberOfRvaAndSizes; */
+#pragma pack(push, 1)
- /* IMAGE_DATA_DIRECTORY DataDirectory[16]; */
- {{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}}
+struct pe_header
+{
+ IMAGE_DOS_HEADER doshdr;
+ BYTE dosstub[0x40];
+ DWORD nt_sig;
+ IMAGE_FILE_HEADER filehdr;
+ IMAGE_OPTIONAL_HEADER opthdr;
};
-/*----------------------------------------------------------------------------*/
-
-/*----------------------------------------------------------------------------*/
-
struct pe_import_header {
DWORD first_entry;
DWORD time_date;
@@ -289,52 +227,154 @@ struct pe_reloc_header {
DWORD size;
};
+struct pe_rsrc_header {
+ struct _IMAGE_FILE_HEADER filehdr;
+ struct _IMAGE_SECTION_HEADER sectionhdr;
+};
+
+struct pe_rsrc_reloc {
+ DWORD offset;
+ DWORD size;
+ WORD type;
+};
+
+#pragma pack(pop)
+
+/* ----------------------------------------------------------- */
+ST_DATA struct pe_header pe_header = {
+{
+ /* IMAGE_DOS_HEADER doshdr */
+ 0x5A4D, /*WORD e_magic; Magic number */
+ 0x0090, /*WORD e_cblp; Bytes on last page of file */
+ 0x0003, /*WORD e_cp; Pages in file */
+ 0x0000, /*WORD e_crlc; Relocations */
+
+ 0x0004, /*WORD e_cparhdr; Size of header in paragraphs */
+ 0x0000, /*WORD e_minalloc; Minimum extra paragraphs needed */
+ 0xFFFF, /*WORD e_maxalloc; Maximum extra paragraphs needed */
+ 0x0000, /*WORD e_ss; Initial (relative) SS value */
+
+ 0x00B8, /*WORD e_sp; Initial SP value */
+ 0x0000, /*WORD e_csum; Checksum */
+ 0x0000, /*WORD e_ip; Initial IP value */
+ 0x0000, /*WORD e_cs; Initial (relative) CS value */
+ 0x0040, /*WORD e_lfarlc; File address of relocation table */
+ 0x0000, /*WORD e_ovno; Overlay number */
+ {0,0,0,0}, /*WORD e_res[4]; Reserved words */
+ 0x0000, /*WORD e_oemid; OEM identifier (for e_oeminfo) */
+ 0x0000, /*WORD e_oeminfo; OEM information; e_oemid specific */
+ {0,0,0,0,0,0,0,0,0,0}, /*WORD e_res2[10]; Reserved words */
+ 0x00000080 /*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 */
+ 0x0e,0x1f,0xba,0x0e,0x00,0xb4,0x09,0xcd,0x21,0xb8,0x01,0x4c,0xcd,0x21,0x54,0x68,
+ 0x69,0x73,0x20,0x70,0x72,0x6f,0x67,0x72,0x61,0x6d,0x20,0x63,0x61,0x6e,0x6e,0x6f,
+ 0x74,0x20,0x62,0x65,0x20,0x72,0x75,0x6e,0x20,0x69,0x6e,0x20,0x44,0x4f,0x53,0x20,
+ 0x6d,0x6f,0x64,0x65,0x2e,0x0d,0x0d,0x0a,0x24,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+},
+ 0x00004550, /* DWORD nt_sig = IMAGE_NT_SIGNATURE */
+{
+ /* IMAGE_FILE_HEADER filehdr */
+ 0x014C, /*WORD Machine; */
+ 0x0003, /*WORD NumberOfSections; */
+ 0x00000000, /*DWORD TimeDateStamp; */
+ 0x00000000, /*DWORD PointerToSymbolTable; */
+ 0x00000000, /*DWORD NumberOfSymbols; */
+ 0x00E0, /*WORD SizeOfOptionalHeader; */
+ 0x030F /*WORD Characteristics; */
+},{
+ /* IMAGE_OPTIONAL_HEADER opthdr */
+ /* Standard fields. */
+ 0x010B, /*WORD Magic; */
+ 0x06, /*BYTE MajorLinkerVersion; */
+ 0x00, /*BYTE MinorLinkerVersion; */
+ 0x00000000, /*DWORD SizeOfCode; */
+ 0x00000000, /*DWORD SizeOfInitializedData; */
+ 0x00000000, /*DWORD SizeOfUninitializedData; */
+ 0x00000000, /*DWORD AddressOfEntryPoint; */
+ 0x00000000, /*DWORD BaseOfCode; */
+ 0x00000000, /*DWORD BaseOfData; */
+
+ /* NT additional fields. */
+ 0x00400000, /*DWORD ImageBase; */
+ 0x00001000, /*DWORD SectionAlignment; */
+ 0x00000200, /*DWORD FileAlignment; */
+ 0x0004, /*WORD MajorOperatingSystemVersion; */
+ 0x0000, /*WORD MinorOperatingSystemVersion; */
+ 0x0000, /*WORD MajorImageVersion; */
+ 0x0000, /*WORD MinorImageVersion; */
+ 0x0004, /*WORD MajorSubsystemVersion; */
+ 0x0000, /*WORD MinorSubsystemVersion; */
+ 0x00000000, /*DWORD Win32VersionValue; */
+ 0x00000000, /*DWORD SizeOfImage; */
+ 0x00000200, /*DWORD SizeOfHeaders; */
+ 0x00000000, /*DWORD CheckSum; */
+ 0x0002, /*WORD Subsystem; */
+ 0x0000, /*WORD DllCharacteristics; */
+ 0x00100000, /*DWORD SizeOfStackReserve; */
+ 0x00001000, /*DWORD SizeOfStackCommit; */
+ 0x00100000, /*DWORD SizeOfHeapReserve; */
+ 0x00001000, /*DWORD SizeOfHeapCommit; */
+ 0x00000000, /*DWORD LoaderFlags; */
+ 0x00000010, /*DWORD NumberOfRvaAndSizes; */
+
+ /* IMAGE_DATA_DIRECTORY DataDirectory[16]; */
+ {{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}}
+}};
+
/* ------------------------------------------------------------- */
/* internal temporary structures */
-ST const char *pe_sec_names[] = {
- ".text",
- ".data",
- ".bss",
- ".rsrc",
- ".reloc",
- ".stab",
- ".stabstr"
-};
+/*
+#define IMAGE_SCN_CNT_CODE 0x00000020
+#define IMAGE_SCN_CNT_INITIALIZED_DATA 0x00000040
+#define IMAGE_SCN_CNT_UNINITIALIZED_DATA 0x00000080
+#define IMAGE_SCN_MEM_DISCARDABLE 0x02000000
+#define IMAGE_SCN_MEM_SHARED 0x10000000
+#define IMAGE_SCN_MEM_EXECUTE 0x20000000
+#define IMAGE_SCN_MEM_READ 0x40000000
+#define IMAGE_SCN_MEM_WRITE 0x80000000
+*/
enum {
sec_text = 0,
- sec_data,
- sec_bss,
- sec_rsrc,
- sec_reloc,
- sec_stab,
- sec_stabstr,
- pe_sec_number
+ sec_data ,
+ sec_bss ,
+ sec_idata ,
+ sec_rsrc ,
+ sec_stab ,
+ sec_reloc ,
+
+ sec_last
};
-ST DWORD pe_flags[] = {
- 0x60000020, /* ".text", */
- 0xC0000040, /* ".data", */
- 0xC0000080, /* ".bss", */
- 0x40000040, /* ".rsrc", */
- 0x42000040, /* ".reloc", */
- 0x42000802, /* ".stab", */
- 0x42000802 /* ".stabstr", */
+ST_DATA DWORD pe_sec_flags[] = {
+ 0x60000020, /* ".text" , */
+ 0xC0000040, /* ".data" , */
+ 0xC0000080, /* ".bss" , */
+ 0x40000040, /* ".idata" , */
+ 0x40000040, /* ".rsrc" , */
+ 0x42000802, /* ".stab" , */
+ 0x42000040, /* ".reloc" , */
};
struct section_info {
- struct section_info *next;
- int id;
+ int cls, ord;
+ char name[32];
DWORD sh_addr;
DWORD sh_size;
+ DWORD sh_flags;
unsigned char *data;
DWORD data_size;
+ IMAGE_SECTION_HEADER ish;
};
struct import_symbol {
int sym_index;
- int offset;
+ int iat_index;
+ int thk_offset;
};
struct pe_import_info {
@@ -344,7 +384,11 @@ struct pe_import_info {
};
struct pe_info {
+ TCCState *s1;
+ Section *reloc;
+ Section *thunk;
const char *filename;
+ int type;
DWORD sizeofheaders;
DWORD imagebase;
DWORD start_addr;
@@ -354,173 +398,172 @@ struct pe_info {
DWORD iat_size;
DWORD exp_offs;
DWORD exp_size;
- struct section_info sh_info[pe_sec_number];
+ struct section_info *sec_info;
int sec_count;
struct pe_import_info **imp_info;
int imp_count;
- Section *reloc;
- Section *thunk;
- TCCState *s1;
};
/* ------------------------------------------------------------- */
-#define PE_MERGE_DATA
-// #define PE_PRINT_SECTIONS
-
-#ifndef MAX_PATH
-#define MAX_PATH 260
-#endif
-
-void error_noabort(const char *, ...);
-
-ST char pe_type;
#define PE_NUL 0
#define PE_DLL 1
#define PE_GUI 2
#define PE_EXE 3
-ST int pe_find_import(TCCState * s1, const char *symbol, char *ret)
+void error_noabort(const char *, ...);
+
+#ifdef _WIN32
+void dbg_printf (const char *fmt, ...)
{
- 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];
- if (0 == memcmp(symbol, "__imp__", 7))
- symbol += 6;
- else
- buffer[0] = '_', strcpy(buffer + 1, symbol), symbol = buffer;
- sym_index = find_elf_sym(s1->dynsymtab_section, symbol);
+ char buffer[4000];
+ va_list arg;
+ int x;
+ va_start(arg, fmt);
+ x = vsprintf (buffer, fmt, arg);
+ strcpy(buffer+x, "\n");
+ OutputDebugString(buffer);
+}
+#endif
+
+/* --------------------------------------------*/
+
+ST_FN const char* get_alt_symbol(char *buffer, const char *symbol)
+{
+ const char *p;
+ p = strrchr(symbol, '@');
+ if (p && isnum(p[1]) && symbol[0] == '_') { /* stdcall decor */
+ strcpy(buffer, symbol+1)[p-symbol-1] = 0;
+ } else if (symbol[0] != '_') { /* try non-ansi function */
+ buffer[0] = '_', strcpy(buffer + 1, symbol);
+ } else if (0 == memcmp(symbol, "__imp__", 7)) { /* mingw 2.0 */
+ strcpy(buffer, symbol + 6);
+ } else if (0 == memcmp(symbol, "_imp___", 7)) { /* mingw 3.7 */
+ strcpy(buffer, symbol + 6);
+ } else {
+ return symbol;
}
- if (ret)
- strcpy(ret, symbol);
+ return buffer;
+}
+
+ST_FN int pe_find_import(TCCState * s1, const char *symbol)
+{
+ char buffer[200];
+ const char *s;
+ int sym_index, n = 0;
+ do {
+ s = n ? get_alt_symbol(buffer, symbol) : symbol;
+ sym_index = find_elf_sym(s1->dynsymtab_section, s);
+ // printf("find %d %s\n", sym_index, s);
+ } while (0 == sym_index && ++n < 2);
return sym_index;
}
-#ifdef _WIN32
-ST void **pe_imp;
-ST int nb_pe_imp;
+#if defined _WIN32 || defined __CYGWIN__
+#ifdef __CYGWIN__
+# include <dlfcn.h>
+# define LoadLibrary(s) dlopen(s, RTLD_NOW)
+# define GetProcAddress(h,s) dlsym(h, s)
+#endif
+
+/* for the -run option: dynamically load symbol from dll */
void *resolve_sym(struct TCCState *s1, const char *symbol, int type)
{
- char buffer[100], *p = buffer;
- void *a = NULL;
- int sym_index = pe_find_import(s1, symbol, p);
- int dll_index;
- const char *dll_name;
- void *hm;
+ char buffer[100];
+ int sym_index, dll_index;
+ void *hModule, *addr, **m;
- 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);
- a = &pe_imp[nb_pe_imp - 1];
- }
- }
+ sym_index = pe_find_import(s1, symbol);
+ if (0 == sym_index)
+ return NULL;
+ dll_index = ((Elf32_Sym *)s1->dynsymtab_section->data + sym_index)->st_value;
+ hModule = LoadLibrary(s1->loaded_dlls[dll_index-1]->name);
+ addr = GetProcAddress(hModule, symbol);
+ if (NULL == addr)
+ addr = GetProcAddress(hModule, get_alt_symbol(buffer, symbol));
+
+ if (addr && STT_OBJECT == type) {
+ /* need to return a pointer to the address for data objects */
+ m = (void**)tcc_malloc(sizeof addr), *m = addr, addr = m;
+#ifdef MEM_DEBUG
+ /* yep, we don't free it */
+ mem_cur_size -= sizeof (void*);
+#endif
}
- return a;
+ return addr;
}
#endif
-#define for_sym_in_symtab(sym) \
-for (sym = (Elf32_Sym *)symtab_section->data + 1; \
- sym < (Elf32_Sym *)(symtab_section->data + \
- symtab_section->data_offset); \
- ++sym)
-
-#define pe_set_datadir(dir,addr,size) \
- pe_opt_hdr.DataDirectory[dir].VirtualAddress = addr, \
- pe_opt_hdr.DataDirectory[dir].Size = size
-
/*----------------------------------------------------------------------------*/
-ST void dynarray_reset(void ***pp, int *n)
-{
- int i;
- for (i = 0; i < *n; ++i)
- tcc_free((*pp)[i]);
- tcc_free(*pp);
- *pp = NULL;
- *n = 0;
-}
-ST int dynarray_assoc(void **pp, int n, int key)
+ST_FN int dynarray_assoc(void **pp, int n, int key)
{
int i;
for (i = 0; i < n; ++i, ++pp)
- if (key == **(int **) pp)
- return i;
+ if (key == **(int **) pp)
+ return i;
return -1;
}
#if 0
-ST DWORD umin(DWORD a, DWORD b)
+ST_FN DWORD umin(DWORD a, DWORD b)
{
return a < b ? a : b;
}
#endif
-ST DWORD umax(DWORD a, DWORD b)
+ST_FN DWORD umax(DWORD a, DWORD b)
{
return a < b ? b : a;
}
-ST void pe_fpad(FILE * fp, DWORD new_pos)
+ST_FN void pe_fpad(FILE *fp, DWORD new_pos)
{
DWORD pos = ftell(fp);
while (++pos <= new_pos)
fputc(0, fp);
}
-ST DWORD pe_file_align(DWORD n)
+ST_FN DWORD pe_file_align(DWORD n)
{
return (n + (0x200 - 1)) & ~(0x200 - 1);
}
-ST DWORD pe_virtual_align(DWORD n)
+ST_FN DWORD pe_virtual_align(DWORD n)
{
return (n + (0x1000 - 1)) & ~(0x1000 - 1);
}
-ST void pe_align_section(Section * s, int a)
+ST_FN void pe_align_section(Section *s, int a)
{
- int i = s->data_offset & (a - 1);
+ int i = s->data_offset & (a-1);
if (i)
section_ptr_add(s, a - i);
}
+ST_FN void pe_set_datadir(int dir, DWORD addr, DWORD size)
+{
+ pe_header.opthdr.DataDirectory[dir].VirtualAddress = addr;
+ pe_header.opthdr.DataDirectory[dir].Size = size;
+}
/*----------------------------------------------------------------------------*/
-ST int pe_write_pe(struct pe_info *pe)
+ST_FN int pe_write(struct pe_info *pe)
{
int i;
FILE *op;
- DWORD file_offset;
- IMAGE_SECTION_HEADER ish[pe_sec_number], *psh;
- int sec_index = 0;
+ DWORD file_offset, r;
op = fopen(pe->filename, "wb");
if (NULL == op) {
- error_noabort("could not create file: %s", pe->filename);
+ error_noabort("could not write '%s': %s", pe->filename, strerror(errno));
return 1;
}
- memset(&ish, 0, sizeof ish);
-
- 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)
+ pe->sizeofheaders = pe_file_align(
+ sizeof pe_header
+ + pe->sec_count * sizeof (IMAGE_SECTION_HEADER)
);
file_offset = pe->sizeofheaders;
@@ -531,137 +574,132 @@ ST int pe_write_pe(struct pe_info *pe)
"\n virt file size section" "\n");
for (i = 0; i < pe->sec_count; ++i) {
- struct section_info *si = pe->sh_info + i;
- const char *sh_name = pe_sec_names[si->id];
+ struct section_info *si = pe->sec_info + i;
+ const char *sh_name = si->name;
unsigned long addr = si->sh_addr - pe->imagebase;
unsigned long size = si->sh_size;
+ IMAGE_SECTION_HEADER *psh = &si->ish;
if (2 == verbose)
printf("%6lx %6lx %6lx %s\n",
- addr, file_offset, size, sh_name);
+ addr, file_offset, size, sh_name);
- switch (si->id) {
- case sec_text:
- pe_opt_hdr.BaseOfCode = addr;
- pe_opt_hdr.AddressOfEntryPoint = addr + pe->start_addr;
- break;
+ switch (si->cls) {
+ case sec_text:
+ pe_header.opthdr.BaseOfCode = addr;
+ pe_header.opthdr.AddressOfEntryPoint = addr + pe->start_addr;
+ break;
+
+ case sec_data:
+ pe_header.opthdr.BaseOfData = addr;
+ 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:
+ break;
+ }
- case sec_data:
- pe_opt_hdr.BaseOfData = addr;
+ if (pe->thunk == pe->s1->sections[si->ord]) {
if (pe->imp_size) {
pe_set_datadir(IMAGE_DIRECTORY_ENTRY_IMPORT,
- pe->imp_offs + addr, pe->imp_size);
+ pe->imp_offs + addr, pe->imp_size);
pe_set_datadir(IMAGE_DIRECTORY_ENTRY_IAT,
- pe->iat_offs + addr, pe->iat_size);
+ pe->iat_offs + addr, pe->iat_size);
}
if (pe->exp_size) {
pe_set_datadir(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:
- break;
-
- case sec_stabstr:
- break;
}
- psh = &ish[sec_index++];
- strcpy((char *) psh->Name, sh_name);
+ strcpy((char*)psh->Name, sh_name);
- psh->Characteristics = pe_flags[si->id];
+ psh->Characteristics = pe_sec_flags[si->cls];
psh->VirtualAddress = addr;
psh->Misc.VirtualSize = size;
- pe_opt_hdr.SizeOfImage =
- umax(psh->VirtualAddress + psh->Misc.VirtualSize,
- pe_opt_hdr.SizeOfImage);
+ pe_header.opthdr.SizeOfImage =
+ umax(pe_virtual_align(size + addr), pe_header.opthdr.SizeOfImage);
if (si->data_size) {
- psh->PointerToRawData = file_offset;
+ psh->PointerToRawData = r = file_offset;
fwrite(si->data, 1, si->data_size, op);
file_offset = pe_file_align(file_offset + si->data_size);
- psh->SizeOfRawData = file_offset - psh->PointerToRawData;
+ psh->SizeOfRawData = file_offset - r;
pe_fpad(op, file_offset);
}
}
- /*----------------------------------------------------- */
-
- pe_file_hdr.NumberOfSections = sec_index;
- pe_opt_hdr.SizeOfHeaders = pe->sizeofheaders;
- pe_opt_hdr.ImageBase = pe->imagebase;
- if (PE_DLL == pe_type)
- pe_file_hdr.Characteristics = 0x230E;
- else if (PE_GUI != pe_type)
- pe_opt_hdr.Subsystem = 3;
+ // 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;
+ if (PE_DLL == pe->type)
+ pe_header.filehdr.Characteristics = 0x230E;
+ else if (PE_GUI != pe->type)
+ pe_header.opthdr.Subsystem = 3;
fseek(op, SEEK_SET, 0);
- fwrite(&pe_dos_hdr, 1, sizeof pe_dos_hdr, op);
- fwrite(&pe_magic, 1, sizeof pe_magic, op);
- fwrite(&pe_file_hdr, 1, sizeof pe_file_hdr, op);
- fwrite(&pe_opt_hdr, 1, sizeof pe_opt_hdr, op);
- for (i = 0; i < sec_index; ++i)
- fwrite(&ish[i], 1, sizeof(IMAGE_SECTION_HEADER), op);
- fclose(op);
+ fwrite(&pe_header, 1, sizeof pe_header, op);
+ for (i = 0; i < pe->sec_count; ++i)
+ fwrite(&pe->sec_info[i].ish, 1, sizeof(IMAGE_SECTION_HEADER), op);
+ fclose (op);
if (2 == verbose)
printf("-------------------------------\n");
if (verbose)
- printf("<-- %s (%lu bytes)\n", pe->filename, file_offset);
+ printf("<- %s (%lu bytes)\n", pe->filename, file_offset);
return 0;
}
/*----------------------------------------------------------------------------*/
-ST int pe_add_import(struct pe_info *pe, int sym_index, DWORD offset)
+
+ST_FN struct import_symbol *pe_add_import(struct pe_info *pe, int sym_index)
{
int i;
int dll_index;
struct pe_import_info *p;
struct import_symbol *s;
- dll_index =
- ((Elf32_Sym *) pe->s1->dynsymtab_section->data)[sym_index].
- st_other;
- i = dynarray_assoc((void **) pe->imp_info, pe->imp_count, dll_index);
+ dll_index = ((Elf32_Sym *)pe->s1->dynsymtab_section->data + sym_index)->st_value;
+ if (0 == dll_index)
+ return NULL;
+
+ i = dynarray_assoc ((void**)pe->imp_info, pe->imp_count, dll_index);
if (-1 != i) {
p = pe->imp_info[i];
goto found_dll;
}
p = tcc_mallocz(sizeof *p);
p->dll_index = dll_index;
- dynarray_add((void ***) &pe->imp_info, &pe->imp_count, p);
+ dynarray_add((void***)&pe->imp_info, &pe->imp_count, p);
- found_dll:
- i = dynarray_assoc((void **) p->symbols, p->sym_count, sym_index);
+found_dll:
+ i = dynarray_assoc ((void**)p->symbols, p->sym_count, sym_index);
if (-1 != i)
- goto found_sym;
+ return p->symbols[i];
+
s = tcc_mallocz(sizeof *s);
+ dynarray_add((void***)&p->symbols, &p->sym_count, s);
s->sym_index = sym_index;
- s->offset = offset;
- dynarray_add((void ***) &p->symbols, &p->sym_count, s);
-
- found_sym:
- return 1;
+ return s;
}
/*----------------------------------------------------------------------------*/
-ST void pe_build_imports(struct pe_info *pe)
+ST_FN 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;
for (sym_cnt = i = 0; i < ndlls; ++i)
@@ -676,293 +714,447 @@ ST void pe_build_imports(struct pe_info *pe)
pe->imp_size = (ndlls + 1) * sizeof(struct pe_import_header);
pe->iat_offs = dll_ptr + pe->imp_size;
pe->iat_size = (sym_cnt + ndlls) * sizeof(DWORD);
- 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;
ent_ptr = pe->iat_offs + pe->iat_size;
+
for (i = 0; i < pe->imp_count; ++i) {
struct pe_import_header *hdr;
int k, n, v;
struct pe_import_info *p = pe->imp_info[i];
- const char *name = pe->s1->loaded_dlls[p->dll_index]->name;
+ const char *name = pe->s1->loaded_dlls[p->dll_index-1]->name;
/* put the dll name into the import header */
- if (0 == strncmp(name, "lib", 3))
- name += 3;
v = put_elf_str(pe->thunk, name);
- hdr = (struct pe_import_header *) (pe->thunk->data + dll_ptr);
- hdr->first_thunk = thk_ptr + voffset;
- hdr->first_entry = ent_ptr + voffset;
- hdr->lib_name_offset = v + voffset;
+ hdr = (struct pe_import_header*)(pe->thunk->data + dll_ptr);
+ hdr->first_thunk = thk_ptr + rva_base;
+ hdr->first_entry = ent_ptr + rva_base;
+ hdr->lib_name_offset = v + rva_base;
for (k = 0, n = p->sym_count; k <= n; ++k) {
if (k < n) {
- DWORD offset = p->symbols[k]->offset;
+ DWORD iat_index = p->symbols[k]->iat_index;
int sym_index = p->symbols[k]->sym_index;
- Elf32_Sym *sym =
- (Elf32_Sym *) pe->s1->dynsymtab_section->data +
- sym_index;
- const char *name =
- pe->s1->dynsymtab_section->link->data + sym->st_name;
+ Elf32_Sym *imp_sym = (Elf32_Sym *)pe->s1->dynsymtab_section->data + sym_index;
+ Elf32_Sym *org_sym = (Elf32_Sym *)symtab_section->data + iat_index;
+ const char *name = pe->s1->dynsymtab_section->link->data + imp_sym->st_name;
- 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 */
-
- char buffer[100];
- sprintf(buffer, "IAT.%s", name);
- sym_index =
- put_elf_sym(symtab_section, thk_ptr, sizeof(DWORD),
- ELF32_ST_INFO(STB_GLOBAL, STT_OBJECT),
- 0, pe->thunk->sh_num, buffer);
-
- put_elf_reloc(symtab_section, text_section, offset, R_386_32, /*R_JMP_SLOT, */
- sym_index);
- }
- v = pe->thunk->data_offset + voffset;
- section_ptr_add(pe->thunk, sizeof(WORD)); /* hint, not used */
+ org_sym->st_value = thk_ptr;
+ org_sym->st_shndx = pe->thunk->sh_num;
+ v = pe->thunk->data_offset + rva_base;
+ section_ptr_add(pe->thunk, sizeof(WORD)); /* hint, not used */
put_elf_str(pe->thunk, name);
+
} else {
- v = 0; // last entry is zero
+ v = 0; /* last entry is zero */
}
- *(DWORD *) (pe->thunk->data + thk_ptr) =
- *(DWORD *) (pe->thunk->data + ent_ptr) = v;
- thk_ptr += sizeof(DWORD);
- ent_ptr += sizeof(DWORD);
+ *(DWORD*)(pe->thunk->data+thk_ptr) =
+ *(DWORD*)(pe->thunk->data+ent_ptr) = v;
+ thk_ptr += sizeof (DWORD);
+ ent_ptr += sizeof (DWORD);
}
dll_ptr += sizeof(struct pe_import_header);
- dynarray_reset((void ***) &p->symbols, &p->sym_count);
+ dynarray_reset(&p->symbols, &p->sym_count);
}
- dynarray_reset((void ***) &pe->imp_info, &pe->imp_count);
+ dynarray_reset(&pe->imp_info, &pe->imp_count);
}
/* ------------------------------------------------------------- */
-ST int sym_cmp(const void *va, const void *vb)
+/*
+ For now only functions are exported. Export of data
+ would work, but import requires compiler support to
+ do an additional indirection.
+
+ For instance:
+ __declspec(dllimport) extern int something;
+
+ needs to be translated to:
+
+ *(int*)something
+*/
+
+ST_FN int sym_cmp(const void *va, const void *vb)
{
- Elf32_Sym *sa = (Elf32_Sym *)symtab_section->data + *(int*)va;
- Elf32_Sym *sb = (Elf32_Sym *)symtab_section->data + *(int*)vb;
- const char *ca = symtab_section->link->data + sa->st_name;
- const char *cb = symtab_section->link->data + sb->st_name;
+ const char *ca = ((const char **)va)[1];
+ const char *cb = ((const char **)vb)[1];
return strcmp(ca, cb);
}
-ST void pe_build_exports(struct pe_info *pe)
+ST_FN void pe_build_exports(struct pe_info *pe)
{
Elf32_Sym *sym;
- DWORD func_offset, voffset;
+ int sym_index, sym_end;
+ DWORD rva_base, func_o, name_o, ord_o, str_o;
struct pe_export_header *hdr;
- int sym_count, n, ord, *sorted;
+ int sym_count, n, ord, *sorted, *sp;
- voffset = pe->thunk->sh_addr - pe->imagebase;
- sym_count = 0, n = 1, sorted = NULL;
+ FILE *op;
+ char buf[MAX_PATH];
+ const char *dllname;
+ const char *name;
- // for simplicity only functions are exported
- for_sym_in_symtab(sym)
- {
+ rva_base = pe->thunk->sh_addr - pe->imagebase;
+ sym_count = 0, n = 1, sorted = NULL, op = NULL;
+
+ sym_end = symtab_section->data_offset / sizeof(Elf32_Sym);
+ for (sym_index = 1; sym_index < sym_end; ++sym_index) {
+ sym = (Elf32_Sym*)symtab_section->data + sym_index;
+ name = symtab_section->link->data + sym->st_name;
if ((sym->st_other & 1)
- && sym->st_shndx == text_section->sh_num)
+ /* export only symbols from actually written sections */
+ && pe->s1->sections[sym->st_shndx]->sh_addr) {
dynarray_add((void***)&sorted, &sym_count, (void*)n);
+ dynarray_add((void***)&sorted, &sym_count, (void*)name);
+ }
++n;
+#if 0
+ if (sym->st_other & 1)
+ printf("export: %s\n", name);
+ if (sym->st_other & 2)
+ printf("stdcall: %s\n", name);
+#endif
}
if (0 == sym_count)
return;
+ sym_count /= 2;
- qsort (sorted, sym_count, sizeof sorted[0], sym_cmp);
+ qsort (sorted, sym_count, 2 * sizeof sorted[0], sym_cmp);
pe_align_section(pe->thunk, 16);
+ dllname = tcc_basename(pe->filename);
pe->exp_offs = pe->thunk->data_offset;
- hdr = section_ptr_add(pe->thunk,
- sizeof(struct pe_export_header) +
- sym_count * (2 * sizeof(DWORD) + sizeof(WORD)));
+ func_o = pe->exp_offs + 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);
- func_offset = pe->exp_offs + sizeof(struct pe_export_header);
+ 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);
- hdr->Characteristics = 0;
- hdr->Base = 1;
- hdr->NumberOfFunctions = sym_count;
- hdr->NumberOfNames = sym_count;
- hdr->AddressOfFunctions = func_offset + voffset;
- hdr->AddressOfNames = hdr->AddressOfFunctions + sym_count * sizeof(DWORD);
- hdr->AddressOfNameOrdinals = hdr->AddressOfNames + sym_count * sizeof(DWORD);
- hdr->Name = pe->thunk->data_offset + voffset;
- put_elf_str(pe->thunk, tcc_basename(pe->filename));
+#if 1
+ /* automatically write exports to <output-filename>.def */
+ strcpy(buf, pe->filename);
+ strcpy(tcc_fileextension(buf), ".def");
+ op = fopen(buf, "w");
+ if (NULL == op) {
+ error_noabort("could not create '%s': %s", buf, strerror(errno));
+ } else {
+ fprintf(op, "LIBRARY %s\n\nEXPORTS\n", dllname);
+ if (verbose)
+ printf("<- %s (%d symbols)\n", buf, sym_count);
+ }
+#endif
- for (ord = 0; ord < sym_count; ++ord)
+ for (sp = sorted, ord = 0; ord < sym_count; ++ord, sp += 2)
{
- char *name; DWORD *p, *pfunc, *pname; WORD *pord;
- sym = (Elf32_Sym *)symtab_section->data + sorted[ord];
- name = symtab_section->link->data + sym->st_name;
- p = (DWORD*)(pe->thunk->data + func_offset);
- pfunc = p + ord;
- pname = p + sym_count + ord;
- pord = (WORD *)(p + 2*sym_count) + ord;
- *pfunc = sym->st_value + pe->s1->sections[sym->st_shndx]->sh_addr - pe->imagebase;
- *pname = pe->thunk->data_offset + voffset;
- *pord = ord;
+ sym_index = sp[0], name = (const char *)sp[1];
+ /* insert actual address later in pe_relocate_rva */
+ put_elf_reloc(symtab_section, pe->thunk,
+ func_o, R_386_RELATIVE, sym_index);
+ *(DWORD*)(pe->thunk->data + name_o)
+ = pe->thunk->data_offset + rva_base;
+ *(WORD*)(pe->thunk->data + ord_o)
+ = ord;
put_elf_str(pe->thunk, name);
- /* printf("export: %s\n", name); */
+ func_o += sizeof (DWORD);
+ name_o += sizeof (DWORD);
+ ord_o += sizeof (WORD);
+
+ if (op)
+ fprintf(op, "%s\n", name);
}
pe->exp_size = pe->thunk->data_offset - pe->exp_offs;
tcc_free(sorted);
}
/* ------------------------------------------------------------- */
-ST void pe_build_reloc(struct pe_info *pe, int *section_order,
- int section_count)
+ST_FN void pe_build_reloc (struct pe_info *pe)
{
DWORD offset, block_ptr, addr;
int count, i;
Elf32_Rel *rel, *rel_end;
Section *s = NULL, *sr;
+
offset = addr = block_ptr = count = i = 0;
rel = rel_end = NULL;
- for (;;) {
+
+ for(;;) {
if (rel < rel_end) {
int type = ELF32_R_TYPE(rel->r_info);
addr = rel->r_offset + s->sh_addr;
- ++rel;
+ ++ rel;
if (type != R_386_32)
continue;
- if (count == 0) { /* new block */
+ if (count == 0) { /* new block */
block_ptr = pe->reloc->data_offset;
section_ptr_add(pe->reloc, sizeof(struct pe_reloc_header));
- offset = addr & 0xFFFFFFFF << 12;
+ offset = addr & 0xFFFFFFFF<<12;
}
- if ((addr -= offset) < (1 << 12)) { /* one block spans 4k addresses */
- WORD *wp = section_ptr_add(pe->reloc, sizeof(WORD));
- *wp = addr | IMAGE_REL_BASED_HIGHLOW << 12;
+ if ((addr -= offset) < (1<<12)) { /* one block spans 4k addresses */
+ WORD *wp = section_ptr_add(pe->reloc, sizeof (WORD));
+ *wp = addr | IMAGE_REL_BASED_HIGHLOW<<12;
++count;
continue;
}
- --rel;
- } else if (i < section_count) {
- sr = (s = pe->s1->sections[section_order[i++]])->reloc;
+ -- rel;
+
+ } else if (i < pe->sec_count) {
+ sr = (s = pe->s1->sections[pe->sec_info[i++].ord])->reloc;
if (sr) {
- rel = (Elf32_Rel *) sr->data;
- rel_end = (Elf32_Rel *) (sr->data + sr->data_offset);
+ rel = (Elf32_Rel *)sr->data;
+ rel_end = (Elf32_Rel *)(sr->data + sr->data_offset);
}
continue;
}
- if (count) { /* store the last block and ready for a new one */
+ if (count) {
+ /* store the last block and ready for a new one */
struct pe_reloc_header *hdr;
- if (count & 1)
- section_ptr_add(pe->reloc, 2), ++count;
- hdr = (struct pe_reloc_header *) (pe->reloc->data + block_ptr);
- hdr->offset = offset - pe->imagebase;
- hdr->size =
- count * sizeof(WORD) + sizeof(struct pe_reloc_header);
+ if (count & 1) /* align for DWORDS */
+ section_ptr_add(pe->reloc, sizeof(WORD)), ++count;
+ hdr = (struct pe_reloc_header *)(pe->reloc->data + block_ptr);
+ hdr -> offset = offset - pe->imagebase;
+ hdr -> size = count * sizeof(WORD) + sizeof(struct pe_reloc_header);
count = 0;
}
+
if (rel >= rel_end)
break;
}
}
/* ------------------------------------------------------------- */
-ST int pe_assign_addresses(struct pe_info *pe)
+ST_FN int pe_section_class(Section *s)
{
- int i, k, n;
+ 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;
+ } 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_FN int pe_assign_addresses (struct pe_info *pe)
+{
+ int i, k, o, c;
DWORD addr;
- int section_order[pe_sec_number];
- struct section_info *si_data = NULL;
+ 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;
+ }
+ }
+ }
- pe->imagebase = PE_DLL == pe_type ? 0x10000000 : 0x00400000;
+ pe->sec_info = tcc_mallocz(o * sizeof (struct section_info));
addr = pe->imagebase + 1;
- if (PE_DLL == pe_type)
- pe->reloc = new_section(pe->s1, ".reloc", SHT_DYNAMIC, SHF_ALLOC);
+ for (i = 0; i < o; ++i)
+ {
+ k = section_order[i];
+ s = pe->s1->sections[k];
+ c = pe_section_class(s);
+ si = &pe->sec_info[pe->sec_count];
- for (n = k = 0; n < pe_sec_number; ++n) {
- for (i = 1; i < pe->s1->nb_sections; ++i) {
- Section *s = pe->s1->sections[i];
- if (0 == strcmp(s->name, pe_sec_names[n])) {
- struct section_info *si = &pe->sh_info[pe->sec_count];
#ifdef PE_MERGE_DATA
- if (n == sec_bss && si_data) {
- /* append .bss to .data */
- s->sh_addr = addr = ((addr - 1) | 15) + 1;
- addr += s->data_offset;
- si_data->sh_size = addr - si_data->sh_addr;
- } else
+ if (c == sec_bss && pe->sec_count && si[-1].cls == sec_data) {
+ /* append .bss to .data */
+ s->sh_addr = addr = ((addr-1) | 15) + 1;
+ addr += s->data_offset;
+ si[-1].sh_size = addr - si[-1].sh_addr;
+ continue;
+ }
#endif
- {
- si->sh_addr = s->sh_addr = addr =
- pe_virtual_align(addr);
- si->id = n;
+ strcpy(si->name, s->name);
+ si->cls = c;
+ si->ord = k;
+ si->sh_addr = s->sh_addr = addr = pe_virtual_align(addr);
+ si->sh_flags = s->sh_flags;
- if (n == sec_data) {
- pe->thunk = s;
- si_data = si;
- pe_build_imports(pe);
- pe_build_exports(pe);
- } else if (n == sec_reloc) {
- pe_build_reloc(pe, section_order, k);
- }
+ if (c == sec_data && NULL == pe->thunk)
+ pe->thunk = s;
- if (s->data_offset) {
- if (n != sec_bss) {
- si->data = s->data;
- si->data_size = s->data_offset;
- }
+ if (s == pe->thunk) {
+ pe_build_imports(pe);
+ pe_build_exports(pe);
+ }
- addr += s->data_offset;
- si->sh_size = s->data_offset;
- ++pe->sec_count;
- }
- //printf("Section %08X %04X %s\n", si->sh_addr, si->data_size, s->name);
- }
- section_order[k] = i, ++k;
+ if (c == sec_reloc)
+ pe_build_reloc (pe);
+
+ if (s->data_offset)
+ {
+ if (s->sh_type != SHT_NOBITS) {
+ si->data = s->data;
+ 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_REL ? "rel" : "???",
+ s->data_offset,
+ flags & SHF_ALLOC ? "alloc" : "",
+ flags & SHF_WRITE ? "write" : "",
+ flags & SHF_EXECINSTR ? "exec" : ""
+ );
+ }
+ verbose = 2;
+#endif
+
+ tcc_free(section_order);
return 0;
}
+/* ------------------------------------------------------------- */
+ST_FN void pe_relocate_rva (struct pe_info *pe, Section *s)
+{
+ Section *sr = s->reloc;
+ Elf32_Rel *rel, *rel_end;
+ rel_end = (Elf32_Rel *)(sr->data + sr->data_offset);
+ for(rel = (Elf32_Rel *)sr->data; rel < rel_end; rel++)
+ if (ELF32_R_TYPE(rel->r_info) == R_386_RELATIVE) {
+ int sym_index = ELF32_R_SYM(rel->r_info);
+ DWORD addr = s->sh_addr;
+ if (sym_index) {
+ Elf32_Sym *sym = (Elf32_Sym *)symtab_section->data + sym_index;
+ addr = sym->st_value;
+ }
+ *(DWORD*)(s->data + rel->r_offset) += addr - pe->imagebase;
+ }
+}
+
/*----------------------------------------------------------------------------*/
-ST int pe_check_symbols(struct pe_info *pe)
+ST_FN int pe_check_symbols(struct pe_info *pe)
{
Elf32_Sym *sym;
+ int sym_index, sym_end;
int ret = 0;
pe_align_section(text_section, 8);
- for_sym_in_symtab(sym) {
+ sym_end = symtab_section->data_offset / sizeof(Elf32_Sym);
+ for (sym_index = 1; sym_index < sym_end; ++sym_index) {
+
+ sym = (Elf32_Sym*)symtab_section->data + sym_index;
if (sym->st_shndx == SHN_UNDEF) {
- const char *symbol = symtab_section->link->data + sym->st_name;
+
+ const char *name = symtab_section->link->data + sym->st_name;
unsigned type = ELF32_ST_TYPE(sym->st_info);
- int sym_index = pe_find_import(pe->s1, symbol, NULL);
- if (sym_index) {
- if (type == STT_FUNC) {
- unsigned long offset = text_section->data_offset;
- if (pe_add_import(pe, sym_index, offset + 2)) {
- /* add the 'jmp IAT[x]' instruction */
- *(WORD *) section_ptr_add(text_section, 8) =
- 0x25FF;
- /* patch the symbol */
- sym->st_shndx = text_section->sh_num;
- sym->st_value = offset;
- continue;
- }
- } else if (type == STT_OBJECT) { /* data, ptr to that should be */
- if (pe_add_import(pe, sym_index,
- (sym -
- (Elf32_Sym *) symtab_section->data) |
- 0x80000000))
- continue;
+ int imp_sym = pe_find_import(pe->s1, name);
+ struct import_symbol *is;
+
+ if (0 == imp_sym)
+ goto not_found;
+ is = pe_add_import(pe, imp_sym);
+ if (!is)
+ goto not_found;
+
+ if (type == STT_FUNC) {
+ unsigned long offset = is->thk_offset;
+ if (offset) {
+ /* got aliased symbol, like stricmp and _stricmp */
+
+ } else {
+ char buffer[100];
+
+ offset = text_section->data_offset;
+ /* add the 'jmp IAT[x]' instruction */
+ *(WORD*)section_ptr_add(text_section, 8) = 0x25FF;
+
+ /* add a helper symbol, will be patched later in
+ pe_build_imports */
+ sprintf(buffer, "IAT.%s", name);
+ is->iat_index = put_elf_sym(
+ symtab_section, 0, sizeof(DWORD),
+ ELF32_ST_INFO(STB_GLOBAL, STT_OBJECT),
+ 0, SHN_UNDEF, buffer);
+ put_elf_reloc(symtab_section, text_section,
+ offset + 2, R_386_32, is->iat_index);
+ is->thk_offset = offset;
}
+
+ /* tcc_realloc might have altered sym's address */
+ sym = (Elf32_Sym*)symtab_section->data + sym_index;
+
+ /* patch the original symbol */
+ sym->st_value = offset;
+ sym->st_shndx = text_section->sh_num;
+ sym->st_other &= ~1; /* do not export */
+ continue;
}
- error_noabort("undefined symbol '%s'", symbol);
+
+ if (type == STT_OBJECT) { /* data, ptr to that should be */
+ if (0 == is->iat_index) {
+ /* original symbol will be patched later in pe_build_imports */
+ is->iat_index = sym_index;
+ continue;
+ }
+ }
+
+ not_found:
+ error_noabort("undefined symbol '%s'", name);
ret = 1;
- } else
- if (pe->s1->rdynamic
- && ELF32_ST_BIND(sym->st_info) != STB_LOCAL) {
+
+ } else if (pe->s1->rdynamic
+ && ELF32_ST_BIND(sym->st_info) != STB_LOCAL) {
/* if -rdynamic option, then export all non local symbols */
sym->st_other |= 1;
}
@@ -972,8 +1164,9 @@ ST int pe_check_symbols(struct pe_info *pe)
/*----------------------------------------------------------------------------*/
#ifdef PE_PRINT_SECTIONS
-ST void pe_print_section(FILE * f, Section * s)
-{ /* just if you'r curious */
+ST_FN void pe_print_section(FILE * f, Section * s)
+{
+ /* just if you'r curious */
BYTE *p, *e, b;
int i, n, l, m;
p = s->data;
@@ -992,6 +1185,9 @@ ST void pe_print_section(FILE * f, Section * s)
if (s->sh_type == SHT_NOBITS)
return;
+ if (0 == l)
+ return;
+
if (s->sh_type == SHT_SYMTAB)
m = sizeof(Elf32_Sym);
if (s->sh_type == SHT_REL)
@@ -999,7 +1195,49 @@ ST void pe_print_section(FILE * f, Section * s)
else
m = 16;
- for (i = 0; i < l;) {
+ 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_REL) {
+ 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)
+ fprintf(f, "-");
+ fprintf(f, "\n");
+
+ for (i = 0; i < l;)
+ {
fprintf(f, "%08X", i);
for (n = 0; n < m; ++n) {
if (n + i < l)
@@ -1011,31 +1249,20 @@ ST void pe_print_section(FILE * f, Section * s)
if (s->sh_type == SHT_SYMTAB) {
Elf32_Sym *sym = (Elf32_Sym *) (p + i);
const char *name = s->link->data + sym->st_name;
- fprintf(f,
- " name:%04X"
- " value:%04X"
- " size:%04X"
- " bind:%02X"
- " type:%02X"
- " other:%02X"
- " shndx:%04X"
- " \"%s\"",
+ fprintf(f, " %04X %04X %04X %02X %02X %02X %04X \"%s\"",
sym->st_name,
sym->st_value,
sym->st_size,
ELF32_ST_BIND(sym->st_info),
ELF32_ST_TYPE(sym->st_info),
sym->st_other, sym->st_shndx, name);
+
} else if (s->sh_type == SHT_REL) {
Elf32_Rel *rel = (Elf32_Rel *) (p + i);
Elf32_Sym *sym =
(Elf32_Sym *) s->link->data + ELF32_R_SYM(rel->r_info);
const char *name = s->link->link->data + sym->st_name;
- fprintf(f,
- " offset:%04X"
- " type:%02X"
- " symbol:%04X"
- " \"%s\"",
+ fprintf(f, " %04X %02X %04X \"%s\"",
rel->r_offset,
ELF32_R_TYPE(rel->r_info),
ELF32_R_SYM(rel->r_info), name);
@@ -1055,190 +1282,270 @@ ST void pe_print_section(FILE * f, Section * s)
}
fprintf(f, "\n\n");
}
+
+ST_FN void pe_print_sections(TCCState *s1, const char *fname)
+{
+ Section *s;
+ FILE *f;
+ int i;
+ f = fopen(fname, "wt");
+ 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
-static int pe_test_cmd(const char **pp, const char *cmd)
+/* -------------------------------------------------------------
+ * This is for compiled windows resources in 'coff' format
+ * as generated by 'windres.exe -O coff ...'.
+ */
+
+PUB_FN int pe_test_res_file(void *v, int size)
{
- const char *p;
- char *q, buf[16];
- int ret;
+ struct pe_rsrc_header *p = (struct pe_rsrc_header *)v;
+ return
+ size >= IMAGE_SIZEOF_FILE_HEADER + IMAGE_SIZEOF_SHORT_NAME /* = 28 */
+ && p->filehdr.Machine == 0x014C
+ && 1 == p->filehdr.NumberOfSections
+ && 0 == strcmp(p->sectionhdr.Name, ".rsrc")
+ ;
+}
- p = *pp;
- q = buf;
- while (*p != '\0' && !is_space(*p)) {
- if ((q - buf) < sizeof(buf) - 1)
- *q++ = toup(*p);
- p++;
+ST_FN int read_n(int fd, void *ptr, unsigned size)
+{
+ return size == read(fd, ptr, size);
+}
+
+PUB_FN int pe_load_res_file(TCCState *s1, int fd)
+{
+ struct pe_rsrc_header hdr;
+ Section *rsrc_section;
+ int i, ret = -1;
+ BYTE *ptr;
+
+ lseek (fd, 0, SEEK_SET);
+ if (!read_n(fd, &hdr, sizeof hdr))
+ goto quit;
+ if (!pe_test_res_file(&hdr, sizeof hdr))
+ goto quit;
+
+ rsrc_section = new_section(s1, ".rsrc", SHT_PROGBITS, SHF_ALLOC);
+ ptr = section_ptr_add(rsrc_section, hdr.sectionhdr.SizeOfRawData);
+ lseek (fd, hdr.sectionhdr.PointerToRawData, SEEK_SET);
+ if (!read_n(fd, ptr, hdr.sectionhdr.SizeOfRawData))
+ goto quit;
+
+ lseek (fd, hdr.sectionhdr.PointerToRelocations, SEEK_SET);
+ for (i = 0; i < hdr.sectionhdr.NumberOfRelocations; ++i)
+ {
+ struct pe_rsrc_reloc rel;
+ if (!read_n(fd, &rel, sizeof rel))
+ goto quit;
+ // printf("rsrc_reloc: %x %x %x\n", rel.offset, rel.size, rel.type);
+ if (rel.type != 7) /* DIR32NB */
+ goto quit;
+ put_elf_reloc(symtab_section, rsrc_section,
+ rel.offset, R_386_RELATIVE, 0);
}
- *q = '\0';
- ret = !strcmp(buf, cmd);
- *pp = p;
+ ret = 0;
+quit:
+ if (ret)
+ error_noabort("unrecognized resource file format");
return ret;
}
/* ------------------------------------------------------------- */
-int pe_load_def_file(TCCState * s1, FILE * fp)
+ST_FN char *trimfront(char *p)
+{
+ while (*p && (unsigned char)*p <= ' ')
+ ++p;
+ return p;
+}
+
+ST_FN char *trimback(char *a, char *e)
+{
+ while (e > a && (unsigned char)e[-1] <= ' ')
+ --e;
+ *e = 0;;
+ return a;
+}
+
+ST_FN char *get_line(char *line, int size, FILE *fp)
+{
+ if (NULL == fgets(line, size, fp))
+ return NULL;
+ trimback(line, strchr(line, 0));
+ return trimfront(line);
+}
+
+/* ------------------------------------------------------------- */
+PUB_FN int pe_load_def_file(TCCState *s1, int fd)
{
DLLReference *dllref;
- int f = 0, sym_index;
- char *p, line[120], dllname[40];
- while (fgets(line, sizeof line, fp)) {
- p = strchr(line, 0);
- while (p > line && p[-1] <= ' ')
- --p;
- *p = 0;
- p = line;
- while (*p && *p <= ' ')
- ++p;
+ int state = 0, ret = -1;
+ char line[400], dllname[80], *p;
+ FILE *fp = fdopen(dup(fd), "rb");
- if (*p && ';' != *p)
- switch (f) {
- case 0:
- if (!pe_test_cmd((const char **)&p, "LIBRARY"))
- return -1;
- while (is_space(*p))
- p++;
- pstrcpy(dllname, sizeof(dllname), p);
- ++f;
- continue;
+ if (NULL == fp)
+ goto quit;
- case 1:
- if (!pe_test_cmd((const char **)&p, "EXPORTS"))
- return -1;
- ++f;
- continue;
+ for (;;) {
+ p = get_line(line, sizeof line, fp);
+ if (NULL == p)
+ break;
+ if (0 == *p || ';' == *p)
+ continue;
+ switch (state) {
+ case 0:
+ if (0 != strnicmp(p, "LIBRARY", 7))
+ goto quit;
+ strcpy(dllname, trimfront(p+7));
+ ++state;
+ continue;
- case 2:
- dllref =
- tcc_malloc(sizeof(DLLReference) + strlen(dllname));
- strcpy(dllref->name, dllname);
- dllref->level = 0;
- dynarray_add((void ***) &s1->loaded_dlls,
- &s1->nb_loaded_dlls, dllref);
- ++f;
+ case 1:
+ if (0 != stricmp(p, "EXPORTS"))
+ goto quit;
+ ++state;
+ continue;
- default:
- /* tccpe needs to know from what dll it should import
- the sym */
- sym_index = add_elf_sym(s1->dynsymtab_section,
- 0, 0, ELF32_ST_INFO(STB_GLOBAL,
- STT_FUNC),
- s1->nb_loaded_dlls - 1,
- text_section->sh_num, p);
- continue;
- }
+ case 2:
+ dllref = tcc_malloc(sizeof(DLLReference) + strlen(dllname));
+ strcpy(dllref->name, dllname);
+ dllref->level = 0;
+ dynarray_add((void ***) &s1->loaded_dlls, &s1->nb_loaded_dlls, dllref);
+ ++state;
+
+ default:
+ add_elf_sym(s1->dynsymtab_section,
+ s1->nb_loaded_dlls, 0,
+ ELF32_ST_INFO(STB_GLOBAL, STT_FUNC), 0,
+ text_section->sh_num, p);
+ continue;
+ }
}
- return 0;
+ ret = 0;
+quit:
+ if (fp)
+ fclose(fp);
+ if (ret)
+ error_noabort("unrecognized export definition file format");
+ return ret;
}
/* ------------------------------------------------------------- */
-void pe_guess_outfile(char *objfilename, int output_type)
-{
- char *ext = strrchr(objfilename, '.');
- if (NULL == ext)
- ext = strchr(objfilename, 0);
- if (output_type == TCC_OUTPUT_DLL)
- strcpy(ext, ".dll");
- else
- if (output_type == TCC_OUTPUT_EXE)
- strcpy(ext, ".exe");
- else
- if (output_type == TCC_OUTPUT_OBJ && strcmp(ext, ".o"))
- strcpy(ext, ".o");
- else
- error("no outputfile given");
-}
-/* ------------------------------------------------------------- */
-unsigned long pe_add_runtime(TCCState * s1)
+ST_FN void pe_add_runtime_ex(TCCState *s1, struct pe_info *pe)
{
const char *start_symbol;
- unsigned long addr;
+ unsigned long addr = 0;
+ int pe_type = 0;
- if (find_elf_sym(symtab_section, "WinMain"))
+ if (find_elf_sym(symtab_section, "_WinMain@16"))
pe_type = PE_GUI;
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()'
+ /* need this for 'tccelf.c:relocate_section()' */
s1->output_type = TCC_OUTPUT_EXE;
}
start_symbol =
TCC_OUTPUT_MEMORY == s1->output_type
? PE_GUI == pe_type ? "_runwinmain" : NULL
- : PE_DLL == pe_type ? "_dllstart"
- : PE_GUI == pe_type ? "_winstart" : "_start";
+ : PE_DLL == pe_type ? "__dllstart@12"
+ : PE_GUI == pe_type ? "_winstart" : "_start"
+ ;
/* grab the startup code from libtcc1 */
if (start_symbol)
add_elf_sym(symtab_section,
- 0, 0,
- ELF32_ST_INFO(STB_GLOBAL, STT_NOTYPE), 0,
- SHN_UNDEF, start_symbol);
+ 0, 0,
+ ELF32_ST_INFO(STB_GLOBAL, STT_NOTYPE), 0,
+ SHN_UNDEF, start_symbol);
if (0 == s1->nostdlib) {
tcc_add_library(s1, "tcc1");
+#ifdef __CYGWIN__
+ tcc_add_library(s1, "cygwin1");
+#else
tcc_add_library(s1, "msvcrt");
+#endif
+ tcc_add_library(s1, "kernel32");
if (PE_DLL == pe_type || PE_GUI == pe_type) {
- tcc_add_library(s1, "kernel32");
tcc_add_library(s1, "user32");
tcc_add_library(s1, "gdi32");
}
}
- addr = start_symbol ?
- (unsigned long) tcc_get_symbol_err(s1, start_symbol) : 0;
-
- if (s1->output_type == TCC_OUTPUT_MEMORY && addr) {
- /* for -run GUI's, put '_runwinmain' instead of 'main' */
- add_elf_sym(symtab_section,
+ if (start_symbol) {
+ addr = (unsigned long)tcc_get_symbol_err(s1, start_symbol);
+ if (s1->output_type == TCC_OUTPUT_MEMORY && addr)
+ /* for -run GUI's, put '_runwinmain' instead of 'main' */
+ add_elf_sym(symtab_section,
addr, 0,
ELF32_ST_INFO(STB_GLOBAL, STT_NOTYPE), 0,
text_section->sh_num, "main");
+ }
- /* FreeConsole(); */
+ if (pe) {
+ pe->type = pe_type;
+ pe->start_addr = addr;
}
- return addr;
}
-int tcc_output_pe(TCCState * s1, const char *filename)
+PUB_FN void pe_add_runtime(TCCState *s1)
+{
+ pe_add_runtime_ex(s1, NULL);
+}
+
+PUB_FN int pe_output_file(TCCState * s1, const char *filename)
{
int ret;
struct pe_info pe;
int i;
+
memset(&pe, 0, sizeof pe);
pe.filename = filename;
pe.s1 = s1;
- pe.start_addr = pe_add_runtime(s1);
- relocate_common_syms(); /* assign bss adresses */
+ pe_add_runtime_ex(s1, &pe);
+ relocate_common_syms(); /* assign bss adresses */
+ tcc_add_linker_symbols(s1);
+
ret = pe_check_symbols(&pe);
if (0 == ret) {
+ if (PE_DLL == pe.type) {
+ pe.reloc = new_section(pe.s1, ".reloc", SHT_PROGBITS, 0);
+ pe.imagebase = 0x10000000;
+ } else {
+ pe.imagebase = 0x00400000;
+ }
pe_assign_addresses(&pe);
relocate_syms(s1, 0);
for (i = 1; i < s1->nb_sections; ++i) {
Section *s = s1->sections[i];
- if (s->reloc)
+ if (s->reloc) {
relocate_section(s1, s);
+ pe_relocate_rva(&pe, s);
+ }
}
- ret = pe_write_pe(&pe);
+ if (s1->nb_errors)
+ ret = 1;
+ else
+ ret = pe_write(&pe);
+ tcc_free(pe.sec_info);
}
+
#ifdef PE_PRINT_SECTIONS
- {
- Section *s;
- FILE *f;
- f = fopen("tccpe.log", "wt");
- 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);
- }
+ pe_print_sections(s1, "tcc.log");
#endif
return ret;
}
-/*----------------------------------------------------------------------------*/
+/* ------------------------------------------------------------- */
+#endif /* def TCC_TARGET_PE */
+/* ------------------------------------------------------------- */