| @@ -36,6 +36,10 @@ · 35 unmodified lines |
| 36 | #define PE_MERGE_DATA | 36 | #define PE_MERGE_DATA |
| 37 | // #define PE_PRINT_SECTIONS | 37 | // #define PE_PRINT_SECTIONS |
| 38 | | 38 | |
| | 39 | #if defined _WIN32 && (defined _WIN64) == (defined TCC_TARGET_X86_64) |
| | 40 | #define TCC_IS_NATIVE |
| | 41 | #endif |
| | 42 | |
| 39 | /* ----------------------------------------------------------- */ | 43 | /* ----------------------------------------------------------- */ |
| 40 | #ifndef IMAGE_NT_SIGNATURE | 44 | #ifndef IMAGE_NT_SIGNATURE |
| 41 | /* ----------------------------------------------------------- */ | 45 | /* ----------------------------------------------------------- */ |
| @@ -411,6 +415,7 @@ struct pe_info { · 369 unmodified lines |
| 411 | #define PE_DLL 1 | 415 | #define PE_DLL 1 |
| 412 | #define PE_GUI 2 | 416 | #define PE_GUI 2 |
| 413 | #define PE_EXE 3 | 417 | #define PE_EXE 3 |
| | 418 | #define PE_RUN 4 |
| 414 | | 419 | |
| 415 | void error_noabort(const char *, ...); | 420 | void error_noabort(const char *, ...); |
| 416 | | 421 | |
| @@ -455,54 +460,11 @@ ST_FN int pe_find_import(TCCState * s1, const char *symbol) · 38 unmodified lines |
| 455 | do { | 460 | do { |
| 456 | s = n ? get_alt_symbol(buffer, symbol) : symbol; | 461 | s = n ? get_alt_symbol(buffer, symbol) : symbol; |
| 457 | sym_index = find_elf_sym(s1->dynsymtab_section, s); | 462 | sym_index = find_elf_sym(s1->dynsymtab_section, s); |
| 458 | // printf("find %d %s\n", sym_index, s); | 463 | // printf("find (%d) %d %s\n", n, sym_index, s); |
| 459 | } while (0 == sym_index && ++n < 2); | 464 | } while (0 == sym_index && ++n < 2); |
| 460 | return sym_index; | 465 | return sym_index; |
| 461 | } | 466 | } |
| 462 | | 467 | |
| 463 | #if defined _WIN32 || defined __CYGWIN__ | | |
| 464 | | | |
| 465 | #ifdef __CYGWIN__ | | |
| 466 | # include <dlfcn.h> | | |
| 467 | # define LoadLibrary(s) dlopen(s, RTLD_NOW) | | |
| 468 | # define GetProcAddress(h,s) dlsym(h, s) | | |
| 469 | #else | | |
| 470 | # define dlclose(h) FreeLibrary(h) | | |
| 471 | #endif | | |
| 472 | | | |
| 473 | /* for the -run option: dynamically load symbol from dll */ | | |
| 474 | void *resolve_sym(struct TCCState *s1, const char *symbol, int type) | | |
| 475 | { | | |
| 476 | char buffer[100]; | | |
| 477 | int sym_index, dll_index; | | |
| 478 | void *addr, **m; | | |
| 479 | DLLReference *dllref; | | |
| 480 | | | |
| 481 | sym_index = pe_find_import(s1, symbol); | | |
| 482 | if (0 == sym_index) | | |
| 483 | return NULL; | | |
| 484 | dll_index = ((Elf32_Sym *)s1->dynsymtab_section->data + sym_index)->st_value; | | |
| 485 | dllref = s1->loaded_dlls[dll_index-1]; | | |
| 486 | if ( !dllref->handle ) | | |
| 487 | { | | |
| 488 | dllref->handle = LoadLibrary(dllref->name); | | |
| 489 | } | | |
| 490 | addr = GetProcAddress(dllref->handle, symbol); | | |
| 491 | if (NULL == addr) | | |
| 492 | addr = GetProcAddress(dllref->handle, get_alt_symbol(buffer, symbol)); | | |
| 493 | | | |
| 494 | if (addr && STT_OBJECT == type) { | | |
| 495 | /* need to return a pointer to the address for data objects */ | | |
| 496 | m = (void**)tcc_malloc(sizeof addr), *m = addr, addr = m; | | |
| 497 | #ifdef MEM_DEBUG | | |
| 498 | /* yep, we don't free it */ | | |
| 499 | mem_cur_size -= sizeof (void*); | | |
| 500 | #endif | | |
| 501 | } | | |
| 502 | return addr; | | |
| 503 | } | | |
| 504 | #endif | | |
| 505 | | | |
| 506 | /*----------------------------------------------------------------------------*/ | 468 | /*----------------------------------------------------------------------------*/ |
| 507 | | 469 | |
| 508 | ST_FN int dynarray_assoc(void **pp, int n, int key) | 470 | ST_FN int dynarray_assoc(void **pp, int n, int key) |
| @@ -729,7 +691,8 @@ ST_FN void pe_build_imports(struct pe_info *pe) · 220 unmodified lines |
| 729 | | 691 | |
| 730 | for (i = 0; i < pe->imp_count; ++i) { | 692 | for (i = 0; i < pe->imp_count; ++i) { |
| 731 | struct pe_import_header *hdr; | 693 | struct pe_import_header *hdr; |
| 732 | int k, n, v; | 694 | int k, n; |
| | 695 | DWORD v; |
| 733 | struct pe_import_info *p = pe->imp_info[i]; | 696 | struct pe_import_info *p = pe->imp_info[i]; |
| 734 | const char *name = pe->s1->loaded_dlls[p->dll_index-1]->name; | 697 | const char *name = pe->s1->loaded_dlls[p->dll_index-1]->name; |
| 735 | | 698 | |
| @@ -743,7 +706,7 @@ ST_FN void pe_build_imports(struct pe_info *pe) · 7 unmodified lines |
| 743 | | 706 | |
| 744 | for (k = 0, n = p->sym_count; k <= n; ++k) { | 707 | for (k = 0, n = p->sym_count; k <= n; ++k) { |
| 745 | if (k < n) { | 708 | if (k < n) { |
| 746 | DWORD iat_index = p->symbols[k]->iat_index; | 709 | int iat_index = p->symbols[k]->iat_index; |
| 747 | int sym_index = p->symbols[k]->sym_index; | 710 | int sym_index = p->symbols[k]->sym_index; |
| 748 | Elf32_Sym *imp_sym = (Elf32_Sym *)pe->s1->dynsymtab_section->data + sym_index; | 711 | Elf32_Sym *imp_sym = (Elf32_Sym *)pe->s1->dynsymtab_section->data + sym_index; |
| 749 | Elf32_Sym *org_sym = (Elf32_Sym *)symtab_section->data + iat_index; | 712 | Elf32_Sym *org_sym = (Elf32_Sym *)symtab_section->data + iat_index; |
| @@ -754,7 +717,16 @@ ST_FN void pe_build_imports(struct pe_info *pe) · 4 unmodified lines |
| 754 | v = pe->thunk->data_offset + rva_base; | 717 | v = pe->thunk->data_offset + rva_base; |
| 755 | section_ptr_add(pe->thunk, sizeof(WORD)); /* hint, not used */ | 718 | section_ptr_add(pe->thunk, sizeof(WORD)); /* hint, not used */ |
| 756 | put_elf_str(pe->thunk, name); | 719 | put_elf_str(pe->thunk, name); |
| 757 | | 720 | #ifdef TCC_IS_NATIVE |
| | 721 | if (pe->type == PE_RUN) { |
| | 722 | DLLReference *dllref = pe->s1->loaded_dlls[imp_sym->st_value-1]; |
| | 723 | if ( !dllref->handle ) |
| | 724 | dllref->handle = LoadLibrary(dllref->name); |
| | 725 | v = (DWORD)GetProcAddress(dllref->handle, name); |
| | 726 | if (!v) |
| | 727 | error_noabort("undefined symbol '%s'", name); |
| | 728 | } |
| | 729 | #endif |
| 758 | } else { | 730 | } else { |
| 759 | v = 0; /* last entry is zero */ | 731 | v = 0; /* last entry is zero */ |
| 760 | } | 732 | } |
| @@ -1488,6 +1460,7 @@ ST_FN void pe_add_runtime_ex(TCCState *s1, struct pe_info *pe) · 727 unmodified lines |
| 1488 | tcc_add_library(s1, "gdi32"); | 1460 | tcc_add_library(s1, "gdi32"); |
| 1489 | } | 1461 | } |
| 1490 | } | 1462 | } |
| | 1463 | pe->type = pe_type; |
| 1491 | | 1464 | |
| 1492 | if (start_symbol) { | 1465 | if (start_symbol) { |
| 1493 | addr = (unsigned long)tcc_get_symbol_err(s1, start_symbol); | 1466 | addr = (unsigned long)tcc_get_symbol_err(s1, start_symbol); |
| @@ -1498,16 +1471,7 @@ ST_FN void pe_add_runtime_ex(TCCState *s1, struct pe_info *pe) · 4 unmodified lines |
| 1498 | ELF32_ST_INFO(STB_GLOBAL, STT_NOTYPE), 0, | 1471 | ELF32_ST_INFO(STB_GLOBAL, STT_NOTYPE), 0, |
| 1499 | text_section->sh_num, "main"); | 1472 | text_section->sh_num, "main"); |
| 1500 | } | 1473 | } |
| 1501 | | 1474 | pe->start_addr = addr; |
| 1502 | if (pe) { | | |
| 1503 | pe->type = pe_type; | | |
| 1504 | pe->start_addr = addr; | | |
| 1505 | } | | |
| 1506 | } | | |
| 1507 | | | |
| 1508 | PUB_FN void pe_add_runtime(TCCState *s1) | | |
| 1509 | { | | |
| 1510 | pe_add_runtime_ex(s1, NULL); | | |
| 1511 | } | 1475 | } |
| 1512 | | 1476 | |
| 1513 | PUB_FN int pe_output_file(TCCState * s1, const char *filename) | 1477 | PUB_FN int pe_output_file(TCCState * s1, const char *filename) |
| @@ -1525,7 +1489,10 @@ PUB_FN int pe_output_file(TCCState * s1, const char *filename) · 11 unmodified lines |
| 1525 | tcc_add_linker_symbols(s1); | 1489 | tcc_add_linker_symbols(s1); |
| 1526 | | 1490 | |
| 1527 | ret = pe_check_symbols(&pe); | 1491 | ret = pe_check_symbols(&pe); |
| 1528 | if (0 == ret) { | 1492 | if (ret) |
| | 1493 | return ret; |
| | 1494 | |
| | 1495 | if (filename) { |
| 1529 | if (PE_DLL == pe.type) { | 1496 | if (PE_DLL == pe.type) { |
| 1530 | pe.reloc = new_section(pe.s1, ".reloc", SHT_PROGBITS, 0); | 1497 | pe.reloc = new_section(pe.s1, ".reloc", SHT_PROGBITS, 0); |
| 1531 | pe.imagebase = 0x10000000; | 1498 | pe.imagebase = 0x10000000; |
| @@ -1546,6 +1513,13 @@ PUB_FN int pe_output_file(TCCState * s1, const char *filename) · 14 unmodified lines |
| 1546 | else | 1513 | else |
| 1547 | ret = pe_write(&pe); | 1514 | ret = pe_write(&pe); |
| 1548 | tcc_free(pe.sec_info); | 1515 | tcc_free(pe.sec_info); |
| | 1516 | } else { |
| | 1517 | #ifndef TCC_IS_NATIVE |
| | 1518 | error_noabort("-run supported only on native platform"); |
| | 1519 | #endif |
| | 1520 | pe.type = PE_RUN; |
| | 1521 | pe.thunk = data_section; |
| | 1522 | pe_build_imports(&pe); |
| 1549 | } | 1523 | } |
| 1550 | | 1524 | |
| 1551 | #ifdef PE_PRINT_SECTIONS | 1525 | #ifdef PE_PRINT_SECTIONS |