| @@ -1,7 +1,7 @@ |
| 1 | 1 | /* |
| 2 | | − * TCCPE.C - PE file output for the TinyC Compiler |
| 3 | | − * |
| 4 | | − * Copyright (c) 2005 grischka |
| 2 | + * TCCPE.C - PE file output for the Tiny C Compiler |
| 3 | + * |
| 4 | + * Copyright (c) 2005-2007 grischka |
| 5 | 5 | * |
| 6 | 6 | * This library is free software; you can redistribute it and/or |
| 7 | 7 | * modify it under the terms of the GNU Lesser General Public |
| @@ -18,251 +18,189 @@ · 10 unmodified lines |
| 18 | 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 19 | 19 | */ |
| 20 | 20 | |
| 21 | | −typedef unsigned char BYTE; |
| 22 | | −typedef unsigned short WORD; |
| 23 | | −typedef unsigned long DWORD; |
| 24 | | −#define ST static |
| 21 | +#ifdef TCC_TARGET_PE |
| 25 | 22 | |
| 26 | | −/* XXX: move that to TCC ? */ |
| 27 | | −int verbose = 0; |
| 23 | +#define ST_FN static |
| 24 | +#define ST_DATA static |
| 25 | +#define PUB_FN |
| 28 | 26 | |
| 29 | | −/* definitions below are from winnt.h */ |
| 27 | +#ifndef _WIN32 |
| 28 | +#define stricmp strcasecmp |
| 29 | +#define strnicmp strncasecmp |
| 30 | +#endif |
| 31 | + |
| 32 | +#ifndef MAX_PATH |
| 33 | +#define MAX_PATH 260 |
| 34 | +#endif |
| 30 | 35 | |
| 31 | | −typedef struct _IMAGE_DOS_HEADER { /* DOS .EXE header */ |
| 32 | | − WORD e_magic; /* Magic number */ |
| 33 | | − WORD e_cblp; /* Bytes on last page of file */ |
| 34 | | − WORD e_cp; /* Pages in file */ |
| 35 | | − WORD e_crlc; /* Relocations */ |
| 36 | | − WORD e_cparhdr; /* Size of header in paragraphs */ |
| 37 | | − WORD e_minalloc; /* Minimum extra paragraphs needed */ |
| 38 | | − WORD e_maxalloc; /* Maximum extra paragraphs needed */ |
| 39 | | − WORD e_ss; /* Initial (relative) SS value */ |
| 40 | | − WORD e_sp; /* Initial SP value */ |
| 41 | | − WORD e_csum; /* Checksum */ |
| 42 | | − WORD e_ip; /* Initial IP value */ |
| 43 | | − WORD e_cs; /* Initial (relative) CS value */ |
| 44 | | − WORD e_lfarlc; /* File address of relocation table */ |
| 45 | | − WORD e_ovno; /* Overlay number */ |
| 46 | | − WORD e_res[4]; /* Reserved words */ |
| 47 | | − WORD e_oemid; /* OEM identifier (for e_oeminfo) */ |
| 48 | | − WORD e_oeminfo; /* OEM information; e_oemid specific */ |
| 49 | | − WORD e_res2[10]; /* Reserved words */ |
| 50 | | − DWORD e_lfanew; /* File address of new exe header */ |
| 51 | | − BYTE e_code[0x40]; |
| 36 | +#define PE_MERGE_DATA |
| 37 | +// #define PE_PRINT_SECTIONS |
| 52 | 38 | |
| 39 | +/* ----------------------------------------------------------- */ |
| 40 | +#ifndef IMAGE_NT_SIGNATURE |
| 41 | +/* ----------------------------------------------------------- */ |
| 42 | +/* definitions below are from winnt.h */ |
| 43 | + |
| 44 | +typedef unsigned char BYTE; |
| 45 | +typedef unsigned short WORD; |
| 46 | +typedef unsigned long DWORD; |
| 47 | +#pragma pack(push, 1) |
| 48 | + |
| 49 | +typedef struct _IMAGE_DOS_HEADER { /* DOS .EXE header */ |
| 50 | + WORD e_magic; /* Magic number */ |
| 51 | + WORD e_cblp; /* Bytes on last page of file */ |
| 52 | + WORD e_cp; /* Pages in file */ |
| 53 | + WORD e_crlc; /* Relocations */ |
| 54 | + WORD e_cparhdr; /* Size of header in paragraphs */ |
| 55 | + WORD e_minalloc; /* Minimum extra paragraphs needed */ |
| 56 | + WORD e_maxalloc; /* Maximum extra paragraphs needed */ |
| 57 | + WORD e_ss; /* Initial (relative) SS value */ |
| 58 | + WORD e_sp; /* Initial SP value */ |
| 59 | + WORD e_csum; /* Checksum */ |
| 60 | + WORD e_ip; /* Initial IP value */ |
| 61 | + WORD e_cs; /* Initial (relative) CS value */ |
| 62 | + WORD e_lfarlc; /* File address of relocation table */ |
| 63 | + WORD e_ovno; /* Overlay number */ |
| 64 | + WORD e_res[4]; /* Reserved words */ |
| 65 | + WORD e_oemid; /* OEM identifier (for e_oeminfo) */ |
| 66 | + WORD e_oeminfo; /* OEM information; e_oemid specific */ |
| 67 | + WORD e_res2[10]; /* Reserved words */ |
| 68 | + DWORD e_lfanew; /* File address of new exe header */ |
| 53 | 69 | } IMAGE_DOS_HEADER, *PIMAGE_DOS_HEADER; |
| 54 | 70 | |
| 55 | 71 | #define IMAGE_NT_SIGNATURE 0x00004550 /* PE00 */ |
| 56 | 72 | #define SIZE_OF_NT_SIGNATURE 4 |
| 57 | 73 | |
| 58 | 74 | typedef struct _IMAGE_FILE_HEADER { |
| 59 | | − WORD Machine; |
| 60 | | − WORD NumberOfSections; |
| 61 | | − DWORD TimeDateStamp; |
| 62 | | − DWORD PointerToSymbolTable; |
| 63 | | − DWORD NumberOfSymbols; |
| 64 | | − WORD SizeOfOptionalHeader; |
| 65 | | − WORD Characteristics; |
| 75 | + WORD Machine; |
| 76 | + WORD NumberOfSections; |
| 77 | + DWORD TimeDateStamp; |
| 78 | + DWORD PointerToSymbolTable; |
| 79 | + DWORD NumberOfSymbols; |
| 80 | + WORD SizeOfOptionalHeader; |
| 81 | + WORD Characteristics; |
| 66 | 82 | } IMAGE_FILE_HEADER, *PIMAGE_FILE_HEADER; |
| 67 | 83 | |
| 68 | 84 | |
| 69 | 85 | #define IMAGE_SIZEOF_FILE_HEADER 20 |
| 70 | 86 | |
| 71 | 87 | typedef struct _IMAGE_DATA_DIRECTORY { |
| 72 | | − DWORD VirtualAddress; |
| 73 | | − DWORD Size; |
| 88 | + DWORD VirtualAddress; |
| 89 | + DWORD Size; |
| 74 | 90 | } IMAGE_DATA_DIRECTORY, *PIMAGE_DATA_DIRECTORY; |
| 75 | 91 | |
| 76 | 92 | |
| 77 | 93 | typedef struct _IMAGE_OPTIONAL_HEADER { |
| 78 | 94 | /* Standard fields. */ |
| 79 | | − WORD Magic; |
| 80 | | − BYTE MajorLinkerVersion; |
| 81 | | − BYTE MinorLinkerVersion; |
| 82 | | − DWORD SizeOfCode; |
| 83 | | − DWORD SizeOfInitializedData; |
| 84 | | − DWORD SizeOfUninitializedData; |
| 85 | | − DWORD AddressOfEntryPoint; |
| 86 | | − DWORD BaseOfCode; |
| 87 | | − DWORD BaseOfData; |
| 95 | + WORD Magic; |
| 96 | + BYTE MajorLinkerVersion; |
| 97 | + BYTE MinorLinkerVersion; |
| 98 | + DWORD SizeOfCode; |
| 99 | + DWORD SizeOfInitializedData; |
| 100 | + DWORD SizeOfUninitializedData; |
| 101 | + DWORD AddressOfEntryPoint; |
| 102 | + DWORD BaseOfCode; |
| 103 | + DWORD BaseOfData; |
| 88 | 104 | |
| 89 | 105 | /* NT additional fields. */ |
| 90 | | − DWORD ImageBase; |
| 91 | | − DWORD SectionAlignment; |
| 92 | | − DWORD FileAlignment; |
| 93 | | − WORD MajorOperatingSystemVersion; |
| 94 | | − WORD MinorOperatingSystemVersion; |
| 95 | | − WORD MajorImageVersion; |
| 96 | | − WORD MinorImageVersion; |
| 97 | | − WORD MajorSubsystemVersion; |
| 98 | | − WORD MinorSubsystemVersion; |
| 99 | | − DWORD Win32VersionValue; |
| 100 | | − DWORD SizeOfImage; |
| 101 | | − DWORD SizeOfHeaders; |
| 102 | | − DWORD CheckSum; |
| 103 | | − WORD Subsystem; |
| 104 | | − WORD DllCharacteristics; |
| 105 | | − DWORD SizeOfStackReserve; |
| 106 | | − DWORD SizeOfStackCommit; |
| 107 | | − DWORD SizeOfHeapReserve; |
| 108 | | − DWORD SizeOfHeapCommit; |
| 109 | | − DWORD LoaderFlags; |
| 110 | | − DWORD NumberOfRvaAndSizes; |
| 106 | + DWORD ImageBase; |
| 107 | + DWORD SectionAlignment; |
| 108 | + DWORD FileAlignment; |
| 109 | + WORD MajorOperatingSystemVersion; |
| 110 | + WORD MinorOperatingSystemVersion; |
| 111 | + WORD MajorImageVersion; |
| 112 | + WORD MinorImageVersion; |
| 113 | + WORD MajorSubsystemVersion; |
| 114 | + WORD MinorSubsystemVersion; |
| 115 | + DWORD Win32VersionValue; |
| 116 | + DWORD SizeOfImage; |
| 117 | + DWORD SizeOfHeaders; |
| 118 | + DWORD CheckSum; |
| 119 | + WORD Subsystem; |
| 120 | + WORD DllCharacteristics; |
| 121 | + DWORD SizeOfStackReserve; |
| 122 | + DWORD SizeOfStackCommit; |
| 123 | + DWORD SizeOfHeapReserve; |
| 124 | + DWORD SizeOfHeapCommit; |
| 125 | + DWORD LoaderFlags; |
| 126 | + DWORD NumberOfRvaAndSizes; |
| 111 | 127 | IMAGE_DATA_DIRECTORY DataDirectory[16]; |
| 112 | 128 | |
| 113 | | −} IMAGE_OPTIONAL_HEADER32, *PIMAGE_OPTIONAL_HEADER32; |
| 129 | +} IMAGE_OPTIONAL_HEADER, *PIMAGE_OPTIONAL_HEADER; |
| 114 | 130 | |
| 115 | 131 | |
| 116 | | −#define IMAGE_DIRECTORY_ENTRY_EXPORT 0 /* Export Directory */ |
| 117 | | −#define IMAGE_DIRECTORY_ENTRY_IMPORT 1 /* Import Directory */ |
| 118 | | −#define IMAGE_DIRECTORY_ENTRY_RESOURCE 2 /* Resource Directory */ |
| 119 | | −#define IMAGE_DIRECTORY_ENTRY_EXCEPTION 3 /* Exception Directory */ |
| 120 | | −#define IMAGE_DIRECTORY_ENTRY_SECURITY 4 /* Security Directory */ |
| 121 | | −#define IMAGE_DIRECTORY_ENTRY_BASERELOC 5 /* Base Relocation Table */ |
| 122 | | −#define IMAGE_DIRECTORY_ENTRY_DEBUG 6 /* Debug Directory */ |
| 132 | +#define IMAGE_DIRECTORY_ENTRY_EXPORT 0 /* Export Directory */ |
| 133 | +#define IMAGE_DIRECTORY_ENTRY_IMPORT 1 /* Import Directory */ |
| 134 | +#define IMAGE_DIRECTORY_ENTRY_RESOURCE 2 /* Resource Directory */ |
| 135 | +#define IMAGE_DIRECTORY_ENTRY_EXCEPTION 3 /* Exception Directory */ |
| 136 | +#define IMAGE_DIRECTORY_ENTRY_SECURITY 4 /* Security Directory */ |
| 137 | +#define IMAGE_DIRECTORY_ENTRY_BASERELOC 5 /* Base Relocation Table */ |
| 138 | +#define IMAGE_DIRECTORY_ENTRY_DEBUG 6 /* Debug Directory */ |
| 123 | 139 | /* IMAGE_DIRECTORY_ENTRY_COPYRIGHT 7 (X86 usage) */ |
| 124 | | −#define IMAGE_DIRECTORY_ENTRY_ARCHITECTURE 7 /* Architecture Specific Data */ |
| 125 | | −#define IMAGE_DIRECTORY_ENTRY_GLOBALPTR 8 /* RVA of GP */ |
| 126 | | −#define IMAGE_DIRECTORY_ENTRY_TLS 9 /* TLS Directory */ |
| 127 | | −#define IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG 10 /* Load Configuration Directory */ |
| 128 | | −#define IMAGE_DIRECTORY_ENTRY_BOUND_IMPORT 11 /* Bound Import Directory in headers */ |
| 129 | | −#define IMAGE_DIRECTORY_ENTRY_IAT 12 /* Import Address Table */ |
| 130 | | −#define IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT 13 /* Delay Load Import Descriptors */ |
| 131 | | −#define IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR 14 /* COM Runtime descriptor */ |
| 140 | +#define IMAGE_DIRECTORY_ENTRY_ARCHITECTURE 7 /* Architecture Specific Data */ |
| 141 | +#define IMAGE_DIRECTORY_ENTRY_GLOBALPTR 8 /* RVA of GP */ |
| 142 | +#define IMAGE_DIRECTORY_ENTRY_TLS 9 /* TLS Directory */ |
| 143 | +#define IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG 10 /* Load Configuration Directory */ |
| 144 | +#define IMAGE_DIRECTORY_ENTRY_BOUND_IMPORT 11 /* Bound Import Directory in headers */ |
| 145 | +#define IMAGE_DIRECTORY_ENTRY_IAT 12 /* Import Address Table */ |
| 146 | +#define IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT 13 /* Delay Load Import Descriptors */ |
| 147 | +#define IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR 14 /* COM Runtime descriptor */ |
| 132 | 148 | |
| 133 | 149 | /* Section header format. */ |
| 134 | | −#define IMAGE_SIZEOF_SHORT_NAME 8 |
| 150 | +#define IMAGE_SIZEOF_SHORT_NAME 8 |
| 135 | 151 | |
| 136 | 152 | typedef struct _IMAGE_SECTION_HEADER { |
| 137 | | − BYTE Name[IMAGE_SIZEOF_SHORT_NAME]; |
| 153 | + BYTE Name[IMAGE_SIZEOF_SHORT_NAME]; |
| 138 | 154 | union { |
| 139 | | − DWORD PhysicalAddress; |
| 140 | | − DWORD VirtualSize; |
| 155 | + DWORD PhysicalAddress; |
| 156 | + DWORD VirtualSize; |
| 141 | 157 | } Misc; |
| 142 | | − DWORD VirtualAddress; |
| 143 | | − DWORD SizeOfRawData; |
| 144 | | − DWORD PointerToRawData; |
| 145 | | − DWORD PointerToRelocations; |
| 146 | | − DWORD PointerToLinenumbers; |
| 147 | | − WORD NumberOfRelocations; |
| 148 | | − WORD NumberOfLinenumbers; |
| 149 | | − DWORD Characteristics; |
| 158 | + DWORD VirtualAddress; |
| 159 | + DWORD SizeOfRawData; |
| 160 | + DWORD PointerToRawData; |
| 161 | + DWORD PointerToRelocations; |
| 162 | + DWORD PointerToLinenumbers; |
| 163 | + WORD NumberOfRelocations; |
| 164 | + WORD NumberOfLinenumbers; |
| 165 | + DWORD Characteristics; |
| 150 | 166 | } IMAGE_SECTION_HEADER, *PIMAGE_SECTION_HEADER; |
| 151 | 167 | |
| 152 | | −#define IMAGE_SIZEOF_SECTION_HEADER 40 |
| 168 | +#define IMAGE_SIZEOF_SECTION_HEADER 40 |
| 153 | 169 | |
| 154 | | −/* ----------------------------------------------------------- */ |
| 155 | 170 | typedef struct _IMAGE_BASE_RELOCATION { |
| 156 | | − DWORD VirtualAddress; |
| 157 | | − DWORD SizeOfBlock; |
| 171 | + DWORD VirtualAddress; |
| 172 | + DWORD SizeOfBlock; |
| 158 | 173 | // WORD TypeOffset[1]; |
| 159 | 174 | } IMAGE_BASE_RELOCATION; |
| 160 | 175 | |
| 161 | | −#define IMAGE_SIZEOF_BASE_RELOCATION 8 |
| 176 | +#define IMAGE_SIZEOF_BASE_RELOCATION 8 |
| 162 | 177 | |
| 163 | | −#define IMAGE_REL_BASED_ABSOLUTE 0 |
| 164 | | −#define IMAGE_REL_BASED_HIGH 1 |
| 165 | | −#define IMAGE_REL_BASED_LOW 2 |
| 166 | | −#define IMAGE_REL_BASED_HIGHLOW 3 |
| 167 | | −#define IMAGE_REL_BASED_HIGHADJ 4 |
| 168 | | −#define IMAGE_REL_BASED_MIPS_JMPADDR 5 |
| 169 | | −#define IMAGE_REL_BASED_SECTION 6 |
| 170 | | −#define IMAGE_REL_BASED_REL32 7 |
| 178 | +#define IMAGE_REL_BASED_ABSOLUTE 0 |
| 179 | +#define IMAGE_REL_BASED_HIGH 1 |
| 180 | +#define IMAGE_REL_BASED_LOW 2 |
| 181 | +#define IMAGE_REL_BASED_HIGHLOW 3 |
| 182 | +#define IMAGE_REL_BASED_HIGHADJ 4 |
| 183 | +#define IMAGE_REL_BASED_MIPS_JMPADDR 5 |
| 184 | +#define IMAGE_REL_BASED_SECTION 6 |
| 185 | +#define IMAGE_REL_BASED_REL32 7 |
| 171 | 186 | |
| 172 | | −/* ----------------------------------------------------------- */ |
| 187 | +#pragma pack(pop) |
| 173 | 188 | |
| 174 | 189 | /* ----------------------------------------------------------- */ |
| 175 | | −IMAGE_DOS_HEADER pe_dos_hdr = { |
| 176 | | − 0x5A4D, /*WORD e_magic; Magic number */ |
| 177 | | − 0x0090, /*WORD e_cblp; Bytes on last page of file */ |
| 178 | | − 0x0003, /*WORD e_cp; Pages in file */ |
| 179 | | − 0x0000, /*WORD e_crlc; Relocations */ |
| 180 | | − |
| 181 | | − 0x0004, /*WORD e_cparhdr; Size of header in paragraphs */ |
| 182 | | − 0x0000, /*WORD e_minalloc; Minimum extra paragraphs needed */ |
| 183 | | − 0xFFFF, /*WORD e_maxalloc; Maximum extra paragraphs needed */ |
| 184 | | − 0x0000, /*WORD e_ss; Initial (relative) SS value */ |
| 185 | | − |
| 186 | | − 0x00B8, /*WORD e_sp; Initial SP value */ |
| 187 | | − 0x0000, /*WORD e_csum; Checksum */ |
| 188 | | − 0x0000, /*WORD e_ip; Initial IP value */ |
| 189 | | − 0x0000, /*WORD e_cs; Initial (relative) CS value */ |
| 190 | | − 0x0040, /*WORD e_lfarlc; File address of relocation table */ |
| 191 | | − 0x0000, /*WORD e_ovno; Overlay number */ |
| 192 | | − {0, 0, 0, 0}, /*WORD e_res[4]; Reserved words */ |
| 193 | | − 0x0000, /*WORD e_oemid; OEM identifier (for e_oeminfo) */ |
| 194 | | − 0x0000, /*WORD e_oeminfo; OEM information; e_oemid specific */ |
| 195 | | − {0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, /*WORD e_res2[10]; Reserved words */ |
| 196 | | − 0x00000080, /*DWORD e_lfanew; File address of new exe header */ |
| 197 | | − { /* 14 code bytes + "This program cannot be run in DOS mode.\r\r\n$" + 6 * 0x00 */ |
| 198 | | − /*0040 */ 0x0e, 0x1f, 0xba, 0x0e, 0x00, 0xb4, 0x09, 0xcd, 0x21, 0xb8, |
| 199 | | − 0x01, 0x4c, 0xcd, 0x21, 0x54, 0x68, |
| 200 | | − /*0050 */ 0x69, 0x73, 0x20, 0x70, 0x72, 0x6f, 0x67, 0x72, 0x61, 0x6d, |
| 201 | | − 0x20, 0x63, 0x61, 0x6e, 0x6e, 0x6f, |
| 202 | | − /*0060 */ 0x74, 0x20, 0x62, 0x65, 0x20, 0x72, 0x75, 0x6e, 0x20, 0x69, |
| 203 | | − 0x6e, 0x20, 0x44, 0x4f, 0x53, 0x20, |
| 204 | | − /*0070 */ 0x6d, 0x6f, 0x64, 0x65, 0x2e, 0x0d, 0x0d, 0x0a, 0x24, 0x00, |
| 205 | | − 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, |
| 206 | | − /*0080 */ |
| 207 | | − } |
| 208 | | −}; |
| 209 | | − |
| 210 | | −DWORD pe_magic = IMAGE_NT_SIGNATURE; |
| 211 | | − |
| 212 | | −IMAGE_FILE_HEADER pe_file_hdr = { |
| 213 | | − 0x014C, /*WORD Machine; */ |
| 214 | | − 0x0003, /*WORD NumberOfSections; */ |
| 215 | | − 0x00000000, /*DWORD TimeDateStamp; */ |
| 216 | | − 0x00000000, /*DWORD PointerToSymbolTable; */ |
| 217 | | − 0x00000000, /*DWORD NumberOfSymbols; */ |
| 218 | | − 0x00E0, /*WORD SizeOfOptionalHeader; */ |
| 219 | | − 0x030F /*WORD Characteristics; */ |
| 220 | | −}; |
| 190 | +#endif /* ndef IMAGE_NT_SIGNATURE */ |
| 191 | +/* ----------------------------------------------------------- */ |
| 221 | 192 | |
| 222 | | −IMAGE_OPTIONAL_HEADER32 pe_opt_hdr = { |
| 223 | | − /* Standard fields. */ |
| 224 | | − 0x010B, /*WORD Magic; */ |
| 225 | | − 0x06, /*BYTE MajorLinkerVersion; */ |
| 226 | | − 0x00, /*BYTE MinorLinkerVersion; */ |
| 227 | | − 0x00000000, /*DWORD SizeOfCode; */ |
| 228 | | − 0x00000000, /*DWORD SizeOfInitializedData; */ |
| 229 | | − 0x00000000, /*DWORD SizeOfUninitializedData; */ |
| 230 | | − 0x00000000, /*DWORD AddressOfEntryPoint; */ |
| 231 | | − 0x00000000, /*DWORD BaseOfCode; */ |
| 232 | | − 0x00000000, /*DWORD BaseOfData; */ |
| 193 | +#pragma pack(push, 1) |
| 233 | 194 | |
| 234 | | − /* NT additional fields. */ |
| 235 | | − 0x00400000, /*DWORD ImageBase; */ |
| 236 | | − 0x00001000, /*DWORD SectionAlignment; */ |
| 237 | | − 0x00000200, /*DWORD FileAlignment; */ |
| 238 | | − 0x0004, /*WORD MajorOperatingSystemVersion; */ |
| 239 | | − 0x0000, /*WORD MinorOperatingSystemVersion; */ |
| 240 | | − 0x0000, /*WORD MajorImageVersion; */ |
| 241 | | − 0x0000, /*WORD MinorImageVersion; */ |
| 242 | | − 0x0004, /*WORD MajorSubsystemVersion; */ |
| 243 | | − 0x0000, /*WORD MinorSubsystemVersion; */ |
| 244 | | − 0x00000000, /*DWORD Win32VersionValue; */ |
| 245 | | − 0x00000000, /*DWORD SizeOfImage; */ |
| 246 | | − 0x00000200, /*DWORD SizeOfHeaders; */ |
| 247 | | − 0x00000000, /*DWORD CheckSum; */ |
| 248 | | − 0x0002, /*WORD Subsystem; */ |
| 249 | | − 0x0000, /*WORD DllCharacteristics; */ |
| 250 | | − 0x00100000, /*DWORD SizeOfStackReserve; */ |
| 251 | | − 0x00001000, /*DWORD SizeOfStackCommit; */ |
| 252 | | − 0x00100000, /*DWORD SizeOfHeapReserve; */ |
| 253 | | − 0x00001000, /*DWORD SizeOfHeapCommit; */ |
| 254 | | − 0x00000000, /*DWORD LoaderFlags; */ |
| 255 | | − 0x00000010, /*DWORD NumberOfRvaAndSizes; */ |
| 256 | | − |
| 257 | | − /* IMAGE_DATA_DIRECTORY DataDirectory[16]; */ |
| 258 | | − {{0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, |
| 259 | | − {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}} |
| 195 | +struct pe_header |
| 196 | +{ |
| 197 | + IMAGE_DOS_HEADER doshdr; |
| 198 | + BYTE dosstub[0x40]; |
| 199 | + DWORD nt_sig; |
| 200 | + IMAGE_FILE_HEADER filehdr; |
| 201 | + IMAGE_OPTIONAL_HEADER opthdr; |
| 260 | 202 | }; |
| 261 | 203 | |
| 262 | | −/*----------------------------------------------------------------------------*/ |
| 263 | | − |
| 264 | | −/*----------------------------------------------------------------------------*/ |
| 265 | | − |
| 266 | 204 | struct pe_import_header { |
| 267 | 205 | DWORD first_entry; |
| 268 | 206 | DWORD time_date; |
| @@ -289,52 +227,154 @@ struct pe_reloc_header { · 20 unmodified lines |
| 289 | 227 | DWORD size; |
| 290 | 228 | }; |
| 291 | 229 | |
| 230 | +struct pe_rsrc_header { |
| 231 | + struct _IMAGE_FILE_HEADER filehdr; |
| 232 | + struct _IMAGE_SECTION_HEADER sectionhdr; |
| 233 | +}; |
| 234 | + |
| 235 | +struct pe_rsrc_reloc { |
| 236 | + DWORD offset; |
| 237 | + DWORD size; |
| 238 | + WORD type; |
| 239 | +}; |
| 240 | + |
| 241 | +#pragma pack(pop) |
| 242 | + |
| 243 | +/* ----------------------------------------------------------- */ |
| 244 | +ST_DATA struct pe_header pe_header = { |
| 245 | +{ |
| 246 | + /* IMAGE_DOS_HEADER doshdr */ |
| 247 | + 0x5A4D, /*WORD e_magic; Magic number */ |
| 248 | + 0x0090, /*WORD e_cblp; Bytes on last page of file */ |
| 249 | + 0x0003, /*WORD e_cp; Pages in file */ |
| 250 | + 0x0000, /*WORD e_crlc; Relocations */ |
| 251 | + |
| 252 | + 0x0004, /*WORD e_cparhdr; Size of header in paragraphs */ |
| 253 | + 0x0000, /*WORD e_minalloc; Minimum extra paragraphs needed */ |
| 254 | + 0xFFFF, /*WORD e_maxalloc; Maximum extra paragraphs needed */ |
| 255 | + 0x0000, /*WORD e_ss; Initial (relative) SS value */ |
| 256 | + |
| 257 | + 0x00B8, /*WORD e_sp; Initial SP value */ |
| 258 | + 0x0000, /*WORD e_csum; Checksum */ |
| 259 | + 0x0000, /*WORD e_ip; Initial IP value */ |
| 260 | + 0x0000, /*WORD e_cs; Initial (relative) CS value */ |
| 261 | + 0x0040, /*WORD e_lfarlc; File address of relocation table */ |
| 262 | + 0x0000, /*WORD e_ovno; Overlay number */ |
| 263 | + {0,0,0,0}, /*WORD e_res[4]; Reserved words */ |
| 264 | + 0x0000, /*WORD e_oemid; OEM identifier (for e_oeminfo) */ |
| 265 | + 0x0000, /*WORD e_oeminfo; OEM information; e_oemid specific */ |
| 266 | + {0,0,0,0,0,0,0,0,0,0}, /*WORD e_res2[10]; Reserved words */ |
| 267 | + 0x00000080 /*DWORD e_lfanew; File address of new exe header */ |
| 268 | +},{ |
| 269 | + /* BYTE dosstub[0x40] */ |
| 270 | + /* 14 code bytes + "This program cannot be run in DOS mode.\r\r\n$" + 6 * 0x00 */ |
| 271 | + 0x0e,0x1f,0xba,0x0e,0x00,0xb4,0x09,0xcd,0x21,0xb8,0x01,0x4c,0xcd,0x21,0x54,0x68, |
| 272 | + 0x69,0x73,0x20,0x70,0x72,0x6f,0x67,0x72,0x61,0x6d,0x20,0x63,0x61,0x6e,0x6e,0x6f, |
| 273 | + 0x74,0x20,0x62,0x65,0x20,0x72,0x75,0x6e,0x20,0x69,0x6e,0x20,0x44,0x4f,0x53,0x20, |
| 274 | + 0x6d,0x6f,0x64,0x65,0x2e,0x0d,0x0d,0x0a,0x24,0x00,0x00,0x00,0x00,0x00,0x00,0x00, |
| 275 | +}, |
| 276 | + 0x00004550, /* DWORD nt_sig = IMAGE_NT_SIGNATURE */ |
| 277 | +{ |
| 278 | + /* IMAGE_FILE_HEADER filehdr */ |
| 279 | + 0x014C, /*WORD Machine; */ |
| 280 | + 0x0003, /*WORD NumberOfSections; */ |
| 281 | + 0x00000000, /*DWORD TimeDateStamp; */ |
| 282 | + 0x00000000, /*DWORD PointerToSymbolTable; */ |
| 283 | + 0x00000000, /*DWORD NumberOfSymbols; */ |
| 284 | + 0x00E0, /*WORD SizeOfOptionalHeader; */ |
| 285 | + 0x030F /*WORD Characteristics; */ |
| 286 | +},{ |
| 287 | + /* IMAGE_OPTIONAL_HEADER opthdr */ |
| 288 | + /* Standard fields. */ |
| 289 | + 0x010B, /*WORD Magic; */ |
| 290 | + 0x06, /*BYTE MajorLinkerVersion; */ |
| 291 | + 0x00, /*BYTE MinorLinkerVersion; */ |
| 292 | + 0x00000000, /*DWORD SizeOfCode; */ |
| 293 | + 0x00000000, /*DWORD SizeOfInitializedData; */ |
| 294 | + 0x00000000, /*DWORD SizeOfUninitializedData; */ |
| 295 | + 0x00000000, /*DWORD AddressOfEntryPoint; */ |
| 296 | + 0x00000000, /*DWORD BaseOfCode; */ |
| 297 | + 0x00000000, /*DWORD BaseOfData; */ |
| 298 | + |
| 299 | + /* NT additional fields. */ |
| 300 | + 0x00400000, /*DWORD ImageBase; */ |
| 301 | + 0x00001000, /*DWORD SectionAlignment; */ |
| 302 | + 0x00000200, /*DWORD FileAlignment; */ |
| 303 | + 0x0004, /*WORD MajorOperatingSystemVersion; */ |
| 304 | + 0x0000, /*WORD MinorOperatingSystemVersion; */ |
| 305 | + 0x0000, /*WORD MajorImageVersion; */ |
| 306 | + 0x0000, /*WORD MinorImageVersion; */ |
| 307 | + 0x0004, /*WORD MajorSubsystemVersion; */ |
| 308 | + 0x0000, /*WORD MinorSubsystemVersion; */ |
| 309 | + 0x00000000, /*DWORD Win32VersionValue; */ |
| 310 | + 0x00000000, /*DWORD SizeOfImage; */ |
| 311 | + 0x00000200, /*DWORD SizeOfHeaders; */ |
| 312 | + 0x00000000, /*DWORD CheckSum; */ |
| 313 | + 0x0002, /*WORD Subsystem; */ |
| 314 | + 0x0000, /*WORD DllCharacteristics; */ |
| 315 | + 0x00100000, /*DWORD SizeOfStackReserve; */ |
| 316 | + 0x00001000, /*DWORD SizeOfStackCommit; */ |
| 317 | + 0x00100000, /*DWORD SizeOfHeapReserve; */ |
| 318 | + 0x00001000, /*DWORD SizeOfHeapCommit; */ |
| 319 | + 0x00000000, /*DWORD LoaderFlags; */ |
| 320 | + 0x00000010, /*DWORD NumberOfRvaAndSizes; */ |
| 321 | + |
| 322 | + /* IMAGE_DATA_DIRECTORY DataDirectory[16]; */ |
| 323 | + {{0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, |
| 324 | + {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}} |
| 325 | +}}; |
| 326 | + |
| 292 | 327 | /* ------------------------------------------------------------- */ |
| 293 | 328 | /* internal temporary structures */ |
| 294 | 329 | |
| 295 | | −ST const char *pe_sec_names[] = { |
| 296 | | − ".text", |
| 297 | | − ".data", |
| 298 | | − ".bss", |
| 299 | | − ".rsrc", |
| 300 | | − ".reloc", |
| 301 | | − ".stab", |
| 302 | | − ".stabstr" |
| 303 | | −}; |
| 330 | +/* |
| 331 | +#define IMAGE_SCN_CNT_CODE 0x00000020 |
| 332 | +#define IMAGE_SCN_CNT_INITIALIZED_DATA 0x00000040 |
| 333 | +#define IMAGE_SCN_CNT_UNINITIALIZED_DATA 0x00000080 |
| 334 | +#define IMAGE_SCN_MEM_DISCARDABLE 0x02000000 |
| 335 | +#define IMAGE_SCN_MEM_SHARED 0x10000000 |
| 336 | +#define IMAGE_SCN_MEM_EXECUTE 0x20000000 |
| 337 | +#define IMAGE_SCN_MEM_READ 0x40000000 |
| 338 | +#define IMAGE_SCN_MEM_WRITE 0x80000000 |
| 339 | +*/ |
| 304 | 340 | |
| 305 | 341 | enum { |
| 306 | 342 | sec_text = 0, |
| 307 | | − sec_data, |
| 308 | | − sec_bss, |
| 309 | | − sec_rsrc, |
| 310 | | − sec_reloc, |
| 311 | | − sec_stab, |
| 312 | | − sec_stabstr, |
| 313 | | − pe_sec_number |
| 343 | + sec_data , |
| 344 | + sec_bss , |
| 345 | + sec_idata , |
| 346 | + sec_rsrc , |
| 347 | + sec_stab , |
| 348 | + sec_reloc , |
| 349 | + |
| 350 | + sec_last |
| 314 | 351 | }; |
| 315 | 352 | |
| 316 | | −ST DWORD pe_flags[] = { |
| 317 | | − 0x60000020, /* ".text", */ |
| 318 | | − 0xC0000040, /* ".data", */ |
| 319 | | − 0xC0000080, /* ".bss", */ |
| 320 | | − 0x40000040, /* ".rsrc", */ |
| 321 | | − 0x42000040, /* ".reloc", */ |
| 322 | | − 0x42000802, /* ".stab", */ |
| 323 | | − 0x42000802 /* ".stabstr", */ |
| 353 | +ST_DATA DWORD pe_sec_flags[] = { |
| 354 | + 0x60000020, /* ".text" , */ |
| 355 | + 0xC0000040, /* ".data" , */ |
| 356 | + 0xC0000080, /* ".bss" , */ |
| 357 | + 0x40000040, /* ".idata" , */ |
| 358 | + 0x40000040, /* ".rsrc" , */ |
| 359 | + 0x42000802, /* ".stab" , */ |
| 360 | + 0x42000040, /* ".reloc" , */ |
| 324 | 361 | }; |
| 325 | 362 | |
| 326 | 363 | struct section_info { |
| 327 | | − struct section_info *next; |
| 328 | | − int id; |
| 364 | + int cls, ord; |
| 365 | + char name[32]; |
| 329 | 366 | DWORD sh_addr; |
| 330 | 367 | DWORD sh_size; |
| 368 | + DWORD sh_flags; |
| 331 | 369 | unsigned char *data; |
| 332 | 370 | DWORD data_size; |
| 371 | + IMAGE_SECTION_HEADER ish; |
| 333 | 372 | }; |
| 334 | 373 | |
| 335 | 374 | struct import_symbol { |
| 336 | 375 | int sym_index; |
| 337 | | − int offset; |
| 376 | + int iat_index; |
| 377 | + int thk_offset; |
| 338 | 378 | }; |
| 339 | 379 | |
| 340 | 380 | struct pe_import_info { |
| @@ -344,7 +384,11 @@ struct pe_import_info { · 3 unmodified lines |
| 344 | 384 | }; |
| 345 | 385 | |
| 346 | 386 | struct pe_info { |
| 387 | + TCCState *s1; |
| 388 | + Section *reloc; |
| 389 | + Section *thunk; |
| 347 | 390 | const char *filename; |
| 391 | + int type; |
| 348 | 392 | DWORD sizeofheaders; |
| 349 | 393 | DWORD imagebase; |
| 350 | 394 | DWORD start_addr; |
| @@ -354,173 +398,172 @@ struct pe_info { · 3 unmodified lines |
| 354 | 398 | DWORD iat_size; |
| 355 | 399 | DWORD exp_offs; |
| 356 | 400 | DWORD exp_size; |
| 357 | | − struct section_info sh_info[pe_sec_number]; |
| 401 | + struct section_info *sec_info; |
| 358 | 402 | int sec_count; |
| 359 | 403 | struct pe_import_info **imp_info; |
| 360 | 404 | int imp_count; |
| 361 | | − Section *reloc; |
| 362 | | − Section *thunk; |
| 363 | | − TCCState *s1; |
| 364 | 405 | }; |
| 365 | 406 | |
| 366 | 407 | /* ------------------------------------------------------------- */ |
| 367 | | −#define PE_MERGE_DATA |
| 368 | | −// #define PE_PRINT_SECTIONS |
| 369 | | − |
| 370 | | −#ifndef MAX_PATH |
| 371 | | −#define MAX_PATH 260 |
| 372 | | −#endif |
| 373 | | − |
| 374 | | −void error_noabort(const char *, ...); |
| 375 | | − |
| 376 | | −ST char pe_type; |
| 377 | 408 | |
| 378 | 409 | #define PE_NUL 0 |
| 379 | 410 | #define PE_DLL 1 |
| 380 | 411 | #define PE_GUI 2 |
| 381 | 412 | #define PE_EXE 3 |
| 382 | 413 | |
| 383 | | −ST int pe_find_import(TCCState * s1, const char *symbol, char *ret) |
| 414 | +void error_noabort(const char *, ...); |
| 415 | + |
| 416 | +#ifdef _WIN32 |
| 417 | +void dbg_printf (const char *fmt, ...) |
| 384 | 418 | { |
| 385 | | − int sym_index = find_elf_sym(s1->dynsymtab_section, symbol); |
| 386 | | − if (0 == sym_index) { |
| 387 | | − /* Hm, maybe it's '_symbol' instead of 'symbol' or '__imp__symbol' */ |
| 388 | | − char buffer[100]; |
| 389 | | − if (0 == memcmp(symbol, "__imp__", 7)) |
| 390 | | − symbol += 6; |
| 391 | | − else |
| 392 | | − buffer[0] = '_', strcpy(buffer + 1, symbol), symbol = buffer; |
| 393 | | − sym_index = find_elf_sym(s1->dynsymtab_section, symbol); |
| 419 | + char buffer[4000]; |
| 420 | + va_list arg; |
| 421 | + int x; |
| 422 | + va_start(arg, fmt); |
| 423 | + x = vsprintf (buffer, fmt, arg); |
| 424 | + strcpy(buffer+x, "\n"); |
| 425 | + OutputDebugString(buffer); |
| 426 | +} |
| 427 | +#endif |
| 428 | + |
| 429 | +/* --------------------------------------------*/ |
| 430 | + |
| 431 | +ST_FN const char* get_alt_symbol(char *buffer, const char *symbol) |
| 432 | +{ |
| 433 | + const char *p; |
| 434 | + p = strrchr(symbol, '@'); |
| 435 | + if (p && isnum(p[1]) && symbol[0] == '_') { /* stdcall decor */ |
| 436 | + strcpy(buffer, symbol+1)[p-symbol-1] = 0; |
| 437 | + } else if (symbol[0] != '_') { /* try non-ansi function */ |
| 438 | + buffer[0] = '_', strcpy(buffer + 1, symbol); |
| 439 | + } else if (0 == memcmp(symbol, "__imp__", 7)) { /* mingw 2.0 */ |
| 440 | + strcpy(buffer, symbol + 6); |
| 441 | + } else if (0 == memcmp(symbol, "_imp___", 7)) { /* mingw 3.7 */ |
| 442 | + strcpy(buffer, symbol + 6); |
| 443 | + } else { |
| 444 | + return symbol; |
| 394 | 445 | } |
| 395 | | − if (ret) |
| 396 | | − strcpy(ret, symbol); |
| 446 | + return buffer; |
| 447 | +} |
| 448 | + |
| 449 | +ST_FN int pe_find_import(TCCState * s1, const char *symbol) |
| 450 | +{ |
| 451 | + char buffer[200]; |
| 452 | + const char *s; |
| 453 | + int sym_index, n = 0; |
| 454 | + do { |
| 455 | + s = n ? get_alt_symbol(buffer, symbol) : symbol; |
| 456 | + sym_index = find_elf_sym(s1->dynsymtab_section, s); |
| 457 | + // printf("find %d %s\n", sym_index, s); |
| 458 | + } while (0 == sym_index && ++n < 2); |
| 397 | 459 | return sym_index; |
| 398 | 460 | } |
| 399 | 461 | |
| 400 | | −#ifdef _WIN32 |
| 401 | | −ST void **pe_imp; |
| 402 | | −ST int nb_pe_imp; |
| 462 | +#if defined _WIN32 || defined __CYGWIN__ |
| 403 | 463 | |
| 464 | +#ifdef __CYGWIN__ |
| 465 | +# include <dlfcn.h> |
| 466 | +# define LoadLibrary(s) dlopen(s, RTLD_NOW) |
| 467 | +# define GetProcAddress(h,s) dlsym(h, s) |
| 468 | +#endif |
| 469 | + |
| 470 | +/* for the -run option: dynamically load symbol from dll */ |
| 404 | 471 | void *resolve_sym(struct TCCState *s1, const char *symbol, int type) |
| 405 | 472 | { |
| 406 | | − char buffer[100], *p = buffer; |
| 407 | | − void *a = NULL; |
| 408 | | − int sym_index = pe_find_import(s1, symbol, p); |
| 409 | | − int dll_index; |
| 410 | | − const char *dll_name; |
| 411 | | − void *hm; |
| 412 | | − |
| 413 | | − if (sym_index) { |
| 414 | | − dll_index = ((Elf32_Sym *) s1->dynsymtab_section->data)[sym_index]. |
| 415 | | − st_other; |
| 416 | | − dll_name = s1->loaded_dlls[dll_index]->name; |
| 417 | | − hm = GetModuleHandleA(dll_name); |
| 418 | | − if (NULL == hm) |
| 419 | | − hm = LoadLibraryA(dll_name); |
| 420 | | − if (hm) { |
| 421 | | − a = GetProcAddress(hm, buffer); |
| 422 | | − if (a && STT_OBJECT == type) { |
| 423 | | − // need to return a pointer to the address for data objects |
| 424 | | − dynarray_add(&pe_imp, &nb_pe_imp, a); |
| 425 | | − a = &pe_imp[nb_pe_imp - 1]; |
| 426 | | − } |
| 427 | | − } |
| 473 | + char buffer[100]; |
| 474 | + int sym_index, dll_index; |
| 475 | + void *hModule, *addr, **m; |
| 476 | + |
| 477 | + sym_index = pe_find_import(s1, symbol); |
| 478 | + if (0 == sym_index) |
| 479 | + return NULL; |
| 480 | + dll_index = ((Elf32_Sym *)s1->dynsymtab_section->data + sym_index)->st_value; |
| 481 | + hModule = LoadLibrary(s1->loaded_dlls[dll_index-1]->name); |
| 482 | + addr = GetProcAddress(hModule, symbol); |
| 483 | + if (NULL == addr) |
| 484 | + addr = GetProcAddress(hModule, get_alt_symbol(buffer, symbol)); |
| 485 | + |
| 486 | + if (addr && STT_OBJECT == type) { |
| 487 | + /* need to return a pointer to the address for data objects */ |
| 488 | + m = (void**)tcc_malloc(sizeof addr), *m = addr, addr = m; |
| 489 | +#ifdef MEM_DEBUG |
| 490 | + /* yep, we don't free it */ |
| 491 | + mem_cur_size -= sizeof (void*); |
| 492 | +#endif |
| 428 | 493 | } |
| 429 | | − return a; |
| 494 | + return addr; |
| 430 | 495 | } |
| 431 | 496 | #endif |
| 432 | 497 | |
| 433 | | −#define for_sym_in_symtab(sym) \ |
| 434 | | −for (sym = (Elf32_Sym *)symtab_section->data + 1; \ |
| 435 | | − sym < (Elf32_Sym *)(symtab_section->data + \ |
| 436 | | − symtab_section->data_offset); \ |
| 437 | | − ++sym) |
| 438 | | − |
| 439 | | −#define pe_set_datadir(dir,addr,size) \ |
| 440 | | − pe_opt_hdr.DataDirectory[dir].VirtualAddress = addr, \ |
| 441 | | − pe_opt_hdr.DataDirectory[dir].Size = size |
| 442 | | − |
| 443 | 498 | /*----------------------------------------------------------------------------*/ |
| 444 | | −ST void dynarray_reset(void ***pp, int *n) |
| 445 | | −{ |
| 446 | | − int i; |
| 447 | | − for (i = 0; i < *n; ++i) |
| 448 | | − tcc_free((*pp)[i]); |
| 449 | | − tcc_free(*pp); |
| 450 | | − *pp = NULL; |
| 451 | | − *n = 0; |
| 452 | | −} |
| 453 | 499 | |
| 454 | | −ST int dynarray_assoc(void **pp, int n, int key) |
| 500 | +ST_FN int dynarray_assoc(void **pp, int n, int key) |
| 455 | 501 | { |
| 456 | 502 | int i; |
| 457 | 503 | for (i = 0; i < n; ++i, ++pp) |
| 458 | | − if (key == **(int **) pp) |
| 459 | | − return i; |
| 504 | + if (key == **(int **) pp) |
| 505 | + return i; |
| 460 | 506 | return -1; |
| 461 | 507 | } |
| 462 | 508 | |
| 463 | 509 | #if 0 |
| 464 | | −ST DWORD umin(DWORD a, DWORD b) |
| 510 | +ST_FN DWORD umin(DWORD a, DWORD b) |
| 465 | 511 | { |
| 466 | 512 | return a < b ? a : b; |
| 467 | 513 | } |
| 468 | 514 | #endif |
| 469 | 515 | |
| 470 | | −ST DWORD umax(DWORD a, DWORD b) |
| 516 | +ST_FN DWORD umax(DWORD a, DWORD b) |
| 471 | 517 | { |
| 472 | 518 | return a < b ? b : a; |
| 473 | 519 | } |
| 474 | 520 | |
| 475 | | −ST void pe_fpad(FILE * fp, DWORD new_pos) |
| 521 | +ST_FN void pe_fpad(FILE *fp, DWORD new_pos) |
| 476 | 522 | { |
| 477 | 523 | DWORD pos = ftell(fp); |
| 478 | 524 | while (++pos <= new_pos) |
| 479 | 525 | fputc(0, fp); |
| 480 | 526 | } |
| 481 | 527 | |
| 482 | | −ST DWORD pe_file_align(DWORD n) |
| 528 | +ST_FN DWORD pe_file_align(DWORD n) |
| 483 | 529 | { |
| 484 | 530 | return (n + (0x200 - 1)) & ~(0x200 - 1); |
| 485 | 531 | } |
| 486 | 532 | |
| 487 | | −ST DWORD pe_virtual_align(DWORD n) |
| 533 | +ST_FN DWORD pe_virtual_align(DWORD n) |
| 488 | 534 | { |
| 489 | 535 | return (n + (0x1000 - 1)) & ~(0x1000 - 1); |
| 490 | 536 | } |
| 491 | 537 | |
| 492 | | −ST void pe_align_section(Section * s, int a) |
| 538 | +ST_FN void pe_align_section(Section *s, int a) |
| 493 | 539 | { |
| 494 | | − int i = s->data_offset & (a - 1); |
| 540 | + int i = s->data_offset & (a-1); |
| 495 | 541 | if (i) |
| 496 | 542 | section_ptr_add(s, a - i); |
| 497 | 543 | } |
| 498 | 544 | |
| 545 | +ST_FN void pe_set_datadir(int dir, DWORD addr, DWORD size) |
| 546 | +{ |
| 547 | + pe_header.opthdr.DataDirectory[dir].VirtualAddress = addr; |
| 548 | + pe_header.opthdr.DataDirectory[dir].Size = size; |
| 549 | +} |
| 499 | 550 | |
| 500 | 551 | /*----------------------------------------------------------------------------*/ |
| 501 | | −ST int pe_write_pe(struct pe_info *pe) |
| 552 | +ST_FN int pe_write(struct pe_info *pe) |
| 502 | 553 | { |
| 503 | 554 | int i; |
| 504 | 555 | FILE *op; |
| 505 | | − DWORD file_offset; |
| 506 | | − IMAGE_SECTION_HEADER ish[pe_sec_number], *psh; |
| 507 | | − int sec_index = 0; |
| 556 | + DWORD file_offset, r; |
| 508 | 557 | |
| 509 | 558 | op = fopen(pe->filename, "wb"); |
| 510 | 559 | if (NULL == op) { |
| 511 | | − error_noabort("could not create file: %s", pe->filename); |
| 560 | + error_noabort("could not write '%s': %s", pe->filename, strerror(errno)); |
| 512 | 561 | return 1; |
| 513 | 562 | } |
| 514 | 563 | |
| 515 | | − memset(&ish, 0, sizeof ish); |
| 516 | | − |
| 517 | | − pe->sizeofheaders = pe_file_align(sizeof pe_dos_hdr |
| 518 | | − + sizeof pe_magic |
| 519 | | − + sizeof pe_file_hdr |
| 520 | | − + sizeof pe_opt_hdr |
| 521 | | − + |
| 522 | | − pe->sec_count * |
| 523 | | − sizeof(IMAGE_SECTION_HEADER) |
| 564 | + pe->sizeofheaders = pe_file_align( |
| 565 | + sizeof pe_header |
| 566 | + + pe->sec_count * sizeof (IMAGE_SECTION_HEADER) |
| 524 | 567 | ); |
| 525 | 568 | |
| 526 | 569 | file_offset = pe->sizeofheaders; |
| @@ -531,137 +574,132 @@ ST int pe_write_pe(struct pe_info *pe) · 4 unmodified lines |
| 531 | 574 | "\n virt file size section" "\n"); |
| 532 | 575 | |
| 533 | 576 | for (i = 0; i < pe->sec_count; ++i) { |
| 534 | | − struct section_info *si = pe->sh_info + i; |
| 535 | | − const char *sh_name = pe_sec_names[si->id]; |
| 577 | + struct section_info *si = pe->sec_info + i; |
| 578 | + const char *sh_name = si->name; |
| 536 | 579 | unsigned long addr = si->sh_addr - pe->imagebase; |
| 537 | 580 | unsigned long size = si->sh_size; |
| 581 | + IMAGE_SECTION_HEADER *psh = &si->ish; |
| 538 | 582 | |
| 539 | 583 | if (2 == verbose) |
| 540 | 584 | printf("%6lx %6lx %6lx %s\n", |
| 541 | | − addr, file_offset, size, sh_name); |
| 585 | + addr, file_offset, size, sh_name); |
| 542 | 586 | |
| 543 | | − switch (si->id) { |
| 544 | | − case sec_text: |
| 545 | | − pe_opt_hdr.BaseOfCode = addr; |
| 546 | | − pe_opt_hdr.AddressOfEntryPoint = addr + pe->start_addr; |
| 547 | | − break; |
| 587 | + switch (si->cls) { |
| 588 | + case sec_text: |
| 589 | + pe_header.opthdr.BaseOfCode = addr; |
| 590 | + pe_header.opthdr.AddressOfEntryPoint = addr + pe->start_addr; |
| 591 | + break; |
| 592 | + |
| 593 | + case sec_data: |
| 594 | + pe_header.opthdr.BaseOfData = addr; |
| 595 | + break; |
| 596 | + |
| 597 | + case sec_bss: |
| 598 | + break; |
| 599 | + |
| 600 | + case sec_reloc: |
| 601 | + pe_set_datadir(IMAGE_DIRECTORY_ENTRY_BASERELOC, addr, size); |
| 602 | + break; |
| 603 | + |
| 604 | + case sec_rsrc: |
| 605 | + pe_set_datadir(IMAGE_DIRECTORY_ENTRY_RESOURCE, addr, size); |
| 606 | + break; |
| 607 | + |
| 608 | + case sec_stab: |
| 609 | + break; |
| 610 | + } |
| 548 | 611 | |
| 549 | | − case sec_data: |
| 550 | | − pe_opt_hdr.BaseOfData = addr; |
| 612 | + if (pe->thunk == pe->s1->sections[si->ord]) { |
| 551 | 613 | if (pe->imp_size) { |
| 552 | 614 | pe_set_datadir(IMAGE_DIRECTORY_ENTRY_IMPORT, |
| 553 | | − pe->imp_offs + addr, pe->imp_size); |
| 615 | + pe->imp_offs + addr, pe->imp_size); |
| 554 | 616 | pe_set_datadir(IMAGE_DIRECTORY_ENTRY_IAT, |
| 555 | | − pe->iat_offs + addr, pe->iat_size); |
| 617 | + pe->iat_offs + addr, pe->iat_size); |
| 556 | 618 | } |
| 557 | 619 | if (pe->exp_size) { |
| 558 | 620 | pe_set_datadir(IMAGE_DIRECTORY_ENTRY_EXPORT, |
| 559 | | − pe->exp_offs + addr, pe->exp_size); |
| 621 | + pe->exp_offs + addr, pe->exp_size); |
| 560 | 622 | } |
| 561 | | − break; |
| 562 | | − |
| 563 | | − case sec_bss: |
| 564 | | − break; |
| 565 | | − |
| 566 | | − case sec_reloc: |
| 567 | | − pe_set_datadir(IMAGE_DIRECTORY_ENTRY_BASERELOC, addr, size); |
| 568 | | − break; |
| 569 | | − |
| 570 | | − case sec_rsrc: |
| 571 | | − pe_set_datadir(IMAGE_DIRECTORY_ENTRY_RESOURCE, addr, size); |
| 572 | | − break; |
| 573 | | − |
| 574 | | − case sec_stab: |
| 575 | | − break; |
| 576 | | − |
| 577 | | − case sec_stabstr: |
| 578 | | − break; |
| 579 | 623 | } |
| 580 | 624 | |
| 581 | | − psh = &ish[sec_index++]; |
| 582 | | − strcpy((char *) psh->Name, sh_name); |
| 625 | + strcpy((char*)psh->Name, sh_name); |
| 583 | 626 | |
| 584 | | − psh->Characteristics = pe_flags[si->id]; |
| 627 | + psh->Characteristics = pe_sec_flags[si->cls]; |
| 585 | 628 | psh->VirtualAddress = addr; |
| 586 | 629 | psh->Misc.VirtualSize = size; |
| 587 | | − pe_opt_hdr.SizeOfImage = |
| 588 | | − umax(psh->VirtualAddress + psh->Misc.VirtualSize, |
| 589 | | − pe_opt_hdr.SizeOfImage); |
| 630 | + pe_header.opthdr.SizeOfImage = |
| 631 | + umax(pe_virtual_align(size + addr), pe_header.opthdr.SizeOfImage); |
| 590 | 632 | |
| 591 | 633 | if (si->data_size) { |
| 592 | | − psh->PointerToRawData = file_offset; |
| 634 | + psh->PointerToRawData = r = file_offset; |
| 593 | 635 | fwrite(si->data, 1, si->data_size, op); |
| 594 | 636 | file_offset = pe_file_align(file_offset + si->data_size); |
| 595 | | − psh->SizeOfRawData = file_offset - psh->PointerToRawData; |
| 637 | + psh->SizeOfRawData = file_offset - r; |
| 596 | 638 | pe_fpad(op, file_offset); |
| 597 | 639 | } |
| 598 | 640 | } |
| 599 | 641 | |
| 600 | | − /*----------------------------------------------------- */ |
| 601 | | − |
| 602 | | − pe_file_hdr.NumberOfSections = sec_index; |
| 603 | | − pe_opt_hdr.SizeOfHeaders = pe->sizeofheaders; |
| 604 | | − pe_opt_hdr.ImageBase = pe->imagebase; |
| 605 | | − if (PE_DLL == pe_type) |
| 606 | | − pe_file_hdr.Characteristics = 0x230E; |
| 607 | | − else if (PE_GUI != pe_type) |
| 608 | | − pe_opt_hdr.Subsystem = 3; |
| 642 | + // pe_header.filehdr.TimeDateStamp = time(NULL); |
| 643 | + pe_header.filehdr.NumberOfSections = pe->sec_count; |
| 644 | + pe_header.opthdr.SizeOfHeaders = pe->sizeofheaders; |
| 645 | + pe_header.opthdr.ImageBase = pe->imagebase; |
| 646 | + if (PE_DLL == pe->type) |
| 647 | + pe_header.filehdr.Characteristics = 0x230E; |
| 648 | + else if (PE_GUI != pe->type) |
| 649 | + pe_header.opthdr.Subsystem = 3; |
| 609 | 650 | |
| 610 | 651 | fseek(op, SEEK_SET, 0); |
| 611 | | − fwrite(&pe_dos_hdr, 1, sizeof pe_dos_hdr, op); |
| 612 | | − fwrite(&pe_magic, 1, sizeof pe_magic, op); |
| 613 | | − fwrite(&pe_file_hdr, 1, sizeof pe_file_hdr, op); |
| 614 | | − fwrite(&pe_opt_hdr, 1, sizeof pe_opt_hdr, op); |
| 615 | | − for (i = 0; i < sec_index; ++i) |
| 616 | | − fwrite(&ish[i], 1, sizeof(IMAGE_SECTION_HEADER), op); |
| 617 | | − fclose(op); |
| 652 | + fwrite(&pe_header, 1, sizeof pe_header, op); |
| 653 | + for (i = 0; i < pe->sec_count; ++i) |
| 654 | + fwrite(&pe->sec_info[i].ish, 1, sizeof(IMAGE_SECTION_HEADER), op); |
| 655 | + fclose (op); |
| 618 | 656 | |
| 619 | 657 | if (2 == verbose) |
| 620 | 658 | printf("-------------------------------\n"); |
| 621 | 659 | if (verbose) |
| 622 | | − printf("<-- %s (%lu bytes)\n", pe->filename, file_offset); |
| 660 | + printf("<- %s (%lu bytes)\n", pe->filename, file_offset); |
| 623 | 661 | |
| 624 | 662 | return 0; |
| 625 | 663 | } |
| 626 | 664 | |
| 627 | 665 | /*----------------------------------------------------------------------------*/ |
| 628 | | −ST int pe_add_import(struct pe_info *pe, int sym_index, DWORD offset) |
| 666 | + |
| 667 | +ST_FN struct import_symbol *pe_add_import(struct pe_info *pe, int sym_index) |
| 629 | 668 | { |
| 630 | 669 | int i; |
| 631 | 670 | int dll_index; |
| 632 | 671 | struct pe_import_info *p; |
| 633 | 672 | struct import_symbol *s; |
| 634 | 673 | |
| 635 | | − dll_index = |
| 636 | | − ((Elf32_Sym *) pe->s1->dynsymtab_section->data)[sym_index]. |
| 637 | | − st_other; |
| 638 | | − i = dynarray_assoc((void **) pe->imp_info, pe->imp_count, dll_index); |
| 674 | + dll_index = ((Elf32_Sym *)pe->s1->dynsymtab_section->data + sym_index)->st_value; |
| 675 | + if (0 == dll_index) |
| 676 | + return NULL; |
| 677 | + |
| 678 | + i = dynarray_assoc ((void**)pe->imp_info, pe->imp_count, dll_index); |
| 639 | 679 | if (-1 != i) { |
| 640 | 680 | p = pe->imp_info[i]; |
| 641 | 681 | goto found_dll; |
| 642 | 682 | } |
| 643 | 683 | p = tcc_mallocz(sizeof *p); |
| 644 | 684 | p->dll_index = dll_index; |
| 645 | | − dynarray_add((void ***) &pe->imp_info, &pe->imp_count, p); |
| 685 | + dynarray_add((void***)&pe->imp_info, &pe->imp_count, p); |
| 646 | 686 | |
| 647 | | − found_dll: |
| 648 | | − i = dynarray_assoc((void **) p->symbols, p->sym_count, sym_index); |
| 687 | +found_dll: |
| 688 | + i = dynarray_assoc ((void**)p->symbols, p->sym_count, sym_index); |
| 649 | 689 | if (-1 != i) |
| 650 | | − goto found_sym; |
| 690 | + return p->symbols[i]; |
| 691 | + |
| 651 | 692 | s = tcc_mallocz(sizeof *s); |
| 693 | + dynarray_add((void***)&p->symbols, &p->sym_count, s); |
| 652 | 694 | s->sym_index = sym_index; |
| 653 | | − s->offset = offset; |
| 654 | | − dynarray_add((void ***) &p->symbols, &p->sym_count, s); |
| 655 | | − |
| 656 | | − found_sym: |
| 657 | | − return 1; |
| 695 | + return s; |
| 658 | 696 | } |
| 659 | 697 | |
| 660 | 698 | /*----------------------------------------------------------------------------*/ |
| 661 | | −ST void pe_build_imports(struct pe_info *pe) |
| 699 | +ST_FN void pe_build_imports(struct pe_info *pe) |
| 662 | 700 | { |
| 663 | 701 | int thk_ptr, ent_ptr, dll_ptr, sym_cnt, i; |
| 664 | | − DWORD voffset = pe->thunk->sh_addr - pe->imagebase; |
| 702 | + DWORD rva_base = pe->thunk->sh_addr - pe->imagebase; |
| 665 | 703 | int ndlls = pe->imp_count; |
| 666 | 704 | |
| 667 | 705 | for (sym_cnt = i = 0; i < ndlls; ++i) |
| @@ -676,293 +714,447 @@ ST void pe_build_imports(struct pe_info *pe) · 8 unmodified lines |
| 676 | 714 | pe->imp_size = (ndlls + 1) * sizeof(struct pe_import_header); |
| 677 | 715 | pe->iat_offs = dll_ptr + pe->imp_size; |
| 678 | 716 | pe->iat_size = (sym_cnt + ndlls) * sizeof(DWORD); |
| 679 | | − section_ptr_add(pe->thunk, pe->imp_size + 2 * pe->iat_size); |
| 717 | + section_ptr_add(pe->thunk, pe->imp_size + 2*pe->iat_size); |
| 680 | 718 | |
| 681 | 719 | thk_ptr = pe->iat_offs; |
| 682 | 720 | ent_ptr = pe->iat_offs + pe->iat_size; |
| 721 | + |
| 683 | 722 | for (i = 0; i < pe->imp_count; ++i) { |
| 684 | 723 | struct pe_import_header *hdr; |
| 685 | 724 | int k, n, v; |
| 686 | 725 | struct pe_import_info *p = pe->imp_info[i]; |
| 687 | | − const char *name = pe->s1->loaded_dlls[p->dll_index]->name; |
| 726 | + const char *name = pe->s1->loaded_dlls[p->dll_index-1]->name; |
| 688 | 727 | |
| 689 | 728 | /* put the dll name into the import header */ |
| 690 | | − if (0 == strncmp(name, "lib", 3)) |
| 691 | | − name += 3; |
| 692 | 729 | v = put_elf_str(pe->thunk, name); |
| 693 | 730 | |
| 694 | | − hdr = (struct pe_import_header *) (pe->thunk->data + dll_ptr); |
| 695 | | − hdr->first_thunk = thk_ptr + voffset; |
| 696 | | − hdr->first_entry = ent_ptr + voffset; |
| 697 | | − hdr->lib_name_offset = v + voffset; |
| 731 | + hdr = (struct pe_import_header*)(pe->thunk->data + dll_ptr); |
| 732 | + hdr->first_thunk = thk_ptr + rva_base; |
| 733 | + hdr->first_entry = ent_ptr + rva_base; |
| 734 | + hdr->lib_name_offset = v + rva_base; |
| 698 | 735 | |
| 699 | 736 | for (k = 0, n = p->sym_count; k <= n; ++k) { |
| 700 | 737 | if (k < n) { |
| 701 | | − DWORD offset = p->symbols[k]->offset; |
| 738 | + DWORD iat_index = p->symbols[k]->iat_index; |
| 702 | 739 | int sym_index = p->symbols[k]->sym_index; |
| 703 | | − Elf32_Sym *sym = |
| 704 | | − (Elf32_Sym *) pe->s1->dynsymtab_section->data + |
| 705 | | − sym_index; |
| 706 | | − const char *name = |
| 707 | | − pe->s1->dynsymtab_section->link->data + sym->st_name; |
| 708 | | − |
| 709 | | − if (offset & 0x80000000) { /* ref to data */ |
| 710 | | − Elf32_Sym *sym = |
| 711 | | − &((Elf32_Sym *) symtab_section-> |
| 712 | | − data)[offset & 0x7FFFFFFF]; |
| 713 | | − sym->st_value = thk_ptr; |
| 714 | | − sym->st_shndx = pe->thunk->sh_num; |
| 715 | | − } else { /* ref to function */ |
| 716 | | − |
| 717 | | − char buffer[100]; |
| 718 | | − sprintf(buffer, "IAT.%s", name); |
| 719 | | − sym_index = |
| 720 | | − put_elf_sym(symtab_section, thk_ptr, sizeof(DWORD), |
| 721 | | − ELF32_ST_INFO(STB_GLOBAL, STT_OBJECT), |
| 722 | | − 0, pe->thunk->sh_num, buffer); |
| 723 | | − |
| 724 | | − put_elf_reloc(symtab_section, text_section, offset, R_386_32, /*R_JMP_SLOT, */ |
| 725 | | − sym_index); |
| 726 | | − } |
| 727 | | − v = pe->thunk->data_offset + voffset; |
| 728 | | − section_ptr_add(pe->thunk, sizeof(WORD)); /* hint, not used */ |
| 740 | + Elf32_Sym *imp_sym = (Elf32_Sym *)pe->s1->dynsymtab_section->data + sym_index; |
| 741 | + Elf32_Sym *org_sym = (Elf32_Sym *)symtab_section->data + iat_index; |
| 742 | + const char *name = pe->s1->dynsymtab_section->link->data + imp_sym->st_name; |
| 743 | + |
| 744 | + org_sym->st_value = thk_ptr; |
| 745 | + org_sym->st_shndx = pe->thunk->sh_num; |
| 746 | + v = pe->thunk->data_offset + rva_base; |
| 747 | + section_ptr_add(pe->thunk, sizeof(WORD)); /* hint, not used */ |
| 729 | 748 | put_elf_str(pe->thunk, name); |
| 749 | + |
| 730 | 750 | } else { |
| 731 | | − v = 0; // last entry is zero |
| 751 | + v = 0; /* last entry is zero */ |
| 732 | 752 | } |
| 733 | | − *(DWORD *) (pe->thunk->data + thk_ptr) = |
| 734 | | − *(DWORD *) (pe->thunk->data + ent_ptr) = v; |
| 735 | | − thk_ptr += sizeof(DWORD); |
| 736 | | − ent_ptr += sizeof(DWORD); |
| 753 | + *(DWORD*)(pe->thunk->data+thk_ptr) = |
| 754 | + *(DWORD*)(pe->thunk->data+ent_ptr) = v; |
| 755 | + thk_ptr += sizeof (DWORD); |
| 756 | + ent_ptr += sizeof (DWORD); |
| 737 | 757 | } |
| 738 | 758 | dll_ptr += sizeof(struct pe_import_header); |
| 739 | | − dynarray_reset((void ***) &p->symbols, &p->sym_count); |
| 759 | + dynarray_reset(&p->symbols, &p->sym_count); |
| 740 | 760 | } |
| 741 | | − dynarray_reset((void ***) &pe->imp_info, &pe->imp_count); |
| 761 | + dynarray_reset(&pe->imp_info, &pe->imp_count); |
| 742 | 762 | } |
| 743 | 763 | |
| 744 | 764 | /* ------------------------------------------------------------- */ |
| 745 | | −ST int sym_cmp(const void *va, const void *vb) |
| 765 | +/* |
| 766 | + For now only functions are exported. Export of data |
| 767 | + would work, but import requires compiler support to |
| 768 | + do an additional indirection. |
| 769 | + |
| 770 | + For instance: |
| 771 | + __declspec(dllimport) extern int something; |
| 772 | + |
| 773 | + needs to be translated to: |
| 774 | + |
| 775 | + *(int*)something |
| 776 | +*/ |
| 777 | + |
| 778 | +ST_FN int sym_cmp(const void *va, const void *vb) |
| 746 | 779 | { |
| 747 | | − Elf32_Sym *sa = (Elf32_Sym *)symtab_section->data + *(int*)va; |
| 748 | | − Elf32_Sym *sb = (Elf32_Sym *)symtab_section->data + *(int*)vb; |
| 749 | | − const char *ca = symtab_section->link->data + sa->st_name; |
| 750 | | − const char *cb = symtab_section->link->data + sb->st_name; |
| 780 | + const char *ca = ((const char **)va)[1]; |
| 781 | + const char *cb = ((const char **)vb)[1]; |
| 751 | 782 | return strcmp(ca, cb); |
| 752 | 783 | } |
| 753 | 784 | |
| 754 | | −ST void pe_build_exports(struct pe_info *pe) |
| 785 | +ST_FN void pe_build_exports(struct pe_info *pe) |
| 755 | 786 | { |
| 756 | 787 | Elf32_Sym *sym; |
| 757 | | − DWORD func_offset, voffset; |
| 788 | + int sym_index, sym_end; |
| 789 | + DWORD rva_base, func_o, name_o, ord_o, str_o; |
| 758 | 790 | struct pe_export_header *hdr; |
| 759 | | − int sym_count, n, ord, *sorted; |
| 791 | + int sym_count, n, ord, *sorted, *sp; |
| 760 | 792 | |
| 761 | | − voffset = pe->thunk->sh_addr - pe->imagebase; |
| 762 | | − sym_count = 0, n = 1, sorted = NULL; |
| 793 | + FILE *op; |
| 794 | + char buf[MAX_PATH]; |
| 795 | + const char *dllname; |
| 796 | + const char *name; |
| 763 | 797 | |
| 764 | | − // for simplicity only functions are exported |
| 765 | | − for_sym_in_symtab(sym) |
| 766 | | − { |
| 798 | + rva_base = pe->thunk->sh_addr - pe->imagebase; |
| 799 | + sym_count = 0, n = 1, sorted = NULL, op = NULL; |
| 800 | + |
| 801 | + sym_end = symtab_section->data_offset / sizeof(Elf32_Sym); |
| 802 | + for (sym_index = 1; sym_index < sym_end; ++sym_index) { |
| 803 | + sym = (Elf32_Sym*)symtab_section->data + sym_index; |
| 804 | + name = symtab_section->link->data + sym->st_name; |
| 767 | 805 | if ((sym->st_other & 1) |
| 768 | | − && sym->st_shndx == text_section->sh_num) |
| 806 | + /* export only symbols from actually written sections */ |
| 807 | + && pe->s1->sections[sym->st_shndx]->sh_addr) { |
| 769 | 808 | dynarray_add((void***)&sorted, &sym_count, (void*)n); |
| 809 | + dynarray_add((void***)&sorted, &sym_count, (void*)name); |
| 810 | + } |
| 770 | 811 | ++n; |
| 812 | +#if 0 |
| 813 | + if (sym->st_other & 1) |
| 814 | + printf("export: %s\n", name); |
| 815 | + if (sym->st_other & 2) |
| 816 | + printf("stdcall: %s\n", name); |
| 817 | +#endif |
| 771 | 818 | } |
| 772 | 819 | |
| 773 | 820 | if (0 == sym_count) |
| 774 | 821 | return; |
| 822 | + sym_count /= 2; |
| 775 | 823 | |
| 776 | | − qsort (sorted, sym_count, sizeof sorted[0], sym_cmp); |
| 824 | + qsort (sorted, sym_count, 2 * sizeof sorted[0], sym_cmp); |
| 777 | 825 | pe_align_section(pe->thunk, 16); |
| 826 | + dllname = tcc_basename(pe->filename); |
| 778 | 827 | |
| 779 | 828 | pe->exp_offs = pe->thunk->data_offset; |
| 780 | | − hdr = section_ptr_add(pe->thunk, |
| 781 | | − sizeof(struct pe_export_header) + |
| 782 | | − sym_count * (2 * sizeof(DWORD) + sizeof(WORD))); |
| 783 | | − |
| 784 | | − func_offset = pe->exp_offs + sizeof(struct pe_export_header); |
| 785 | | − |
| 786 | | − hdr->Characteristics = 0; |
| 787 | | − hdr->Base = 1; |
| 788 | | − hdr->NumberOfFunctions = sym_count; |
| 789 | | − hdr->NumberOfNames = sym_count; |
| 790 | | − hdr->AddressOfFunctions = func_offset + voffset; |
| 791 | | − hdr->AddressOfNames = hdr->AddressOfFunctions + sym_count * sizeof(DWORD); |
| 792 | | − hdr->AddressOfNameOrdinals = hdr->AddressOfNames + sym_count * sizeof(DWORD); |
| 793 | | − hdr->Name = pe->thunk->data_offset + voffset; |
| 794 | | − put_elf_str(pe->thunk, tcc_basename(pe->filename)); |
| 795 | | − |
| 796 | | − for (ord = 0; ord < sym_count; ++ord) |
| 829 | + func_o = pe->exp_offs + sizeof(struct pe_export_header); |
| 830 | + name_o = func_o + sym_count * sizeof (DWORD); |
| 831 | + ord_o = name_o + sym_count * sizeof (DWORD); |
| 832 | + str_o = ord_o + sym_count * sizeof(WORD); |
| 833 | + |
| 834 | + hdr = section_ptr_add(pe->thunk, str_o - pe->exp_offs); |
| 835 | + hdr->Characteristics = 0; |
| 836 | + hdr->Base = 1; |
| 837 | + hdr->NumberOfFunctions = sym_count; |
| 838 | + hdr->NumberOfNames = sym_count; |
| 839 | + hdr->AddressOfFunctions = func_o + rva_base; |
| 840 | + hdr->AddressOfNames = name_o + rva_base; |
| 841 | + hdr->AddressOfNameOrdinals = ord_o + rva_base; |
| 842 | + hdr->Name = str_o + rva_base; |
| 843 | + put_elf_str(pe->thunk, dllname); |
| 844 | + |
| 845 | +#if 1 |
| 846 | + /* automatically write exports to <output-filename>.def */ |
| 847 | + strcpy(buf, pe->filename); |
| 848 | + strcpy(tcc_fileextension(buf), ".def"); |
| 849 | + op = fopen(buf, "w"); |
| 850 | + if (NULL == op) { |
| 851 | + error_noabort("could not create '%s': %s", buf, strerror(errno)); |
| 852 | + } else { |
| 853 | + fprintf(op, "LIBRARY %s\n\nEXPORTS\n", dllname); |
| 854 | + if (verbose) |
| 855 | + printf("<- %s (%d symbols)\n", buf, sym_count); |
| 856 | + } |
| 857 | +#endif |
| 858 | + |
| 859 | + for (sp = sorted, ord = 0; ord < sym_count; ++ord, sp += 2) |
| 797 | 860 | { |
| 798 | | − char *name; DWORD *p, *pfunc, *pname; WORD *pord; |
| 799 | | − sym = (Elf32_Sym *)symtab_section->data + sorted[ord]; |
| 800 | | − name = symtab_section->link->data + sym->st_name; |
| 801 | | − p = (DWORD*)(pe->thunk->data + func_offset); |
| 802 | | − pfunc = p + ord; |
| 803 | | − pname = p + sym_count + ord; |
| 804 | | − pord = (WORD *)(p + 2*sym_count) + ord; |
| 805 | | − *pfunc = sym->st_value + pe->s1->sections[sym->st_shndx]->sh_addr - pe->imagebase; |
| 806 | | − *pname = pe->thunk->data_offset + voffset; |
| 807 | | − *pord = ord; |
| 861 | + sym_index = sp[0], name = (const char *)sp[1]; |
| 862 | + /* insert actual address later in pe_relocate_rva */ |
| 863 | + put_elf_reloc(symtab_section, pe->thunk, |
| 864 | + func_o, R_386_RELATIVE, sym_index); |
| 865 | + *(DWORD*)(pe->thunk->data + name_o) |
| 866 | + = pe->thunk->data_offset + rva_base; |
| 867 | + *(WORD*)(pe->thunk->data + ord_o) |
| 868 | + = ord; |
| 808 | 869 | put_elf_str(pe->thunk, name); |
| 809 | | − /* printf("export: %s\n", name); */ |
| 870 | + func_o += sizeof (DWORD); |
| 871 | + name_o += sizeof (DWORD); |
| 872 | + ord_o += sizeof (WORD); |
| 873 | + |
| 874 | + if (op) |
| 875 | + fprintf(op, "%s\n", name); |
| 810 | 876 | } |
| 811 | 877 | pe->exp_size = pe->thunk->data_offset - pe->exp_offs; |
| 812 | 878 | tcc_free(sorted); |
| 813 | 879 | } |
| 814 | 880 | |
| 815 | 881 | /* ------------------------------------------------------------- */ |
| 816 | | −ST void pe_build_reloc(struct pe_info *pe, int *section_order, |
| 817 | | − int section_count) |
| 882 | +ST_FN void pe_build_reloc (struct pe_info *pe) |
| 818 | 883 | { |
| 819 | 884 | DWORD offset, block_ptr, addr; |
| 820 | 885 | int count, i; |
| 821 | 886 | Elf32_Rel *rel, *rel_end; |
| 822 | 887 | Section *s = NULL, *sr; |
| 888 | + |
| 823 | 889 | offset = addr = block_ptr = count = i = 0; |
| 824 | 890 | rel = rel_end = NULL; |
| 825 | | − for (;;) { |
| 891 | + |
| 892 | + for(;;) { |
| 826 | 893 | if (rel < rel_end) { |
| 827 | 894 | int type = ELF32_R_TYPE(rel->r_info); |
| 828 | 895 | addr = rel->r_offset + s->sh_addr; |
| 829 | | − ++rel; |
| 896 | + ++ rel; |
| 830 | 897 | if (type != R_386_32) |
| 831 | 898 | continue; |
| 832 | | − if (count == 0) { /* new block */ |
| 899 | + if (count == 0) { /* new block */ |
| 833 | 900 | block_ptr = pe->reloc->data_offset; |
| 834 | 901 | section_ptr_add(pe->reloc, sizeof(struct pe_reloc_header)); |
| 835 | | − offset = addr & 0xFFFFFFFF << 12; |
| 902 | + offset = addr & 0xFFFFFFFF<<12; |
| 836 | 903 | } |
| 837 | | − if ((addr -= offset) < (1 << 12)) { /* one block spans 4k addresses */ |
| 838 | | − WORD *wp = section_ptr_add(pe->reloc, sizeof(WORD)); |
| 839 | | − *wp = addr | IMAGE_REL_BASED_HIGHLOW << 12; |
| 904 | + if ((addr -= offset) < (1<<12)) { /* one block spans 4k addresses */ |
| 905 | + WORD *wp = section_ptr_add(pe->reloc, sizeof (WORD)); |
| 906 | + *wp = addr | IMAGE_REL_BASED_HIGHLOW<<12; |
| 840 | 907 | ++count; |
| 841 | 908 | continue; |
| 842 | 909 | } |
| 843 | | − --rel; |
| 844 | | − } else if (i < section_count) { |
| 845 | | − sr = (s = pe->s1->sections[section_order[i++]])->reloc; |
| 910 | + -- rel; |
| 911 | + |
| 912 | + } else if (i < pe->sec_count) { |
| 913 | + sr = (s = pe->s1->sections[pe->sec_info[i++].ord])->reloc; |
| 846 | 914 | if (sr) { |
| 847 | | − rel = (Elf32_Rel *) sr->data; |
| 848 | | − rel_end = (Elf32_Rel *) (sr->data + sr->data_offset); |
| 915 | + rel = (Elf32_Rel *)sr->data; |
| 916 | + rel_end = (Elf32_Rel *)(sr->data + sr->data_offset); |
| 849 | 917 | } |
| 850 | 918 | continue; |
| 851 | 919 | } |
| 852 | 920 | |
| 853 | | − if (count) { /* store the last block and ready for a new one */ |
| 921 | + if (count) { |
| 922 | + /* store the last block and ready for a new one */ |
| 854 | 923 | struct pe_reloc_header *hdr; |
| 855 | | − if (count & 1) |
| 856 | | − section_ptr_add(pe->reloc, 2), ++count; |
| 857 | | − hdr = (struct pe_reloc_header *) (pe->reloc->data + block_ptr); |
| 858 | | − hdr->offset = offset - pe->imagebase; |
| 859 | | − hdr->size = |
| 860 | | − count * sizeof(WORD) + sizeof(struct pe_reloc_header); |
| 924 | + if (count & 1) /* align for DWORDS */ |
| 925 | + section_ptr_add(pe->reloc, sizeof(WORD)), ++count; |
| 926 | + hdr = (struct pe_reloc_header *)(pe->reloc->data + block_ptr); |
| 927 | + hdr -> offset = offset - pe->imagebase; |
| 928 | + hdr -> size = count * sizeof(WORD) + sizeof(struct pe_reloc_header); |
| 861 | 929 | count = 0; |
| 862 | 930 | } |
| 931 | + |
| 863 | 932 | if (rel >= rel_end) |
| 864 | 933 | break; |
| 865 | 934 | } |
| 866 | 935 | } |
| 867 | 936 | |
| 868 | 937 | /* ------------------------------------------------------------- */ |
| 869 | | −ST int pe_assign_addresses(struct pe_info *pe) |
| 938 | +ST_FN int pe_section_class(Section *s) |
| 870 | 939 | { |
| 871 | | − int i, k, n; |
| 940 | + int type, flags; |
| 941 | + const char *name; |
| 942 | + |
| 943 | + type = s->sh_type; |
| 944 | + flags = s->sh_flags; |
| 945 | + name = s->name; |
| 946 | + if (flags & SHF_ALLOC) { |
| 947 | + if (type == SHT_PROGBITS) { |
| 948 | + if (flags & SHF_EXECINSTR) |
| 949 | + return sec_text; |
| 950 | + if (flags & SHF_WRITE) |
| 951 | + return sec_data; |
| 952 | + if (0 == strcmp(name, ".rsrc")) |
| 953 | + return sec_rsrc; |
| 954 | + if (0 == strcmp(name, ".iedat")) |
| 955 | + return sec_idata; |
| 956 | + } else if (type == SHT_NOBITS) { |
| 957 | + if (flags & SHF_WRITE) |
| 958 | + return sec_bss; |
| 959 | + } |
| 960 | + } else { |
| 961 | + if (0 == strcmp(name, ".reloc")) |
| 962 | + return sec_reloc; |
| 963 | + if (0 == strncmp(name, ".stab", 5)) /* .stab and .stabstr */ |
| 964 | + return sec_stab; |
| 965 | + } |
| 966 | + return -1; |
| 967 | +} |
| 968 | + |
| 969 | +ST_FN int pe_assign_addresses (struct pe_info *pe) |
| 970 | +{ |
| 971 | + int i, k, o, c; |
| 872 | 972 | DWORD addr; |
| 873 | | − int section_order[pe_sec_number]; |
| 874 | | − struct section_info *si_data = NULL; |
| 973 | + int *section_order; |
| 974 | + struct section_info *si; |
| 975 | + Section *s; |
| 976 | + |
| 977 | + // pe->thunk = new_section(pe->s1, ".iedat", SHT_PROGBITS, SHF_ALLOC); |
| 978 | + |
| 979 | + section_order = tcc_malloc(pe->s1->nb_sections * sizeof (int)); |
| 980 | + for (o = k = 0 ; k < sec_last; ++k) { |
| 981 | + for (i = 1; i < pe->s1->nb_sections; ++i) { |
| 982 | + s = pe->s1->sections[i]; |
| 983 | + if (k == pe_section_class(s)) { |
| 984 | + // printf("%s %d\n", s->name, k); |
| 985 | + s->sh_addr = pe->imagebase; |
| 986 | + section_order[o++] = i; |
| 987 | + } |
| 988 | + } |
| 989 | + } |
| 875 | 990 | |
| 876 | | − pe->imagebase = PE_DLL == pe_type ? 0x10000000 : 0x00400000; |
| 991 | + pe->sec_info = tcc_mallocz(o * sizeof (struct section_info)); |
| 877 | 992 | addr = pe->imagebase + 1; |
| 878 | 993 | |
| 879 | | − if (PE_DLL == pe_type) |
| 880 | | − pe->reloc = new_section(pe->s1, ".reloc", SHT_DYNAMIC, SHF_ALLOC); |
| 994 | + for (i = 0; i < o; ++i) |
| 995 | + { |
| 996 | + k = section_order[i]; |
| 997 | + s = pe->s1->sections[k]; |
| 998 | + c = pe_section_class(s); |
| 999 | + si = &pe->sec_info[pe->sec_count]; |
| 881 | 1000 | |
| 882 | | − for (n = k = 0; n < pe_sec_number; ++n) { |
| 883 | | − for (i = 1; i < pe->s1->nb_sections; ++i) { |
| 884 | | − Section *s = pe->s1->sections[i]; |
| 885 | | − if (0 == strcmp(s->name, pe_sec_names[n])) { |
| 886 | | − struct section_info *si = &pe->sh_info[pe->sec_count]; |
| 887 | 1001 | #ifdef PE_MERGE_DATA |
| 888 | | − if (n == sec_bss && si_data) { |
| 889 | | − /* append .bss to .data */ |
| 890 | | − s->sh_addr = addr = ((addr - 1) | 15) + 1; |
| 891 | | − addr += s->data_offset; |
| 892 | | − si_data->sh_size = addr - si_data->sh_addr; |
| 893 | | − } else |
| 1002 | + if (c == sec_bss && pe->sec_count && si[-1].cls == sec_data) { |
| 1003 | + /* append .bss to .data */ |
| 1004 | + s->sh_addr = addr = ((addr-1) | 15) + 1; |
| 1005 | + addr += s->data_offset; |
| 1006 | + si[-1].sh_size = addr - si[-1].sh_addr; |
| 1007 | + continue; |
| 1008 | + } |
| 894 | 1009 | #endif |
| 895 | | − { |
| 896 | | − si->sh_addr = s->sh_addr = addr = |
| 897 | | − pe_virtual_align(addr); |
| 898 | | − si->id = n; |
| 899 | | − |
| 900 | | − if (n == sec_data) { |
| 901 | | − pe->thunk = s; |
| 902 | | − si_data = si; |
| 903 | | − pe_build_imports(pe); |
| 904 | | − pe_build_exports(pe); |
| 905 | | − } else if (n == sec_reloc) { |
| 906 | | − pe_build_reloc(pe, section_order, k); |
| 907 | | − } |
| 908 | | − |
| 909 | | − if (s->data_offset) { |
| 910 | | − if (n != sec_bss) { |
| 911 | | − si->data = s->data; |
| 912 | | − si->data_size = s->data_offset; |
| 913 | | − } |
| 914 | | − |
| 915 | | − addr += s->data_offset; |
| 916 | | − si->sh_size = s->data_offset; |
| 917 | | − ++pe->sec_count; |
| 918 | | − } |
| 919 | | − //printf("Section %08X %04X %s\n", si->sh_addr, si->data_size, s->name); |
| 920 | | − } |
| 921 | | − section_order[k] = i, ++k; |
| 1010 | + strcpy(si->name, s->name); |
| 1011 | + si->cls = c; |
| 1012 | + si->ord = k; |
| 1013 | + si->sh_addr = s->sh_addr = addr = pe_virtual_align(addr); |
| 1014 | + si->sh_flags = s->sh_flags; |
| 1015 | + |
| 1016 | + if (c == sec_data && NULL == pe->thunk) |
| 1017 | + pe->thunk = s; |
| 1018 | + |
| 1019 | + if (s == pe->thunk) { |
| 1020 | + pe_build_imports(pe); |
| 1021 | + pe_build_exports(pe); |
| 1022 | + } |
| 1023 | + |
| 1024 | + if (c == sec_reloc) |
| 1025 | + pe_build_reloc (pe); |
| 1026 | + |
| 1027 | + if (s->data_offset) |
| 1028 | + { |
| 1029 | + if (s->sh_type != SHT_NOBITS) { |
| 1030 | + si->data = s->data; |
| 1031 | + si->data_size = s->data_offset; |
| 922 | 1032 | } |
| 1033 | + |
| 1034 | + addr += s->data_offset; |
| 1035 | + si->sh_size = s->data_offset; |
| 1036 | + ++pe->sec_count; |
| 923 | 1037 | } |
| 1038 | + // printf("%08x %05x %s\n", si->sh_addr, si->sh_size, si->name); |
| 924 | 1039 | } |
| 1040 | + |
| 1041 | +#if 0 |
| 1042 | + for (i = 1; i < pe->s1->nb_sections; ++i) { |
| 1043 | + Section *s = pe->s1->sections[i]; |
| 1044 | + int type = s->sh_type; |
| 1045 | + int flags = s->sh_flags; |
| 1046 | + printf("section %-16s %-10s %5x %s,%s,%s\n", |
| 1047 | + s->name, |
| 1048 | + type == SHT_PROGBITS ? "progbits" : |
| 1049 | + type == SHT_NOBITS ? "nobits" : |
| 1050 | + type == SHT_SYMTAB ? "symtab" : |
| 1051 | + type == SHT_STRTAB ? "strtab" : |
| 1052 | + type == SHT_REL ? "rel" : "???", |
| 1053 | + s->data_offset, |
| 1054 | + flags & SHF_ALLOC ? "alloc" : "", |
| 1055 | + flags & SHF_WRITE ? "write" : "", |
| 1056 | + flags & SHF_EXECINSTR ? "exec" : "" |
| 1057 | + ); |
| 1058 | + } |
| 1059 | + verbose = 2; |
| 1060 | +#endif |
| 1061 | + |
| 1062 | + tcc_free(section_order); |
| 925 | 1063 | return 0; |
| 926 | 1064 | } |
| 927 | 1065 | |
| 1066 | +/* ------------------------------------------------------------- */ |
| 1067 | +ST_FN void pe_relocate_rva (struct pe_info *pe, Section *s) |
| 1068 | +{ |
| 1069 | + Section *sr = s->reloc; |
| 1070 | + Elf32_Rel *rel, *rel_end; |
| 1071 | + rel_end = (Elf32_Rel *)(sr->data + sr->data_offset); |
| 1072 | + for(rel = (Elf32_Rel *)sr->data; rel < rel_end; rel++) |
| 1073 | + if (ELF32_R_TYPE(rel->r_info) == R_386_RELATIVE) { |
| 1074 | + int sym_index = ELF32_R_SYM(rel->r_info); |
| 1075 | + DWORD addr = s->sh_addr; |
| 1076 | + if (sym_index) { |
| 1077 | + Elf32_Sym *sym = (Elf32_Sym *)symtab_section->data + sym_index; |
| 1078 | + addr = sym->st_value; |
| 1079 | + } |
| 1080 | + *(DWORD*)(s->data + rel->r_offset) += addr - pe->imagebase; |
| 1081 | + } |
| 1082 | +} |
| 1083 | + |
| 928 | 1084 | /*----------------------------------------------------------------------------*/ |
| 929 | | −ST int pe_check_symbols(struct pe_info *pe) |
| 1085 | +ST_FN int pe_check_symbols(struct pe_info *pe) |
| 930 | 1086 | { |
| 931 | 1087 | Elf32_Sym *sym; |
| 1088 | + int sym_index, sym_end; |
| 932 | 1089 | int ret = 0; |
| 933 | 1090 | |
| 934 | 1091 | pe_align_section(text_section, 8); |
| 935 | 1092 | |
| 936 | | − for_sym_in_symtab(sym) { |
| 1093 | + sym_end = symtab_section->data_offset / sizeof(Elf32_Sym); |
| 1094 | + for (sym_index = 1; sym_index < sym_end; ++sym_index) { |
| 1095 | + |
| 1096 | + sym = (Elf32_Sym*)symtab_section->data + sym_index; |
| 937 | 1097 | if (sym->st_shndx == SHN_UNDEF) { |
| 938 | | − const char *symbol = symtab_section->link->data + sym->st_name; |
| 1098 | + |
| 1099 | + const char *name = symtab_section->link->data + sym->st_name; |
| 939 | 1100 | unsigned type = ELF32_ST_TYPE(sym->st_info); |
| 940 | | − int sym_index = pe_find_import(pe->s1, symbol, NULL); |
| 941 | | − if (sym_index) { |
| 942 | | − if (type == STT_FUNC) { |
| 943 | | − unsigned long offset = text_section->data_offset; |
| 944 | | − if (pe_add_import(pe, sym_index, offset + 2)) { |
| 945 | | − /* add the 'jmp IAT[x]' instruction */ |
| 946 | | − *(WORD *) section_ptr_add(text_section, 8) = |
| 947 | | − 0x25FF; |
| 948 | | − /* patch the symbol */ |
| 949 | | − sym->st_shndx = text_section->sh_num; |
| 950 | | − sym->st_value = offset; |
| 951 | | − continue; |
| 952 | | − } |
| 953 | | − } else if (type == STT_OBJECT) { /* data, ptr to that should be */ |
| 954 | | − if (pe_add_import(pe, sym_index, |
| 955 | | − (sym - |
| 956 | | − (Elf32_Sym *) symtab_section->data) | |
| 957 | | − 0x80000000)) |
| 958 | | − continue; |
| 1101 | + int imp_sym = pe_find_import(pe->s1, name); |
| 1102 | + struct import_symbol *is; |
| 1103 | + |
| 1104 | + if (0 == imp_sym) |
| 1105 | + goto not_found; |
| 1106 | + is = pe_add_import(pe, imp_sym); |
| 1107 | + if (!is) |
| 1108 | + goto not_found; |
| 1109 | + |
| 1110 | + if (type == STT_FUNC) { |
| 1111 | + unsigned long offset = is->thk_offset; |
| 1112 | + if (offset) { |
| 1113 | + /* got aliased symbol, like stricmp and _stricmp */ |
| 1114 | + |
| 1115 | + } else { |
| 1116 | + char buffer[100]; |
| 1117 | + |
| 1118 | + offset = text_section->data_offset; |
| 1119 | + /* add the 'jmp IAT[x]' instruction */ |
| 1120 | + *(WORD*)section_ptr_add(text_section, 8) = 0x25FF; |
| 1121 | + |
| 1122 | + /* add a helper symbol, will be patched later in |
| 1123 | + pe_build_imports */ |
| 1124 | + sprintf(buffer, "IAT.%s", name); |
| 1125 | + is->iat_index = put_elf_sym( |
| 1126 | + symtab_section, 0, sizeof(DWORD), |
| 1127 | + ELF32_ST_INFO(STB_GLOBAL, STT_OBJECT), |
| 1128 | + 0, SHN_UNDEF, buffer); |
| 1129 | + put_elf_reloc(symtab_section, text_section, |
| 1130 | + offset + 2, R_386_32, is->iat_index); |
| 1131 | + is->thk_offset = offset; |
| 959 | 1132 | } |
| 1133 | + |
| 1134 | + /* tcc_realloc might have altered sym's address */ |
| 1135 | + sym = (Elf32_Sym*)symtab_section->data + sym_index; |
| 1136 | + |
| 1137 | + /* patch the original symbol */ |
| 1138 | + sym->st_value = offset; |
| 1139 | + sym->st_shndx = text_section->sh_num; |
| 1140 | + sym->st_other &= ~1; /* do not export */ |
| 1141 | + continue; |
| 960 | 1142 | } |
| 961 | | − error_noabort("undefined symbol '%s'", symbol); |
| 1143 | + |
| 1144 | + if (type == STT_OBJECT) { /* data, ptr to that should be */ |
| 1145 | + if (0 == is->iat_index) { |
| 1146 | + /* original symbol will be patched later in pe_build_imports */ |
| 1147 | + is->iat_index = sym_index; |
| 1148 | + continue; |
| 1149 | + } |
| 1150 | + } |
| 1151 | + |
| 1152 | + not_found: |
| 1153 | + error_noabort("undefined symbol '%s'", name); |
| 962 | 1154 | ret = 1; |
| 963 | | − } else |
| 964 | | − if (pe->s1->rdynamic |
| 965 | | − && ELF32_ST_BIND(sym->st_info) != STB_LOCAL) { |
| 1155 | + |
| 1156 | + } else if (pe->s1->rdynamic |
| 1157 | + && ELF32_ST_BIND(sym->st_info) != STB_LOCAL) { |
| 966 | 1158 | /* if -rdynamic option, then export all non local symbols */ |
| 967 | 1159 | sym->st_other |= 1; |
| 968 | 1160 | } |
| @@ -972,8 +1164,9 @@ ST int pe_check_symbols(struct pe_info *pe) · 3 unmodified lines |
| 972 | 1164 | |
| 973 | 1165 | /*----------------------------------------------------------------------------*/ |
| 974 | 1166 | #ifdef PE_PRINT_SECTIONS |
| 975 | | −ST void pe_print_section(FILE * f, Section * s) |
| 976 | | −{ /* just if you'r curious */ |
| 1167 | +ST_FN void pe_print_section(FILE * f, Section * s) |
| 1168 | +{ |
| 1169 | + /* just if you'r curious */ |
| 977 | 1170 | BYTE *p, *e, b; |
| 978 | 1171 | int i, n, l, m; |
| 979 | 1172 | p = s->data; |
| @@ -992,6 +1185,9 @@ ST void pe_print_section(FILE * f, Section * s) · 12 unmodified lines |
| 992 | 1185 | if (s->sh_type == SHT_NOBITS) |
| 993 | 1186 | return; |
| 994 | 1187 | |
| 1188 | + if (0 == l) |
| 1189 | + return; |
| 1190 | + |
| 995 | 1191 | if (s->sh_type == SHT_SYMTAB) |
| 996 | 1192 | m = sizeof(Elf32_Sym); |
| 997 | 1193 | if (s->sh_type == SHT_REL) |
| @@ -999,7 +1195,49 @@ ST void pe_print_section(FILE * f, Section * s) · 1 unmodified line |
| 999 | 1195 | else |
| 1000 | 1196 | m = 16; |
| 1001 | 1197 | |
| 1002 | | − for (i = 0; i < l;) { |
| 1198 | + fprintf(f, "%-8s", "offset"); |
| 1199 | + for (i = 0; i < m; ++i) |
| 1200 | + fprintf(f, " %02x", i); |
| 1201 | + n = 56; |
| 1202 | + |
| 1203 | + if (s->sh_type == SHT_SYMTAB || s->sh_type == SHT_REL) { |
| 1204 | + const char *fields1[] = { |
| 1205 | + "name", |
| 1206 | + "value", |
| 1207 | + "size", |
| 1208 | + "bind", |
| 1209 | + "type", |
| 1210 | + "other", |
| 1211 | + "shndx", |
| 1212 | + NULL |
| 1213 | + }; |
| 1214 | + |
| 1215 | + const char *fields2[] = { |
| 1216 | + "offs", |
| 1217 | + "type", |
| 1218 | + "symb", |
| 1219 | + NULL |
| 1220 | + }; |
| 1221 | + |
| 1222 | + const char **p; |
| 1223 | + |
| 1224 | + if (s->sh_type == SHT_SYMTAB) |
| 1225 | + p = fields1, n = 106; |
| 1226 | + else |
| 1227 | + p = fields2, n = 58; |
| 1228 | + |
| 1229 | + for (i = 0; p[i]; ++i) |
| 1230 | + fprintf(f, "%6s", p[i]); |
| 1231 | + fprintf(f, " symbol"); |
| 1232 | + } |
| 1233 | + |
| 1234 | + fprintf(f, "\n"); |
| 1235 | + for (i = 0; i < n; ++i) |
| 1236 | + fprintf(f, "-"); |
| 1237 | + fprintf(f, "\n"); |
| 1238 | + |
| 1239 | + for (i = 0; i < l;) |
| 1240 | + { |
| 1003 | 1241 | fprintf(f, "%08X", i); |
| 1004 | 1242 | for (n = 0; n < m; ++n) { |
| 1005 | 1243 | if (n + i < l) |
| @@ -1011,31 +1249,20 @@ ST void pe_print_section(FILE * f, Section * s) · 5 unmodified lines |
| 1011 | 1249 | if (s->sh_type == SHT_SYMTAB) { |
| 1012 | 1250 | Elf32_Sym *sym = (Elf32_Sym *) (p + i); |
| 1013 | 1251 | const char *name = s->link->data + sym->st_name; |
| 1014 | | − fprintf(f, |
| 1015 | | − " name:%04X" |
| 1016 | | − " value:%04X" |
| 1017 | | − " size:%04X" |
| 1018 | | − " bind:%02X" |
| 1019 | | − " type:%02X" |
| 1020 | | − " other:%02X" |
| 1021 | | − " shndx:%04X" |
| 1022 | | − " \"%s\"", |
| 1252 | + fprintf(f, " %04X %04X %04X %02X %02X %02X %04X \"%s\"", |
| 1023 | 1253 | sym->st_name, |
| 1024 | 1254 | sym->st_value, |
| 1025 | 1255 | sym->st_size, |
| 1026 | 1256 | ELF32_ST_BIND(sym->st_info), |
| 1027 | 1257 | ELF32_ST_TYPE(sym->st_info), |
| 1028 | 1258 | sym->st_other, sym->st_shndx, name); |
| 1259 | + |
| 1029 | 1260 | } else if (s->sh_type == SHT_REL) { |
| 1030 | 1261 | Elf32_Rel *rel = (Elf32_Rel *) (p + i); |
| 1031 | 1262 | Elf32_Sym *sym = |
| 1032 | 1263 | (Elf32_Sym *) s->link->data + ELF32_R_SYM(rel->r_info); |
| 1033 | 1264 | const char *name = s->link->link->data + sym->st_name; |
| 1034 | | − fprintf(f, |
| 1035 | | − " offset:%04X" |
| 1036 | | − " type:%02X" |
| 1037 | | − " symbol:%04X" |
| 1038 | | − " \"%s\"", |
| 1265 | + fprintf(f, " %04X %02X %04X \"%s\"", |
| 1039 | 1266 | rel->r_offset, |
| 1040 | 1267 | ELF32_R_TYPE(rel->r_info), |
| 1041 | 1268 | ELF32_R_SYM(rel->r_info), name); |
| @@ -1055,190 +1282,270 @@ ST void pe_print_section(FILE * f, Section * s) · 13 unmodified lines |
| 1055 | 1282 | } |
| 1056 | 1283 | fprintf(f, "\n\n"); |
| 1057 | 1284 | } |
| 1285 | + |
| 1286 | +ST_FN void pe_print_sections(TCCState *s1, const char *fname) |
| 1287 | +{ |
| 1288 | + Section *s; |
| 1289 | + FILE *f; |
| 1290 | + int i; |
| 1291 | + f = fopen(fname, "wt"); |
| 1292 | + for (i = 1; i < s1->nb_sections; ++i) { |
| 1293 | + s = s1->sections[i]; |
| 1294 | + pe_print_section(f, s); |
| 1295 | + } |
| 1296 | + pe_print_section(f, s1->dynsymtab_section); |
| 1297 | + fclose(f); |
| 1298 | +} |
| 1058 | 1299 | #endif |
| 1059 | 1300 | |
| 1060 | | −static int pe_test_cmd(const char **pp, const char *cmd) |
| 1301 | +/* ------------------------------------------------------------- |
| 1302 | + * This is for compiled windows resources in 'coff' format |
| 1303 | + * as generated by 'windres.exe -O coff ...'. |
| 1304 | + */ |
| 1305 | + |
| 1306 | +PUB_FN int pe_test_res_file(void *v, int size) |
| 1061 | 1307 | { |
| 1062 | | − const char *p; |
| 1063 | | − char *q, buf[16]; |
| 1064 | | − int ret; |
| 1308 | + struct pe_rsrc_header *p = (struct pe_rsrc_header *)v; |
| 1309 | + return |
| 1310 | + size >= IMAGE_SIZEOF_FILE_HEADER + IMAGE_SIZEOF_SHORT_NAME /* = 28 */ |
| 1311 | + && p->filehdr.Machine == 0x014C |
| 1312 | + && 1 == p->filehdr.NumberOfSections |
| 1313 | + && 0 == strcmp(p->sectionhdr.Name, ".rsrc") |
| 1314 | + ; |
| 1315 | +} |
| 1065 | 1316 | |
| 1066 | | − p = *pp; |
| 1067 | | − q = buf; |
| 1068 | | − while (*p != '\0' && !is_space(*p)) { |
| 1069 | | − if ((q - buf) < sizeof(buf) - 1) |
| 1070 | | − *q++ = toup(*p); |
| 1071 | | − p++; |
| 1317 | +ST_FN int read_n(int fd, void *ptr, unsigned size) |
| 1318 | +{ |
| 1319 | + return size == read(fd, ptr, size); |
| 1320 | +} |
| 1321 | + |
| 1322 | +PUB_FN int pe_load_res_file(TCCState *s1, int fd) |
| 1323 | +{ |
| 1324 | + struct pe_rsrc_header hdr; |
| 1325 | + Section *rsrc_section; |
| 1326 | + int i, ret = -1; |
| 1327 | + BYTE *ptr; |
| 1328 | + |
| 1329 | + lseek (fd, 0, SEEK_SET); |
| 1330 | + if (!read_n(fd, &hdr, sizeof hdr)) |
| 1331 | + goto quit; |
| 1332 | + if (!pe_test_res_file(&hdr, sizeof hdr)) |
| 1333 | + goto quit; |
| 1334 | + |
| 1335 | + rsrc_section = new_section(s1, ".rsrc", SHT_PROGBITS, SHF_ALLOC); |
| 1336 | + ptr = section_ptr_add(rsrc_section, hdr.sectionhdr.SizeOfRawData); |
| 1337 | + lseek (fd, hdr.sectionhdr.PointerToRawData, SEEK_SET); |
| 1338 | + if (!read_n(fd, ptr, hdr.sectionhdr.SizeOfRawData)) |
| 1339 | + goto quit; |
| 1340 | + |
| 1341 | + lseek (fd, hdr.sectionhdr.PointerToRelocations, SEEK_SET); |
| 1342 | + for (i = 0; i < hdr.sectionhdr.NumberOfRelocations; ++i) |
| 1343 | + { |
| 1344 | + struct pe_rsrc_reloc rel; |
| 1345 | + if (!read_n(fd, &rel, sizeof rel)) |
| 1346 | + goto quit; |
| 1347 | + // printf("rsrc_reloc: %x %x %x\n", rel.offset, rel.size, rel.type); |
| 1348 | + if (rel.type != 7) /* DIR32NB */ |
| 1349 | + goto quit; |
| 1350 | + put_elf_reloc(symtab_section, rsrc_section, |
| 1351 | + rel.offset, R_386_RELATIVE, 0); |
| 1072 | 1352 | } |
| 1073 | | − *q = '\0'; |
| 1074 | | − ret = !strcmp(buf, cmd); |
| 1075 | | − *pp = p; |
| 1353 | + ret = 0; |
| 1354 | +quit: |
| 1355 | + if (ret) |
| 1356 | + error_noabort("unrecognized resource file format"); |
| 1076 | 1357 | return ret; |
| 1077 | 1358 | } |
| 1078 | 1359 | |
| 1079 | 1360 | /* ------------------------------------------------------------- */ |
| 1080 | | −int pe_load_def_file(TCCState * s1, FILE * fp) |
| 1361 | +ST_FN char *trimfront(char *p) |
| 1081 | 1362 | { |
| 1082 | | − DLLReference *dllref; |
| 1083 | | − int f = 0, sym_index; |
| 1084 | | − char *p, line[120], dllname[40]; |
| 1085 | | − while (fgets(line, sizeof line, fp)) { |
| 1086 | | − p = strchr(line, 0); |
| 1087 | | − while (p > line && p[-1] <= ' ') |
| 1088 | | − --p; |
| 1089 | | − *p = 0; |
| 1090 | | − p = line; |
| 1091 | | − while (*p && *p <= ' ') |
| 1092 | | − ++p; |
| 1093 | | − |
| 1094 | | − if (*p && ';' != *p) |
| 1095 | | − switch (f) { |
| 1096 | | − case 0: |
| 1097 | | − if (!pe_test_cmd((const char **)&p, "LIBRARY")) |
| 1098 | | − return -1; |
| 1099 | | − while (is_space(*p)) |
| 1100 | | − p++; |
| 1101 | | − pstrcpy(dllname, sizeof(dllname), p); |
| 1102 | | − ++f; |
| 1103 | | − continue; |
| 1363 | + while (*p && (unsigned char)*p <= ' ') |
| 1364 | + ++p; |
| 1365 | + return p; |
| 1366 | +} |
| 1104 | 1367 | |
| 1105 | | − case 1: |
| 1106 | | − if (!pe_test_cmd((const char **)&p, "EXPORTS")) |
| 1107 | | − return -1; |
| 1108 | | − ++f; |
| 1109 | | − continue; |
| 1368 | +ST_FN char *trimback(char *a, char *e) |
| 1369 | +{ |
| 1370 | + while (e > a && (unsigned char)e[-1] <= ' ') |
| 1371 | + --e; |
| 1372 | + *e = 0;; |
| 1373 | + return a; |
| 1374 | +} |
| 1110 | 1375 | |
| 1111 | | − case 2: |
| 1112 | | − dllref = |
| 1113 | | − tcc_malloc(sizeof(DLLReference) + strlen(dllname)); |
| 1114 | | − strcpy(dllref->name, dllname); |
| 1115 | | − dllref->level = 0; |
| 1116 | | − dynarray_add((void ***) &s1->loaded_dlls, |
| 1117 | | − &s1->nb_loaded_dlls, dllref); |
| 1118 | | − ++f; |
| 1119 | | − |
| 1120 | | − default: |
| 1121 | | − /* tccpe needs to know from what dll it should import |
| 1122 | | − the sym */ |
| 1123 | | − sym_index = add_elf_sym(s1->dynsymtab_section, |
| 1124 | | − 0, 0, ELF32_ST_INFO(STB_GLOBAL, |
| 1125 | | − STT_FUNC), |
| 1126 | | − s1->nb_loaded_dlls - 1, |
| 1127 | | − text_section->sh_num, p); |
| 1128 | | − continue; |
| 1129 | | − } |
| 1130 | | − } |
| 1131 | | − return 0; |
| 1376 | +ST_FN char *get_line(char *line, int size, FILE *fp) |
| 1377 | +{ |
| 1378 | + if (NULL == fgets(line, size, fp)) |
| 1379 | + return NULL; |
| 1380 | + trimback(line, strchr(line, 0)); |
| 1381 | + return trimfront(line); |
| 1132 | 1382 | } |
| 1133 | 1383 | |
| 1134 | 1384 | /* ------------------------------------------------------------- */ |
| 1135 | | −void pe_guess_outfile(char *objfilename, int output_type) |
| 1385 | +PUB_FN int pe_load_def_file(TCCState *s1, int fd) |
| 1136 | 1386 | { |
| 1137 | | − char *ext = strrchr(objfilename, '.'); |
| 1138 | | − if (NULL == ext) |
| 1139 | | − ext = strchr(objfilename, 0); |
| 1140 | | − if (output_type == TCC_OUTPUT_DLL) |
| 1141 | | − strcpy(ext, ".dll"); |
| 1142 | | − else |
| 1143 | | − if (output_type == TCC_OUTPUT_EXE) |
| 1144 | | − strcpy(ext, ".exe"); |
| 1145 | | − else |
| 1146 | | − if (output_type == TCC_OUTPUT_OBJ && strcmp(ext, ".o")) |
| 1147 | | − strcpy(ext, ".o"); |
| 1148 | | − else |
| 1149 | | − error("no outputfile given"); |
| 1387 | + DLLReference *dllref; |
| 1388 | + int state = 0, ret = -1; |
| 1389 | + char line[400], dllname[80], *p; |
| 1390 | + FILE *fp = fdopen(dup(fd), "rb"); |
| 1391 | + |
| 1392 | + if (NULL == fp) |
| 1393 | + goto quit; |
| 1394 | + |
| 1395 | + for (;;) { |
| 1396 | + p = get_line(line, sizeof line, fp); |
| 1397 | + if (NULL == p) |
| 1398 | + break; |
| 1399 | + if (0 == *p || ';' == *p) |
| 1400 | + continue; |
| 1401 | + switch (state) { |
| 1402 | + case 0: |
| 1403 | + if (0 != strnicmp(p, "LIBRARY", 7)) |
| 1404 | + goto quit; |
| 1405 | + strcpy(dllname, trimfront(p+7)); |
| 1406 | + ++state; |
| 1407 | + continue; |
| 1408 | + |
| 1409 | + case 1: |
| 1410 | + if (0 != stricmp(p, "EXPORTS")) |
| 1411 | + goto quit; |
| 1412 | + ++state; |
| 1413 | + continue; |
| 1414 | + |
| 1415 | + case 2: |
| 1416 | + dllref = tcc_malloc(sizeof(DLLReference) + strlen(dllname)); |
| 1417 | + strcpy(dllref->name, dllname); |
| 1418 | + dllref->level = 0; |
| 1419 | + dynarray_add((void ***) &s1->loaded_dlls, &s1->nb_loaded_dlls, dllref); |
| 1420 | + ++state; |
| 1421 | + |
| 1422 | + default: |
| 1423 | + add_elf_sym(s1->dynsymtab_section, |
| 1424 | + s1->nb_loaded_dlls, 0, |
| 1425 | + ELF32_ST_INFO(STB_GLOBAL, STT_FUNC), 0, |
| 1426 | + text_section->sh_num, p); |
| 1427 | + continue; |
| 1428 | + } |
| 1429 | + } |
| 1430 | + ret = 0; |
| 1431 | +quit: |
| 1432 | + if (fp) |
| 1433 | + fclose(fp); |
| 1434 | + if (ret) |
| 1435 | + error_noabort("unrecognized export definition file format"); |
| 1436 | + return ret; |
| 1150 | 1437 | } |
| 1151 | 1438 | |
| 1152 | 1439 | /* ------------------------------------------------------------- */ |
| 1153 | | −unsigned long pe_add_runtime(TCCState * s1) |
| 1440 | + |
| 1441 | +ST_FN void pe_add_runtime_ex(TCCState *s1, struct pe_info *pe) |
| 1154 | 1442 | { |
| 1155 | 1443 | const char *start_symbol; |
| 1156 | | − unsigned long addr; |
| 1444 | + unsigned long addr = 0; |
| 1445 | + int pe_type = 0; |
| 1157 | 1446 | |
| 1158 | | − if (find_elf_sym(symtab_section, "WinMain")) |
| 1447 | + if (find_elf_sym(symtab_section, "_WinMain@16")) |
| 1159 | 1448 | pe_type = PE_GUI; |
| 1160 | 1449 | else |
| 1161 | | − if (TCC_OUTPUT_DLL == s1->output_type) |
| 1162 | | − { |
| 1450 | + if (TCC_OUTPUT_DLL == s1->output_type) { |
| 1163 | 1451 | pe_type = PE_DLL; |
| 1164 | | − // need this for 'tccelf.c:relocate_section()' |
| 1452 | + /* need this for 'tccelf.c:relocate_section()' */ |
| 1165 | 1453 | s1->output_type = TCC_OUTPUT_EXE; |
| 1166 | 1454 | } |
| 1167 | 1455 | |
| 1168 | 1456 | start_symbol = |
| 1169 | 1457 | TCC_OUTPUT_MEMORY == s1->output_type |
| 1170 | 1458 | ? PE_GUI == pe_type ? "_runwinmain" : NULL |
| 1171 | | − : PE_DLL == pe_type ? "_dllstart" |
| 1172 | | − : PE_GUI == pe_type ? "_winstart" : "_start"; |
| 1459 | + : PE_DLL == pe_type ? "__dllstart@12" |
| 1460 | + : PE_GUI == pe_type ? "_winstart" : "_start" |
| 1461 | + ; |
| 1173 | 1462 | |
| 1174 | 1463 | /* grab the startup code from libtcc1 */ |
| 1175 | 1464 | if (start_symbol) |
| 1176 | 1465 | add_elf_sym(symtab_section, |
| 1177 | | − 0, 0, |
| 1178 | | − ELF32_ST_INFO(STB_GLOBAL, STT_NOTYPE), 0, |
| 1179 | | − SHN_UNDEF, start_symbol); |
| 1466 | + 0, 0, |
| 1467 | + ELF32_ST_INFO(STB_GLOBAL, STT_NOTYPE), 0, |
| 1468 | + SHN_UNDEF, start_symbol); |
| 1180 | 1469 | |
| 1181 | 1470 | if (0 == s1->nostdlib) { |
| 1182 | 1471 | tcc_add_library(s1, "tcc1"); |
| 1472 | +#ifdef __CYGWIN__ |
| 1473 | + tcc_add_library(s1, "cygwin1"); |
| 1474 | +#else |
| 1183 | 1475 | tcc_add_library(s1, "msvcrt"); |
| 1476 | +#endif |
| 1477 | + tcc_add_library(s1, "kernel32"); |
| 1184 | 1478 | if (PE_DLL == pe_type || PE_GUI == pe_type) { |
| 1185 | | − tcc_add_library(s1, "kernel32"); |
| 1186 | 1479 | tcc_add_library(s1, "user32"); |
| 1187 | 1480 | tcc_add_library(s1, "gdi32"); |
| 1188 | 1481 | } |
| 1189 | 1482 | } |
| 1190 | 1483 | |
| 1191 | | − addr = start_symbol ? |
| 1192 | | − (unsigned long) tcc_get_symbol_err(s1, start_symbol) : 0; |
| 1193 | | − |
| 1194 | | − if (s1->output_type == TCC_OUTPUT_MEMORY && addr) { |
| 1195 | | − /* for -run GUI's, put '_runwinmain' instead of 'main' */ |
| 1196 | | − add_elf_sym(symtab_section, |
| 1484 | + if (start_symbol) { |
| 1485 | + addr = (unsigned long)tcc_get_symbol_err(s1, start_symbol); |
| 1486 | + if (s1->output_type == TCC_OUTPUT_MEMORY && addr) |
| 1487 | + /* for -run GUI's, put '_runwinmain' instead of 'main' */ |
| 1488 | + add_elf_sym(symtab_section, |
| 1197 | 1489 | addr, 0, |
| 1198 | 1490 | ELF32_ST_INFO(STB_GLOBAL, STT_NOTYPE), 0, |
| 1199 | 1491 | text_section->sh_num, "main"); |
| 1492 | + } |
| 1200 | 1493 | |
| 1201 | | − /* FreeConsole(); */ |
| 1494 | + if (pe) { |
| 1495 | + pe->type = pe_type; |
| 1496 | + pe->start_addr = addr; |
| 1202 | 1497 | } |
| 1203 | | − return addr; |
| 1204 | 1498 | } |
| 1205 | 1499 | |
| 1206 | | −int tcc_output_pe(TCCState * s1, const char *filename) |
| 1500 | +PUB_FN void pe_add_runtime(TCCState *s1) |
| 1501 | +{ |
| 1502 | + pe_add_runtime_ex(s1, NULL); |
| 1503 | +} |
| 1504 | + |
| 1505 | +PUB_FN int pe_output_file(TCCState * s1, const char *filename) |
| 1207 | 1506 | { |
| 1208 | 1507 | int ret; |
| 1209 | 1508 | struct pe_info pe; |
| 1210 | 1509 | int i; |
| 1510 | + |
| 1211 | 1511 | memset(&pe, 0, sizeof pe); |
| 1212 | 1512 | pe.filename = filename; |
| 1213 | 1513 | pe.s1 = s1; |
| 1214 | | − pe.start_addr = pe_add_runtime(s1); |
| 1215 | 1514 | |
| 1216 | | − relocate_common_syms(); /* assign bss adresses */ |
| 1515 | + pe_add_runtime_ex(s1, &pe); |
| 1516 | + relocate_common_syms(); /* assign bss adresses */ |
| 1517 | + tcc_add_linker_symbols(s1); |
| 1518 | + |
| 1217 | 1519 | ret = pe_check_symbols(&pe); |
| 1218 | 1520 | if (0 == ret) { |
| 1521 | + if (PE_DLL == pe.type) { |
| 1522 | + pe.reloc = new_section(pe.s1, ".reloc", SHT_PROGBITS, 0); |
| 1523 | + pe.imagebase = 0x10000000; |
| 1524 | + } else { |
| 1525 | + pe.imagebase = 0x00400000; |
| 1526 | + } |
| 1219 | 1527 | pe_assign_addresses(&pe); |
| 1220 | 1528 | relocate_syms(s1, 0); |
| 1221 | 1529 | for (i = 1; i < s1->nb_sections; ++i) { |
| 1222 | 1530 | Section *s = s1->sections[i]; |
| 1223 | | − if (s->reloc) |
| 1531 | + if (s->reloc) { |
| 1224 | 1532 | relocate_section(s1, s); |
| 1533 | + pe_relocate_rva(&pe, s); |
| 1534 | + } |
| 1225 | 1535 | } |
| 1226 | | − ret = pe_write_pe(&pe); |
| 1536 | + if (s1->nb_errors) |
| 1537 | + ret = 1; |
| 1538 | + else |
| 1539 | + ret = pe_write(&pe); |
| 1540 | + tcc_free(pe.sec_info); |
| 1227 | 1541 | } |
| 1542 | + |
| 1228 | 1543 | #ifdef PE_PRINT_SECTIONS |
| 1229 | | − { |
| 1230 | | − Section *s; |
| 1231 | | − FILE *f; |
| 1232 | | − f = fopen("tccpe.log", "wt"); |
| 1233 | | − for (i = 1; i < s1->nb_sections; ++i) { |
| 1234 | | − s = s1->sections[i]; |
| 1235 | | − pe_print_section(f, s); |
| 1236 | | − } |
| 1237 | | − pe_print_section(f, s1->dynsymtab_section); |
| 1238 | | − fclose(f); |
| 1239 | | − } |
| 1544 | + pe_print_sections(s1, "tcc.log"); |
| 1240 | 1545 | #endif |
| 1241 | 1546 | return ret; |
| 1242 | 1547 | } |
| 1243 | 1548 | |
| 1244 | | −/*----------------------------------------------------------------------------*/ |
| 1549 | +/* ------------------------------------------------------------- */ |
| 1550 | +#endif /* def TCC_TARGET_PE */ |
| 1551 | +/* ------------------------------------------------------------- */ |