d0p1/tcc-stupidos
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
tcc-stupidos/i386-link.c

325 lines
9.7 KiB
C
Raw Normal View History

Fix relocs_info declaration in tcc.h C standard specifies that array should be declared with a non null size or with * for standard array. Declaration of relocs_info in tcc.h was not respecting this rule. This commit add a R_NUM macro that maps to the R_<ARCH>_NUM macros and declare relocs_info using it. This commit also moves all linker-related macros from <arch>-gen.c files to <arch>-link.c ones.
2016-12-05 20:40:59 +00:00
#ifdef TARGET_DEFS_ONLY
#define EM_TCC_TARGET EM_386
/* relocation type for 32 bit data relocation */
#define R_DATA_32 R_386_32
Add dwarf support The new gcc12 release does not support stabs any more. This was a good reason to add support for dwarf. The stabs code still works and is used if configure option --dwarf is not used. Tested on x86_64, i386, arm, arm64, riscv64 with dwarf-5. Some debuggers may not support dwarf-5. Try using older dwarf versions i that case. The tccmacho.c code probably need some support for dwarf. arm-gen.c, arm64-gen.c, i386-gen.c, riscv64-gen.c, x86_64-gen. - fix get_sym_ref symbol size arm-link.c, arm64-link.c, i386-link.c, riscv64-link.c, x86_64-link.c - add R_DATA_32U libtcc.c: - parse -gdwarf option tcc.c: - add dwarf option tcc.h: - add dwarf option and sections tccelf.c: - init dwarf sections - avoid adding sh_addr for dwarf sections - remove dwarf relocs for output dll - add dwarf sections for tccrun tccgen.c: - add dwarf defines + global data - add dwarf_* functions - mix dwarf code with stabs code - a trick is used to emit function name in .debug_line section so only this section has to be parsed instead of .debug_info and .debug_abbrev. - fix init debug_modes tccrun.c: - add dwarf sections in rt_context - init them in tcc_run - add new dwarf code rt_printline_dwarf to find file/function dwarf.h: - New file tcc-doc.texi: - document dwarf configure: - add dwarf option lib/Makefile - change -gstabs into -gdwarf lib/bt-exe.c, tests/tests2/Makefile, tests/tests2/126_bound_global: - Add __bound_init call - Add new testcase to test it
2022-05-05 07:10:37 +00:00
#define R_DATA_32U R_386_32
Fix relocs_info declaration in tcc.h C standard specifies that array should be declared with a non null size or with * for standard array. Declaration of relocs_info in tcc.h was not respecting this rule. This commit add a R_NUM macro that maps to the R_<ARCH>_NUM macros and declare relocs_info using it. This commit also moves all linker-related macros from <arch>-gen.c files to <arch>-link.c ones.
2016-12-05 20:40:59 +00:00
#define R_DATA_PTR R_386_32
#define R_JMP_SLOT R_386_JMP_SLOT
#define R_GLOB_DAT R_386_GLOB_DAT
#define R_COPY R_386_COPY
elf: Support STB_LOCAL dynamic symbols local symbols can be resolved statically, they don't have to be done dynamically, so this is a slight speedup at load time for produced executables and shared libs. The musl libc also rejects any STB_LOCAL symbols for dynamic symbol resolution, so there it also fixes use of shared libs created by tcc.
2017-05-07 02:41:40 +00:00
#define R_RELATIVE R_386_RELATIVE
Fix relocs_info declaration in tcc.h C standard specifies that array should be declared with a non null size or with * for standard array. Declaration of relocs_info in tcc.h was not respecting this rule. This commit add a R_NUM macro that maps to the R_<ARCH>_NUM macros and declare relocs_info using it. This commit also moves all linker-related macros from <arch>-gen.c files to <arch>-link.c ones.
2016-12-05 20:40:59 +00:00
#define R_NUM R_386_NUM
#define ELF_START_ADDR 0x08048000
#define ELF_PAGE_SIZE 0x1000
Fix PLT creation for i386 i386 target does not have PC relative loads. Its ABI therefore require ebx register to points to the GOT when executing a PLT entry. This means that PLT entry cannot be used transparently, the compiler needs to expect execution of a PLT entry to be able to use one, that is a PLT entry should only be created if the relocation explicitely asks for it (eg. R_386_PLT32). This patch creates a new target macro PCRELATIVE_DLLPLT to indicate whether a target can do a PC relative load in PLT entry when building a dynamic library. Executable do not normally pose a problem because they are loaded at a fixed address and thus the absolute address of GOT can be used. Note that in such a case, if the compiler does not use a PLT aware relocation for external access then the code relocation will fall on the dynamic loader since there is no PLT entry to relocate too.
2016-12-10 09:14:29 +00:00
#define PCRELATIVE_DLLPLT 0
lazy binding Currently tcc does not use lazy binding. It puts all relocations in the RELX section and solve them all at startup. This was not working on bsd. tcc.h: - New RELPLT_SECTION_FMT for plt relocations - New entry relocplt in struct Section tccelf.c: - put_elf_reloca: put R_JMP_SLOT in relocplt section - build_got_entries*: Use two passes because R_JMP_SLOT and R_GLOB_DAT can not be intermixed on some targets (arm, arm64) - layout_sections: Calculate correct size relocplt section for DT_ values. Make sure relocplt is last - fill_dynamic: Add DT_ values when got is filled move DT_VERSYM because dynamic linker cannot handle it standone - Add note section for NetBSD arm-link.c/arm64-link.c/i386-link.c/riscv64-link.c/x86_64-link.c: - fill got table with pointer to plt section or symbol value in case of TCC_OUTPUT_MEMORY arm-link.c/arm64-link.c: - fix offset first plt entry i386-link.c/x86_64-link.c: - use correct reloc entry - use relofs - sizeof (ElfW_Rel) because the reloc is already done lib/bcheck.c: - no __libc_freeres on FreeBSD and NetBSD tests/Makefile: - Add -fno-stack-protector for OpenBSD tests/tests2/Makefile: - disable 106_pthread/114_bound_signal
2020-12-18 14:24:32 +00:00
#define RELOCATE_DLLPLT 1
Do section relocation in architecture backend
2016-11-12 15:16:06 +00:00
Fix relocs_info declaration in tcc.h C standard specifies that array should be declared with a non null size or with * for standard array. Declaration of relocs_info in tcc.h was not respecting this rule. This commit add a R_NUM macro that maps to the R_<ARCH>_NUM macros and declare relocs_info using it. This commit also moves all linker-related macros from <arch>-gen.c files to <arch>-link.c ones.
2016-12-05 20:40:59 +00:00
#else /* !TARGET_DEFS_ONLY */
#include "tcc.h"
versym cleanup get rid of some globals, in the first place. Also, for the PE target, ifdef out ELF executable creation.
2019-12-09 19:32:13 +00:00
#ifndef ELF_OBJ_ONLY
Use functions to get relocation info MSVC does not support array designator so cannot compile source using relocs_info. This commit replace the relocs_info array into a set of functions, each returning the value given by a given field of the struct reloc_info.
2016-12-10 17:22:08 +00:00
/* Returns 1 for a code relocation, 0 for a data relocation. For unknown
relocations, returns -1. */
int code_reloc (int reloc_type)
{
switch (reloc_type) {
tccelf: some linker cleanup - generate and use SYM@PLT for plt addresses - get rid of patch_dynsym_undef hack (no idea what it did on FreeBSD) - use sym_attrs instead of symtab_to_dynsym - special case for function pointers into .so on i386 - libtcc_test: test tcc_add_symbol with data object - move target specicic code to *-link.c files - add R_XXX_RELATIVE (needed for PE)
2016-12-15 16:01:22 +00:00
case R_386_RELATIVE:
Use functions to get relocation info MSVC does not support array designator so cannot compile source using relocs_info. This commit replace the relocs_info array into a set of functions, each returning the value given by a given field of the struct reloc_info.
2016-12-10 17:22:08 +00:00
case R_386_16:
case R_386_32:
case R_386_GOTPC:
case R_386_GOTOFF:
case R_386_GOT32:
case R_386_GOT32X:
case R_386_GLOB_DAT:
case R_386_COPY:
Fix boundschecking for signal/sigaction/fork The BOUNDS_CHECKING_ON/BOUNDS_CHECKING_OFF is not working for signal/sigaction/fork. The reason is that the code stops bound checking for the whole application. This result in wrong handling of __bound_local_new/__bound_local_delete and malloc/calloc/realloc/free. Consider the following code: void tst(int n) { int i, arr[n]; for (i = 0; i < n; i++) arr[i] = 0; } void *some_thread(void *dummy) { while (running) { tst(10); tst(20); } } void signal_handler(int sig) { ... } When the signal handler is called the some_thread code can be interrupted when is just registered the arr[10] data. When the signal handler is leaved the arr[10] is still registered and did not see the call to deregister arr[10] and then register arr[20]. The code resumes when tst(20) is running. This results in a bound checking error when i >= 10. To solve the above problem I changed the bound checking code to use tls (thread local storage) for the no_checking variable. This also makes it now possible to redirect signal/sigaction/fork code through the bound checking library and disable checking when a signal is running and to correct the bounds_sem for the fork child process. The BOUNDS_CHECKING_ON/BOUNDS_CHECKING_OFF is not needed any more for signal/sigaction/fork. In fact I could remove them from all my applications. The use of the tls function code slows down the code by about 10%. So if the slowdown due to bound checking was 5. It is now 5.5 times slower. For x86_64/i386 I also allowed to use __thread variable in bcheck.c when compiled with gcc with: make x86_64-libtcc1-usegcc=yes make i386-libtcc1-usegcc=yes This makes code run faster due to use of gcc and __thread variable. With the __thread variable there is no 10% slowdown. For other targets this does not work because stabs is not supported. Changes: lib/bcheck.c: - Add TRY_SEM - Add HAVE_SIGNAL/HAVE_SIGACTION/HAVE_FORK/HAVE_TLS_FUNC/HAVE_TLS_VAR - HAVE_SIGNAL: redirect signal() call if set. - HAVE_SIGACTION: redirect sigaction() call if set. - HAVE_FORK: redirect fork() call if set. - HAVE_TLS_FUNC: If target has tls function calls. - HAVE_TLS_VAR: If target has __thread tls support. - Replace all no_checking refecrences to NO_CHECKING_SET/NO_CHECKING_GET macros tcc-doc.texi: - Remove examples for signal/sigaction/fork code. - Add some explanation for signal/sigaction/fork code. - Add documentaion for __bounds_checking(). tccelf.c: - Add support for SHF_TLS tests/tests2/114_bound_signal.c: - Remove BOUNDS_CHECKING_ON/BOUNDS_CHECKING_OFF - Add code to trigger failure when tls is not working. x86_64-link.c: - Add support for R_X86_64_TLSGD/R_X86_64_TLSLD/R_X86_64_DTPOFF32/R_X86_64_TPOFF32 i386-link.c: - Add support for R_386_TLS_GD/R_386_TLS_LDM/R_386_TLS_LDO_32/R_386_TLS_LE
2020-09-08 12:31:58 +00:00
case R_386_TLS_GD:
case R_386_TLS_LDM:
case R_386_TLS_LDO_32:
case R_386_TLS_LE:
Use functions to get relocation info MSVC does not support array designator so cannot compile source using relocs_info. This commit replace the relocs_info array into a set of functions, each returning the value given by a given field of the struct reloc_info.
2016-12-10 17:22:08 +00:00
return 0;
case R_386_PC16:
case R_386_PC32:
case R_386_PLT32:
case R_386_JMP_SLOT:
return 1;
}
return -1;
}
Spelling fixes in C comments only
2017-05-08 04:38:09 +00:00
/* Returns an enumerator to describe whether and when the relocation needs a
Use functions to get relocation info MSVC does not support array designator so cannot compile source using relocs_info. This commit replace the relocs_info array into a set of functions, each returning the value given by a given field of the struct reloc_info.
2016-12-10 17:22:08 +00:00
GOT and/or PLT entry to be created. See tcc.h for a description of the
different values. */
int gotplt_entry_type (int reloc_type)
{
switch (reloc_type) {
tccelf: some linker cleanup - generate and use SYM@PLT for plt addresses - get rid of patch_dynsym_undef hack (no idea what it did on FreeBSD) - use sym_attrs instead of symtab_to_dynsym - special case for function pointers into .so on i386 - libtcc_test: test tcc_add_symbol with data object - move target specicic code to *-link.c files - add R_XXX_RELATIVE (needed for PE)
2016-12-15 16:01:22 +00:00
case R_386_RELATIVE:
Use functions to get relocation info MSVC does not support array designator so cannot compile source using relocs_info. This commit replace the relocs_info array into a set of functions, each returning the value given by a given field of the struct reloc_info.
2016-12-10 17:22:08 +00:00
case R_386_16:
case R_386_GLOB_DAT:
case R_386_JMP_SLOT:
case R_386_COPY:
return NO_GOTPLT_ENTRY;
Fix gawk miscompile See testcase. Function pointer use was hosed when the destination function wasn't also called normally by the program.
2016-12-18 04:18:19 +00:00
case R_386_32:
/* This relocations shouldn't normally need GOT or PLT
slots if it weren't for simplicity in the code generator.
See our caller for comments. */
return AUTO_GOTPLT_ENTRY;
Use functions to get relocation info MSVC does not support array designator so cannot compile source using relocs_info. This commit replace the relocs_info array into a set of functions, each returning the value given by a given field of the struct reloc_info.
2016-12-10 17:22:08 +00:00
case R_386_PC16:
case R_386_PC32:
return AUTO_GOTPLT_ENTRY;
case R_386_GOTPC:
case R_386_GOTOFF:
return BUILD_GOT_ONLY;
case R_386_GOT32:
case R_386_GOT32X:
case R_386_PLT32:
Fix boundschecking for signal/sigaction/fork The BOUNDS_CHECKING_ON/BOUNDS_CHECKING_OFF is not working for signal/sigaction/fork. The reason is that the code stops bound checking for the whole application. This result in wrong handling of __bound_local_new/__bound_local_delete and malloc/calloc/realloc/free. Consider the following code: void tst(int n) { int i, arr[n]; for (i = 0; i < n; i++) arr[i] = 0; } void *some_thread(void *dummy) { while (running) { tst(10); tst(20); } } void signal_handler(int sig) { ... } When the signal handler is called the some_thread code can be interrupted when is just registered the arr[10] data. When the signal handler is leaved the arr[10] is still registered and did not see the call to deregister arr[10] and then register arr[20]. The code resumes when tst(20) is running. This results in a bound checking error when i >= 10. To solve the above problem I changed the bound checking code to use tls (thread local storage) for the no_checking variable. This also makes it now possible to redirect signal/sigaction/fork code through the bound checking library and disable checking when a signal is running and to correct the bounds_sem for the fork child process. The BOUNDS_CHECKING_ON/BOUNDS_CHECKING_OFF is not needed any more for signal/sigaction/fork. In fact I could remove them from all my applications. The use of the tls function code slows down the code by about 10%. So if the slowdown due to bound checking was 5. It is now 5.5 times slower. For x86_64/i386 I also allowed to use __thread variable in bcheck.c when compiled with gcc with: make x86_64-libtcc1-usegcc=yes make i386-libtcc1-usegcc=yes This makes code run faster due to use of gcc and __thread variable. With the __thread variable there is no 10% slowdown. For other targets this does not work because stabs is not supported. Changes: lib/bcheck.c: - Add TRY_SEM - Add HAVE_SIGNAL/HAVE_SIGACTION/HAVE_FORK/HAVE_TLS_FUNC/HAVE_TLS_VAR - HAVE_SIGNAL: redirect signal() call if set. - HAVE_SIGACTION: redirect sigaction() call if set. - HAVE_FORK: redirect fork() call if set. - HAVE_TLS_FUNC: If target has tls function calls. - HAVE_TLS_VAR: If target has __thread tls support. - Replace all no_checking refecrences to NO_CHECKING_SET/NO_CHECKING_GET macros tcc-doc.texi: - Remove examples for signal/sigaction/fork code. - Add some explanation for signal/sigaction/fork code. - Add documentaion for __bounds_checking(). tccelf.c: - Add support for SHF_TLS tests/tests2/114_bound_signal.c: - Remove BOUNDS_CHECKING_ON/BOUNDS_CHECKING_OFF - Add code to trigger failure when tls is not working. x86_64-link.c: - Add support for R_X86_64_TLSGD/R_X86_64_TLSLD/R_X86_64_DTPOFF32/R_X86_64_TPOFF32 i386-link.c: - Add support for R_386_TLS_GD/R_386_TLS_LDM/R_386_TLS_LDO_32/R_386_TLS_LE
2020-09-08 12:31:58 +00:00
case R_386_TLS_GD:
case R_386_TLS_LDM:
case R_386_TLS_LDO_32:
case R_386_TLS_LE:
Use functions to get relocation info MSVC does not support array designator so cannot compile source using relocs_info. This commit replace the relocs_info array into a set of functions, each returning the value given by a given field of the struct reloc_info.
2016-12-10 17:22:08 +00:00
return ALWAYS_GOTPLT_ENTRY;
}
return -1;
}
Revert "Move almost all global variables to TCCState, actually all tests pass on Ubuntu 18.04 x86_64" This reverts commit af686a796bda94dc92fc3ad140ef438dafa08950.
2021-10-22 05:39:54 +00:00
ST_FUNC unsigned create_plt_entry(TCCState *s1, unsigned got_offset, struct sym_attr *attr)
tccelf: some linker cleanup - generate and use SYM@PLT for plt addresses - get rid of patch_dynsym_undef hack (no idea what it did on FreeBSD) - use sym_attrs instead of symtab_to_dynsym - special case for function pointers into .so on i386 - libtcc_test: test tcc_add_symbol with data object - move target specicic code to *-link.c files - add R_XXX_RELATIVE (needed for PE)
2016-12-15 16:01:22 +00:00
{
Revert "Move almost all global variables to TCCState, actually all tests pass on Ubuntu 18.04 x86_64" This reverts commit af686a796bda94dc92fc3ad140ef438dafa08950.
2021-10-22 05:39:54 +00:00
Section *plt = s1->plt;
tccelf: some linker cleanup - generate and use SYM@PLT for plt addresses - get rid of patch_dynsym_undef hack (no idea what it did on FreeBSD) - use sym_attrs instead of symtab_to_dynsym - special case for function pointers into .so on i386 - libtcc_test: test tcc_add_symbol with data object - move target specicic code to *-link.c files - add R_XXX_RELATIVE (needed for PE)
2016-12-15 16:01:22 +00:00
uint8_t *p;
int modrm;
unsigned plt_offset, relofs;
/* on i386 if we build a DLL, we add a %ebx offset */
Revert "Move almost all global variables to TCCState, actually all tests pass on Ubuntu 18.04 x86_64" This reverts commit af686a796bda94dc92fc3ad140ef438dafa08950.
2021-10-22 05:39:54 +00:00
if (s1->output_type == TCC_OUTPUT_DLL)
tccelf: some linker cleanup - generate and use SYM@PLT for plt addresses - get rid of patch_dynsym_undef hack (no idea what it did on FreeBSD) - use sym_attrs instead of symtab_to_dynsym - special case for function pointers into .so on i386 - libtcc_test: test tcc_add_symbol with data object - move target specicic code to *-link.c files - add R_XXX_RELATIVE (needed for PE)
2016-12-15 16:01:22 +00:00
modrm = 0xa3;
else
modrm = 0x25;
Spelling fixes in C comments only
2017-05-08 04:38:09 +00:00
/* empty PLT: create PLT0 entry that pushes the library identifier
tccelf: some linker cleanup - generate and use SYM@PLT for plt addresses - get rid of patch_dynsym_undef hack (no idea what it did on FreeBSD) - use sym_attrs instead of symtab_to_dynsym - special case for function pointers into .so on i386 - libtcc_test: test tcc_add_symbol with data object - move target specicic code to *-link.c files - add R_XXX_RELATIVE (needed for PE)
2016-12-15 16:01:22 +00:00
(GOT + PTR_SIZE) and jumps to ld.so resolution routine
(GOT + 2 * PTR_SIZE) */
if (plt->data_offset == 0) {
Revert "Move almost all global variables to TCCState, actually all tests pass on Ubuntu 18.04 x86_64" This reverts commit af686a796bda94dc92fc3ad140ef438dafa08950.
2021-10-22 05:39:54 +00:00
p = section_ptr_add(plt, 16);
tccelf: some linker cleanup - generate and use SYM@PLT for plt addresses - get rid of patch_dynsym_undef hack (no idea what it did on FreeBSD) - use sym_attrs instead of symtab_to_dynsym - special case for function pointers into .so on i386 - libtcc_test: test tcc_add_symbol with data object - move target specicic code to *-link.c files - add R_XXX_RELATIVE (needed for PE)
2016-12-15 16:01:22 +00:00
p[0] = 0xff; /* pushl got + PTR_SIZE */
p[1] = modrm + 0x10;
write32le(p + 2, PTR_SIZE);
p[6] = 0xff; /* jmp *(got + PTR_SIZE * 2) */
p[7] = modrm;
write32le(p + 8, PTR_SIZE * 2);
}
plt_offset = plt->data_offset;
/* The PLT slot refers to the relocation entry it needs via offset.
The reloc entry is created below, so its offset is the current
data_offset */
Revert "Move almost all global variables to TCCState, actually all tests pass on Ubuntu 18.04 x86_64" This reverts commit af686a796bda94dc92fc3ad140ef438dafa08950.
2021-10-22 05:39:54 +00:00
relofs = s1->plt->reloc ? s1->plt->reloc->data_offset : 0;
tccelf: some linker cleanup - generate and use SYM@PLT for plt addresses - get rid of patch_dynsym_undef hack (no idea what it did on FreeBSD) - use sym_attrs instead of symtab_to_dynsym - special case for function pointers into .so on i386 - libtcc_test: test tcc_add_symbol with data object - move target specicic code to *-link.c files - add R_XXX_RELATIVE (needed for PE)
2016-12-15 16:01:22 +00:00
/* Jump to GOT entry where ld.so initially put the address of ip + 4 */
Revert "Move almost all global variables to TCCState, actually all tests pass on Ubuntu 18.04 x86_64" This reverts commit af686a796bda94dc92fc3ad140ef438dafa08950.
2021-10-22 05:39:54 +00:00
p = section_ptr_add(plt, 16);
tccelf: some linker cleanup - generate and use SYM@PLT for plt addresses - get rid of patch_dynsym_undef hack (no idea what it did on FreeBSD) - use sym_attrs instead of symtab_to_dynsym - special case for function pointers into .so on i386 - libtcc_test: test tcc_add_symbol with data object - move target specicic code to *-link.c files - add R_XXX_RELATIVE (needed for PE)
2016-12-15 16:01:22 +00:00
p[0] = 0xff; /* jmp *(got + x) */
p[1] = modrm;
write32le(p + 2, got_offset);
p[6] = 0x68; /* push $xxx */
lazy binding Currently tcc does not use lazy binding. It puts all relocations in the RELX section and solve them all at startup. This was not working on bsd. tcc.h: - New RELPLT_SECTION_FMT for plt relocations - New entry relocplt in struct Section tccelf.c: - put_elf_reloca: put R_JMP_SLOT in relocplt section - build_got_entries*: Use two passes because R_JMP_SLOT and R_GLOB_DAT can not be intermixed on some targets (arm, arm64) - layout_sections: Calculate correct size relocplt section for DT_ values. Make sure relocplt is last - fill_dynamic: Add DT_ values when got is filled move DT_VERSYM because dynamic linker cannot handle it standone - Add note section for NetBSD arm-link.c/arm64-link.c/i386-link.c/riscv64-link.c/x86_64-link.c: - fill got table with pointer to plt section or symbol value in case of TCC_OUTPUT_MEMORY arm-link.c/arm64-link.c: - fix offset first plt entry i386-link.c/x86_64-link.c: - use correct reloc entry - use relofs - sizeof (ElfW_Rel) because the reloc is already done lib/bcheck.c: - no __libc_freeres on FreeBSD and NetBSD tests/Makefile: - Add -fno-stack-protector for OpenBSD tests/tests2/Makefile: - disable 106_pthread/114_bound_signal
2020-12-18 14:24:32 +00:00
write32le(p + 7, relofs - sizeof (ElfW_Rel));
tccelf: some linker cleanup - generate and use SYM@PLT for plt addresses - get rid of patch_dynsym_undef hack (no idea what it did on FreeBSD) - use sym_attrs instead of symtab_to_dynsym - special case for function pointers into .so on i386 - libtcc_test: test tcc_add_symbol with data object - move target specicic code to *-link.c files - add R_XXX_RELATIVE (needed for PE)
2016-12-15 16:01:22 +00:00
p[11] = 0xe9; /* jmp plt_start */
write32le(p + 12, -(plt->data_offset));
return plt_offset;
}
/* relocate the PLT: compute addresses and offsets in the PLT now that final
address for PLT and GOT are known (see fill_program_header) */
Revert "Move almost all global variables to TCCState, actually all tests pass on Ubuntu 18.04 x86_64" This reverts commit af686a796bda94dc92fc3ad140ef438dafa08950.
2021-10-22 05:39:54 +00:00
ST_FUNC void relocate_plt(TCCState *s1)
tccelf: some linker cleanup - generate and use SYM@PLT for plt addresses - get rid of patch_dynsym_undef hack (no idea what it did on FreeBSD) - use sym_attrs instead of symtab_to_dynsym - special case for function pointers into .so on i386 - libtcc_test: test tcc_add_symbol with data object - move target specicic code to *-link.c files - add R_XXX_RELATIVE (needed for PE)
2016-12-15 16:01:22 +00:00
{
uint8_t *p, *p_end;
Revert "Move almost all global variables to TCCState, actually all tests pass on Ubuntu 18.04 x86_64" This reverts commit af686a796bda94dc92fc3ad140ef438dafa08950.
2021-10-22 05:39:54 +00:00
if (!s1->plt)
tccelf: some linker cleanup - generate and use SYM@PLT for plt addresses - get rid of patch_dynsym_undef hack (no idea what it did on FreeBSD) - use sym_attrs instead of symtab_to_dynsym - special case for function pointers into .so on i386 - libtcc_test: test tcc_add_symbol with data object - move target specicic code to *-link.c files - add R_XXX_RELATIVE (needed for PE)
2016-12-15 16:01:22 +00:00
return;
Revert "Move almost all global variables to TCCState, actually all tests pass on Ubuntu 18.04 x86_64" This reverts commit af686a796bda94dc92fc3ad140ef438dafa08950.
2021-10-22 05:39:54 +00:00
p = s1->plt->data;
p_end = p + s1->plt->data_offset;
tccelf: some linker cleanup - generate and use SYM@PLT for plt addresses - get rid of patch_dynsym_undef hack (no idea what it did on FreeBSD) - use sym_attrs instead of symtab_to_dynsym - special case for function pointers into .so on i386 - libtcc_test: test tcc_add_symbol with data object - move target specicic code to *-link.c files - add R_XXX_RELATIVE (needed for PE)
2016-12-15 16:01:22 +00:00
Revert "Move almost all global variables to TCCState, actually all tests pass on Ubuntu 18.04 x86_64" This reverts commit af686a796bda94dc92fc3ad140ef438dafa08950.
2021-10-22 05:39:54 +00:00
if (s1->output_type != TCC_OUTPUT_DLL && p < p_end) {
add32le(p + 2, s1->got->sh_addr);
add32le(p + 8, s1->got->sh_addr);
tccelf: some linker cleanup - generate and use SYM@PLT for plt addresses - get rid of patch_dynsym_undef hack (no idea what it did on FreeBSD) - use sym_attrs instead of symtab_to_dynsym - special case for function pointers into .so on i386 - libtcc_test: test tcc_add_symbol with data object - move target specicic code to *-link.c files - add R_XXX_RELATIVE (needed for PE)
2016-12-15 16:01:22 +00:00
p += 16;
while (p < p_end) {
Revert "Move almost all global variables to TCCState, actually all tests pass on Ubuntu 18.04 x86_64" This reverts commit af686a796bda94dc92fc3ad140ef438dafa08950.
2021-10-22 05:39:54 +00:00
add32le(p + 2, s1->got->sh_addr);
tccelf: some linker cleanup - generate and use SYM@PLT for plt addresses - get rid of patch_dynsym_undef hack (no idea what it did on FreeBSD) - use sym_attrs instead of symtab_to_dynsym - special case for function pointers into .so on i386 - libtcc_test: test tcc_add_symbol with data object - move target specicic code to *-link.c files - add R_XXX_RELATIVE (needed for PE)
2016-12-15 16:01:22 +00:00
p += 16;
}
}
lazy binding Currently tcc does not use lazy binding. It puts all relocations in the RELX section and solve them all at startup. This was not working on bsd. tcc.h: - New RELPLT_SECTION_FMT for plt relocations - New entry relocplt in struct Section tccelf.c: - put_elf_reloca: put R_JMP_SLOT in relocplt section - build_got_entries*: Use two passes because R_JMP_SLOT and R_GLOB_DAT can not be intermixed on some targets (arm, arm64) - layout_sections: Calculate correct size relocplt section for DT_ values. Make sure relocplt is last - fill_dynamic: Add DT_ values when got is filled move DT_VERSYM because dynamic linker cannot handle it standone - Add note section for NetBSD arm-link.c/arm64-link.c/i386-link.c/riscv64-link.c/x86_64-link.c: - fill got table with pointer to plt section or symbol value in case of TCC_OUTPUT_MEMORY arm-link.c/arm64-link.c: - fix offset first plt entry i386-link.c/x86_64-link.c: - use correct reloc entry - use relofs - sizeof (ElfW_Rel) because the reloc is already done lib/bcheck.c: - no __libc_freeres on FreeBSD and NetBSD tests/Makefile: - Add -fno-stack-protector for OpenBSD tests/tests2/Makefile: - disable 106_pthread/114_bound_signal
2020-12-18 14:24:32 +00:00
Revert "Move almost all global variables to TCCState, actually all tests pass on Ubuntu 18.04 x86_64" This reverts commit af686a796bda94dc92fc3ad140ef438dafa08950.
2021-10-22 05:39:54 +00:00
if (s1->plt->reloc) {
lazy binding Currently tcc does not use lazy binding. It puts all relocations in the RELX section and solve them all at startup. This was not working on bsd. tcc.h: - New RELPLT_SECTION_FMT for plt relocations - New entry relocplt in struct Section tccelf.c: - put_elf_reloca: put R_JMP_SLOT in relocplt section - build_got_entries*: Use two passes because R_JMP_SLOT and R_GLOB_DAT can not be intermixed on some targets (arm, arm64) - layout_sections: Calculate correct size relocplt section for DT_ values. Make sure relocplt is last - fill_dynamic: Add DT_ values when got is filled move DT_VERSYM because dynamic linker cannot handle it standone - Add note section for NetBSD arm-link.c/arm64-link.c/i386-link.c/riscv64-link.c/x86_64-link.c: - fill got table with pointer to plt section or symbol value in case of TCC_OUTPUT_MEMORY arm-link.c/arm64-link.c: - fix offset first plt entry i386-link.c/x86_64-link.c: - use correct reloc entry - use relofs - sizeof (ElfW_Rel) because the reloc is already done lib/bcheck.c: - no __libc_freeres on FreeBSD and NetBSD tests/Makefile: - Add -fno-stack-protector for OpenBSD tests/tests2/Makefile: - disable 106_pthread/114_bound_signal
2020-12-18 14:24:32 +00:00
ElfW_Rel *rel;
Revert "Move almost all global variables to TCCState, actually all tests pass on Ubuntu 18.04 x86_64" This reverts commit af686a796bda94dc92fc3ad140ef438dafa08950.
2021-10-22 05:39:54 +00:00
int x = s1->plt->sh_addr + 16 + 6;
p = s1->got->data;
for_each_elem(s1->plt->reloc, 0, rel, ElfW_Rel) {
tccelf: use plt-reloc instead of relocplt
2021-01-28 13:20:05 +00:00
write32le(p + rel->r_offset, x);
lazy binding Currently tcc does not use lazy binding. It puts all relocations in the RELX section and solve them all at startup. This was not working on bsd. tcc.h: - New RELPLT_SECTION_FMT for plt relocations - New entry relocplt in struct Section tccelf.c: - put_elf_reloca: put R_JMP_SLOT in relocplt section - build_got_entries*: Use two passes because R_JMP_SLOT and R_GLOB_DAT can not be intermixed on some targets (arm, arm64) - layout_sections: Calculate correct size relocplt section for DT_ values. Make sure relocplt is last - fill_dynamic: Add DT_ values when got is filled move DT_VERSYM because dynamic linker cannot handle it standone - Add note section for NetBSD arm-link.c/arm64-link.c/i386-link.c/riscv64-link.c/x86_64-link.c: - fill got table with pointer to plt section or symbol value in case of TCC_OUTPUT_MEMORY arm-link.c/arm64-link.c: - fix offset first plt entry i386-link.c/x86_64-link.c: - use correct reloc entry - use relofs - sizeof (ElfW_Rel) because the reloc is already done lib/bcheck.c: - no __libc_freeres on FreeBSD and NetBSD tests/Makefile: - Add -fno-stack-protector for OpenBSD tests/tests2/Makefile: - disable 106_pthread/114_bound_signal
2020-12-18 14:24:32 +00:00
x += 16;
}
}
tccelf: some linker cleanup - generate and use SYM@PLT for plt addresses - get rid of patch_dynsym_undef hack (no idea what it did on FreeBSD) - use sym_attrs instead of symtab_to_dynsym - special case for function pointers into .so on i386 - libtcc_test: test tcc_add_symbol with data object - move target specicic code to *-link.c files - add R_XXX_RELATIVE (needed for PE)
2016-12-15 16:01:22 +00:00
}
versym cleanup get rid of some globals, in the first place. Also, for the PE target, ifdef out ELF executable creation.
2019-12-09 19:32:13 +00:00
#endif
riscv: Handle some usual relocs this is enough to let me link a tcctest.c compiled by GCC using some current debian sid riscv64 system. It needs linking against libgcc.a for various floating point TFmode routines. The result runs.
2019-06-23 00:10:10 +00:00
Revert "Move almost all global variables to TCCState, actually all tests pass on Ubuntu 18.04 x86_64" This reverts commit af686a796bda94dc92fc3ad140ef438dafa08950.
2021-10-22 05:39:54 +00:00
void relocate(TCCState *s1, ElfW_Rel *rel, int type, unsigned char *ptr, addr_t addr, addr_t val)
Do section relocation in architecture backend
2016-11-12 15:16:06 +00:00
{
int sym_index, esym_index;
sym_index = ELFW(R_SYM)(rel->r_info);
switch (type) {
case R_386_32:
Revert "Move almost all global variables to TCCState, actually all tests pass on Ubuntu 18.04 x86_64" This reverts commit af686a796bda94dc92fc3ad140ef438dafa08950.
2021-10-22 05:39:54 +00:00
if (s1->output_type == TCC_OUTPUT_DLL) {
esym_index = get_sym_attr(s1, sym_index, 0)->dyn_index;
Do section relocation in architecture backend
2016-11-12 15:16:06 +00:00
qrel->r_offset = rel->r_offset;
if (esym_index) {
qrel->r_info = ELFW(R_INFO)(esym_index, R_386_32);
qrel++;
return;
} else {
qrel->r_info = ELFW(R_INFO)(0, R_386_RELATIVE);
qrel++;
}
}
add32le(ptr, val);
return;
case R_386_PC32:
Revert "Move almost all global variables to TCCState, actually all tests pass on Ubuntu 18.04 x86_64" This reverts commit af686a796bda94dc92fc3ad140ef438dafa08950.
2021-10-22 05:39:54 +00:00
if (s1->output_type == TCC_OUTPUT_DLL) {
Do section relocation in architecture backend
2016-11-12 15:16:06 +00:00
/* DLL relocation */
Revert "Move almost all global variables to TCCState, actually all tests pass on Ubuntu 18.04 x86_64" This reverts commit af686a796bda94dc92fc3ad140ef438dafa08950.
2021-10-22 05:39:54 +00:00
esym_index = get_sym_attr(s1, sym_index, 0)->dyn_index;
Do section relocation in architecture backend
2016-11-12 15:16:06 +00:00
if (esym_index) {
qrel->r_offset = rel->r_offset;
qrel->r_info = ELFW(R_INFO)(esym_index, R_386_PC32);
qrel++;
return;
}
}
add32le(ptr, val - addr);
return;
case R_386_PLT32:
add32le(ptr, val - addr);
return;
case R_386_GLOB_DAT:
case R_386_JMP_SLOT:
write32le(ptr, val);
return;
case R_386_GOTPC:
Revert "Move almost all global variables to TCCState, actually all tests pass on Ubuntu 18.04 x86_64" This reverts commit af686a796bda94dc92fc3ad140ef438dafa08950.
2021-10-22 05:39:54 +00:00
add32le(ptr, s1->got->sh_addr - addr);
Do section relocation in architecture backend
2016-11-12 15:16:06 +00:00
return;
case R_386_GOTOFF:
Revert "Move almost all global variables to TCCState, actually all tests pass on Ubuntu 18.04 x86_64" This reverts commit af686a796bda94dc92fc3ad140ef438dafa08950.
2021-10-22 05:39:54 +00:00
add32le(ptr, val - s1->got->sh_addr);
Do section relocation in architecture backend
2016-11-12 15:16:06 +00:00
return;
case R_386_GOT32:
case R_386_GOT32X:
/* we load the got offset */
Revert "Move almost all global variables to TCCState, actually all tests pass on Ubuntu 18.04 x86_64" This reverts commit af686a796bda94dc92fc3ad140ef438dafa08950.
2021-10-22 05:39:54 +00:00
add32le(ptr, get_sym_attr(s1, sym_index, 0)->got_offset);
Do section relocation in architecture backend
2016-11-12 15:16:06 +00:00
return;
case R_386_16:
Revert "Move almost all global variables to TCCState, actually all tests pass on Ubuntu 18.04 x86_64" This reverts commit af686a796bda94dc92fc3ad140ef438dafa08950.
2021-10-22 05:39:54 +00:00
if (s1->output_format != TCC_OUTPUT_FORMAT_BINARY) {
Do section relocation in architecture backend
2016-11-12 15:16:06 +00:00
output_file:
Revert "Move almost all global variables to TCCState, actually all tests pass on Ubuntu 18.04 x86_64" This reverts commit af686a796bda94dc92fc3ad140ef438dafa08950.
2021-10-22 05:39:54 +00:00
tcc_error("can only produce 16-bit binary files");
Do section relocation in architecture backend
2016-11-12 15:16:06 +00:00
}
write16le(ptr, read16le(ptr) + val);
return;
case R_386_PC16:
Revert "Move almost all global variables to TCCState, actually all tests pass on Ubuntu 18.04 x86_64" This reverts commit af686a796bda94dc92fc3ad140ef438dafa08950.
2021-10-22 05:39:54 +00:00
if (s1->output_format != TCC_OUTPUT_FORMAT_BINARY)
Do section relocation in architecture backend
2016-11-12 15:16:06 +00:00
goto output_file;
write16le(ptr, read16le(ptr) + val - addr);
return;
case R_386_RELATIVE:
final update for 0.9.27 tccgen.c: - fix ldouble asm hack - fix a VLA problem on Win64 (also x86_64-gen.c) - patch_type(): make sure that no symbol ever changes from global to static tcc.c: - tcc -vv: print libtcc1.a path also on win32 tccpe.c, tcctools.c: - use unix LF mode to for .def output files (that is for creating reproducible output trees) Makefile: - suppress some warnings when makeinfo is missing - call 'which install' only on win32 tests/Makefile: - change PATH only on WINNT systems (i.e. not if cross-compiling on linux for win32) - asm-c-connect.test: slim output and do diff tccrun.c tccpe.c *-link.c: - integrate former 'pe_relocate_rva()' into normal relocation This also fixes linkage of the unwind data on WIN64 for -run (reported by Janus Lynggaard Thorborg) tccasm.c, tests/tcctest.c: - fix dot (sym_index of -1 crashed in put_elf_reloc) - massage .set a bit (see test) other: - #define SECTION_ABS removed - ST_DATA Section *strtab_section: removed - put_extern_sym2(): take int section number Conflicts: tccelf.c tccpe.c Conflicts: tccelf.c
2017-12-12 16:57:20 +00:00
#ifdef TCC_TARGET_PE
Revert "Move almost all global variables to TCCState, actually all tests pass on Ubuntu 18.04 x86_64" This reverts commit af686a796bda94dc92fc3ad140ef438dafa08950.
2021-10-22 05:39:54 +00:00
add32le(ptr, val - s1->pe_imagebase);
final update for 0.9.27 tccgen.c: - fix ldouble asm hack - fix a VLA problem on Win64 (also x86_64-gen.c) - patch_type(): make sure that no symbol ever changes from global to static tcc.c: - tcc -vv: print libtcc1.a path also on win32 tccpe.c, tcctools.c: - use unix LF mode to for .def output files (that is for creating reproducible output trees) Makefile: - suppress some warnings when makeinfo is missing - call 'which install' only on win32 tests/Makefile: - change PATH only on WINNT systems (i.e. not if cross-compiling on linux for win32) - asm-c-connect.test: slim output and do diff tccrun.c tccpe.c *-link.c: - integrate former 'pe_relocate_rva()' into normal relocation This also fixes linkage of the unwind data on WIN64 for -run (reported by Janus Lynggaard Thorborg) tccasm.c, tests/tcctest.c: - fix dot (sym_index of -1 crashed in put_elf_reloc) - massage .set a bit (see test) other: - #define SECTION_ABS removed - ST_DATA Section *strtab_section: removed - put_extern_sym2(): take int section number Conflicts: tccelf.c tccpe.c Conflicts: tccelf.c
2017-12-12 16:57:20 +00:00
#endif
Do section relocation in architecture backend
2016-11-12 15:16:06 +00:00
/* do nothing */
return;
case R_386_COPY:
Spelling fixes in C comments only
2017-05-08 04:38:09 +00:00
/* This relocation must copy initialized data from the library
Do section relocation in architecture backend
2016-11-12 15:16:06 +00:00
to the program .bss segment. Currently made like for ARM
Spelling fixes in C comments only
2017-05-08 04:38:09 +00:00
(to remove noise of default case). Is this true?
Do section relocation in architecture backend
2016-11-12 15:16:06 +00:00
*/
return;
Fix boundschecking for signal/sigaction/fork The BOUNDS_CHECKING_ON/BOUNDS_CHECKING_OFF is not working for signal/sigaction/fork. The reason is that the code stops bound checking for the whole application. This result in wrong handling of __bound_local_new/__bound_local_delete and malloc/calloc/realloc/free. Consider the following code: void tst(int n) { int i, arr[n]; for (i = 0; i < n; i++) arr[i] = 0; } void *some_thread(void *dummy) { while (running) { tst(10); tst(20); } } void signal_handler(int sig) { ... } When the signal handler is called the some_thread code can be interrupted when is just registered the arr[10] data. When the signal handler is leaved the arr[10] is still registered and did not see the call to deregister arr[10] and then register arr[20]. The code resumes when tst(20) is running. This results in a bound checking error when i >= 10. To solve the above problem I changed the bound checking code to use tls (thread local storage) for the no_checking variable. This also makes it now possible to redirect signal/sigaction/fork code through the bound checking library and disable checking when a signal is running and to correct the bounds_sem for the fork child process. The BOUNDS_CHECKING_ON/BOUNDS_CHECKING_OFF is not needed any more for signal/sigaction/fork. In fact I could remove them from all my applications. The use of the tls function code slows down the code by about 10%. So if the slowdown due to bound checking was 5. It is now 5.5 times slower. For x86_64/i386 I also allowed to use __thread variable in bcheck.c when compiled with gcc with: make x86_64-libtcc1-usegcc=yes make i386-libtcc1-usegcc=yes This makes code run faster due to use of gcc and __thread variable. With the __thread variable there is no 10% slowdown. For other targets this does not work because stabs is not supported. Changes: lib/bcheck.c: - Add TRY_SEM - Add HAVE_SIGNAL/HAVE_SIGACTION/HAVE_FORK/HAVE_TLS_FUNC/HAVE_TLS_VAR - HAVE_SIGNAL: redirect signal() call if set. - HAVE_SIGACTION: redirect sigaction() call if set. - HAVE_FORK: redirect fork() call if set. - HAVE_TLS_FUNC: If target has tls function calls. - HAVE_TLS_VAR: If target has __thread tls support. - Replace all no_checking refecrences to NO_CHECKING_SET/NO_CHECKING_GET macros tcc-doc.texi: - Remove examples for signal/sigaction/fork code. - Add some explanation for signal/sigaction/fork code. - Add documentaion for __bounds_checking(). tccelf.c: - Add support for SHF_TLS tests/tests2/114_bound_signal.c: - Remove BOUNDS_CHECKING_ON/BOUNDS_CHECKING_OFF - Add code to trigger failure when tls is not working. x86_64-link.c: - Add support for R_X86_64_TLSGD/R_X86_64_TLSLD/R_X86_64_DTPOFF32/R_X86_64_TPOFF32 i386-link.c: - Add support for R_386_TLS_GD/R_386_TLS_LDM/R_386_TLS_LDO_32/R_386_TLS_LE
2020-09-08 12:31:58 +00:00
case R_386_TLS_GD:
{
static const unsigned char expect[] = {
/* lea 0(,%ebx,1),%eax */
0x8d, 0x04, 0x1d, 0x00, 0x00, 0x00, 0x00,
/* call __tls_get_addr@PLT */
0xe8, 0xfc, 0xff, 0xff, 0xff };
static const unsigned char replace[] = {
/* mov %gs:0,%eax */
0x65, 0xa1, 0x00, 0x00, 0x00, 0x00,
/* sub 0,%eax */
0x81, 0xe8, 0x00, 0x00, 0x00, 0x00 };
if (memcmp (ptr-3, expect, sizeof(expect)) == 0) {
ElfW(Sym) *sym;
Section *sec;
int32_t x;
memcpy(ptr-3, replace, sizeof(replace));
rel[1].r_info = ELFW(R_INFO)(0, R_386_NONE);
sym = &((ElfW(Sym) *)symtab_section->data)[sym_index];
Revert "Move almost all global variables to TCCState, actually all tests pass on Ubuntu 18.04 x86_64" This reverts commit af686a796bda94dc92fc3ad140ef438dafa08950.
2021-10-22 05:39:54 +00:00
sec = s1->sections[sym->st_shndx];
Fix boundschecking for signal/sigaction/fork The BOUNDS_CHECKING_ON/BOUNDS_CHECKING_OFF is not working for signal/sigaction/fork. The reason is that the code stops bound checking for the whole application. This result in wrong handling of __bound_local_new/__bound_local_delete and malloc/calloc/realloc/free. Consider the following code: void tst(int n) { int i, arr[n]; for (i = 0; i < n; i++) arr[i] = 0; } void *some_thread(void *dummy) { while (running) { tst(10); tst(20); } } void signal_handler(int sig) { ... } When the signal handler is called the some_thread code can be interrupted when is just registered the arr[10] data. When the signal handler is leaved the arr[10] is still registered and did not see the call to deregister arr[10] and then register arr[20]. The code resumes when tst(20) is running. This results in a bound checking error when i >= 10. To solve the above problem I changed the bound checking code to use tls (thread local storage) for the no_checking variable. This also makes it now possible to redirect signal/sigaction/fork code through the bound checking library and disable checking when a signal is running and to correct the bounds_sem for the fork child process. The BOUNDS_CHECKING_ON/BOUNDS_CHECKING_OFF is not needed any more for signal/sigaction/fork. In fact I could remove them from all my applications. The use of the tls function code slows down the code by about 10%. So if the slowdown due to bound checking was 5. It is now 5.5 times slower. For x86_64/i386 I also allowed to use __thread variable in bcheck.c when compiled with gcc with: make x86_64-libtcc1-usegcc=yes make i386-libtcc1-usegcc=yes This makes code run faster due to use of gcc and __thread variable. With the __thread variable there is no 10% slowdown. For other targets this does not work because stabs is not supported. Changes: lib/bcheck.c: - Add TRY_SEM - Add HAVE_SIGNAL/HAVE_SIGACTION/HAVE_FORK/HAVE_TLS_FUNC/HAVE_TLS_VAR - HAVE_SIGNAL: redirect signal() call if set. - HAVE_SIGACTION: redirect sigaction() call if set. - HAVE_FORK: redirect fork() call if set. - HAVE_TLS_FUNC: If target has tls function calls. - HAVE_TLS_VAR: If target has __thread tls support. - Replace all no_checking refecrences to NO_CHECKING_SET/NO_CHECKING_GET macros tcc-doc.texi: - Remove examples for signal/sigaction/fork code. - Add some explanation for signal/sigaction/fork code. - Add documentaion for __bounds_checking(). tccelf.c: - Add support for SHF_TLS tests/tests2/114_bound_signal.c: - Remove BOUNDS_CHECKING_ON/BOUNDS_CHECKING_OFF - Add code to trigger failure when tls is not working. x86_64-link.c: - Add support for R_X86_64_TLSGD/R_X86_64_TLSLD/R_X86_64_DTPOFF32/R_X86_64_TPOFF32 i386-link.c: - Add support for R_386_TLS_GD/R_386_TLS_LDM/R_386_TLS_LDO_32/R_386_TLS_LE
2020-09-08 12:31:58 +00:00
x = sym->st_value - sec->sh_addr - sec->data_offset;
add32le(ptr + 5, -x);
}
else
Revert "Move almost all global variables to TCCState, actually all tests pass on Ubuntu 18.04 x86_64" This reverts commit af686a796bda94dc92fc3ad140ef438dafa08950.
2021-10-22 05:39:54 +00:00
tcc_error("unexpected R_386_TLS_GD pattern");
Fix boundschecking for signal/sigaction/fork The BOUNDS_CHECKING_ON/BOUNDS_CHECKING_OFF is not working for signal/sigaction/fork. The reason is that the code stops bound checking for the whole application. This result in wrong handling of __bound_local_new/__bound_local_delete and malloc/calloc/realloc/free. Consider the following code: void tst(int n) { int i, arr[n]; for (i = 0; i < n; i++) arr[i] = 0; } void *some_thread(void *dummy) { while (running) { tst(10); tst(20); } } void signal_handler(int sig) { ... } When the signal handler is called the some_thread code can be interrupted when is just registered the arr[10] data. When the signal handler is leaved the arr[10] is still registered and did not see the call to deregister arr[10] and then register arr[20]. The code resumes when tst(20) is running. This results in a bound checking error when i >= 10. To solve the above problem I changed the bound checking code to use tls (thread local storage) for the no_checking variable. This also makes it now possible to redirect signal/sigaction/fork code through the bound checking library and disable checking when a signal is running and to correct the bounds_sem for the fork child process. The BOUNDS_CHECKING_ON/BOUNDS_CHECKING_OFF is not needed any more for signal/sigaction/fork. In fact I could remove them from all my applications. The use of the tls function code slows down the code by about 10%. So if the slowdown due to bound checking was 5. It is now 5.5 times slower. For x86_64/i386 I also allowed to use __thread variable in bcheck.c when compiled with gcc with: make x86_64-libtcc1-usegcc=yes make i386-libtcc1-usegcc=yes This makes code run faster due to use of gcc and __thread variable. With the __thread variable there is no 10% slowdown. For other targets this does not work because stabs is not supported. Changes: lib/bcheck.c: - Add TRY_SEM - Add HAVE_SIGNAL/HAVE_SIGACTION/HAVE_FORK/HAVE_TLS_FUNC/HAVE_TLS_VAR - HAVE_SIGNAL: redirect signal() call if set. - HAVE_SIGACTION: redirect sigaction() call if set. - HAVE_FORK: redirect fork() call if set. - HAVE_TLS_FUNC: If target has tls function calls. - HAVE_TLS_VAR: If target has __thread tls support. - Replace all no_checking refecrences to NO_CHECKING_SET/NO_CHECKING_GET macros tcc-doc.texi: - Remove examples for signal/sigaction/fork code. - Add some explanation for signal/sigaction/fork code. - Add documentaion for __bounds_checking(). tccelf.c: - Add support for SHF_TLS tests/tests2/114_bound_signal.c: - Remove BOUNDS_CHECKING_ON/BOUNDS_CHECKING_OFF - Add code to trigger failure when tls is not working. x86_64-link.c: - Add support for R_X86_64_TLSGD/R_X86_64_TLSLD/R_X86_64_DTPOFF32/R_X86_64_TPOFF32 i386-link.c: - Add support for R_386_TLS_GD/R_386_TLS_LDM/R_386_TLS_LDO_32/R_386_TLS_LE
2020-09-08 12:31:58 +00:00
}
return;
case R_386_TLS_LDM:
{
static const unsigned char expect[] = {
/* lea 0(%ebx),%eax */
0x8d, 0x83, 0x00, 0x00, 0x00, 0x00,
/* call __tls_get_addr@PLT */
0xe8, 0xfc, 0xff, 0xff, 0xff };
static const unsigned char replace[] = {
/* mov %gs:0,%eax */
0x65, 0xa1, 0x00, 0x00, 0x00, 0x00,
/* nop */
0x90,
/* lea 0(%esi,%eiz,1),%esi */
0x8d, 0x74, 0x26, 0x00 };
if (memcmp (ptr-2, expect, sizeof(expect)) == 0) {
memcpy(ptr-2, replace, sizeof(replace));
rel[1].r_info = ELFW(R_INFO)(0, R_386_NONE);
}
else
Revert "Move almost all global variables to TCCState, actually all tests pass on Ubuntu 18.04 x86_64" This reverts commit af686a796bda94dc92fc3ad140ef438dafa08950.
2021-10-22 05:39:54 +00:00
tcc_error("unexpected R_386_TLS_LDM pattern");
Fix boundschecking for signal/sigaction/fork The BOUNDS_CHECKING_ON/BOUNDS_CHECKING_OFF is not working for signal/sigaction/fork. The reason is that the code stops bound checking for the whole application. This result in wrong handling of __bound_local_new/__bound_local_delete and malloc/calloc/realloc/free. Consider the following code: void tst(int n) { int i, arr[n]; for (i = 0; i < n; i++) arr[i] = 0; } void *some_thread(void *dummy) { while (running) { tst(10); tst(20); } } void signal_handler(int sig) { ... } When the signal handler is called the some_thread code can be interrupted when is just registered the arr[10] data. When the signal handler is leaved the arr[10] is still registered and did not see the call to deregister arr[10] and then register arr[20]. The code resumes when tst(20) is running. This results in a bound checking error when i >= 10. To solve the above problem I changed the bound checking code to use tls (thread local storage) for the no_checking variable. This also makes it now possible to redirect signal/sigaction/fork code through the bound checking library and disable checking when a signal is running and to correct the bounds_sem for the fork child process. The BOUNDS_CHECKING_ON/BOUNDS_CHECKING_OFF is not needed any more for signal/sigaction/fork. In fact I could remove them from all my applications. The use of the tls function code slows down the code by about 10%. So if the slowdown due to bound checking was 5. It is now 5.5 times slower. For x86_64/i386 I also allowed to use __thread variable in bcheck.c when compiled with gcc with: make x86_64-libtcc1-usegcc=yes make i386-libtcc1-usegcc=yes This makes code run faster due to use of gcc and __thread variable. With the __thread variable there is no 10% slowdown. For other targets this does not work because stabs is not supported. Changes: lib/bcheck.c: - Add TRY_SEM - Add HAVE_SIGNAL/HAVE_SIGACTION/HAVE_FORK/HAVE_TLS_FUNC/HAVE_TLS_VAR - HAVE_SIGNAL: redirect signal() call if set. - HAVE_SIGACTION: redirect sigaction() call if set. - HAVE_FORK: redirect fork() call if set. - HAVE_TLS_FUNC: If target has tls function calls. - HAVE_TLS_VAR: If target has __thread tls support. - Replace all no_checking refecrences to NO_CHECKING_SET/NO_CHECKING_GET macros tcc-doc.texi: - Remove examples for signal/sigaction/fork code. - Add some explanation for signal/sigaction/fork code. - Add documentaion for __bounds_checking(). tccelf.c: - Add support for SHF_TLS tests/tests2/114_bound_signal.c: - Remove BOUNDS_CHECKING_ON/BOUNDS_CHECKING_OFF - Add code to trigger failure when tls is not working. x86_64-link.c: - Add support for R_X86_64_TLSGD/R_X86_64_TLSLD/R_X86_64_DTPOFF32/R_X86_64_TPOFF32 i386-link.c: - Add support for R_386_TLS_GD/R_386_TLS_LDM/R_386_TLS_LDO_32/R_386_TLS_LE
2020-09-08 12:31:58 +00:00
}
return;
case R_386_TLS_LDO_32:
case R_386_TLS_LE:
{
ElfW(Sym) *sym;
Section *sec;
int32_t x;
sym = &((ElfW(Sym) *)symtab_section->data)[sym_index];
Revert "Move almost all global variables to TCCState, actually all tests pass on Ubuntu 18.04 x86_64" This reverts commit af686a796bda94dc92fc3ad140ef438dafa08950.
2021-10-22 05:39:54 +00:00
sec = s1->sections[sym->st_shndx];
Fix boundschecking for signal/sigaction/fork The BOUNDS_CHECKING_ON/BOUNDS_CHECKING_OFF is not working for signal/sigaction/fork. The reason is that the code stops bound checking for the whole application. This result in wrong handling of __bound_local_new/__bound_local_delete and malloc/calloc/realloc/free. Consider the following code: void tst(int n) { int i, arr[n]; for (i = 0; i < n; i++) arr[i] = 0; } void *some_thread(void *dummy) { while (running) { tst(10); tst(20); } } void signal_handler(int sig) { ... } When the signal handler is called the some_thread code can be interrupted when is just registered the arr[10] data. When the signal handler is leaved the arr[10] is still registered and did not see the call to deregister arr[10] and then register arr[20]. The code resumes when tst(20) is running. This results in a bound checking error when i >= 10. To solve the above problem I changed the bound checking code to use tls (thread local storage) for the no_checking variable. This also makes it now possible to redirect signal/sigaction/fork code through the bound checking library and disable checking when a signal is running and to correct the bounds_sem for the fork child process. The BOUNDS_CHECKING_ON/BOUNDS_CHECKING_OFF is not needed any more for signal/sigaction/fork. In fact I could remove them from all my applications. The use of the tls function code slows down the code by about 10%. So if the slowdown due to bound checking was 5. It is now 5.5 times slower. For x86_64/i386 I also allowed to use __thread variable in bcheck.c when compiled with gcc with: make x86_64-libtcc1-usegcc=yes make i386-libtcc1-usegcc=yes This makes code run faster due to use of gcc and __thread variable. With the __thread variable there is no 10% slowdown. For other targets this does not work because stabs is not supported. Changes: lib/bcheck.c: - Add TRY_SEM - Add HAVE_SIGNAL/HAVE_SIGACTION/HAVE_FORK/HAVE_TLS_FUNC/HAVE_TLS_VAR - HAVE_SIGNAL: redirect signal() call if set. - HAVE_SIGACTION: redirect sigaction() call if set. - HAVE_FORK: redirect fork() call if set. - HAVE_TLS_FUNC: If target has tls function calls. - HAVE_TLS_VAR: If target has __thread tls support. - Replace all no_checking refecrences to NO_CHECKING_SET/NO_CHECKING_GET macros tcc-doc.texi: - Remove examples for signal/sigaction/fork code. - Add some explanation for signal/sigaction/fork code. - Add documentaion for __bounds_checking(). tccelf.c: - Add support for SHF_TLS tests/tests2/114_bound_signal.c: - Remove BOUNDS_CHECKING_ON/BOUNDS_CHECKING_OFF - Add code to trigger failure when tls is not working. x86_64-link.c: - Add support for R_X86_64_TLSGD/R_X86_64_TLSLD/R_X86_64_DTPOFF32/R_X86_64_TPOFF32 i386-link.c: - Add support for R_386_TLS_GD/R_386_TLS_LDM/R_386_TLS_LDO_32/R_386_TLS_LE
2020-09-08 12:31:58 +00:00
x = val - sec->sh_addr - sec->data_offset;
add32le(ptr, x);
}
return;
case R_386_NONE:
return;
Do section relocation in architecture backend
2016-11-12 15:16:06 +00:00
default:
fprintf(stderr,"FIXME: handle reloc type %d at %x [%p] to %x\n",
type, (unsigned)addr, ptr, (unsigned)val);
return;
}
}
Fix relocs_info declaration in tcc.h C standard specifies that array should be declared with a non null size or with * for standard array. Declaration of relocs_info in tcc.h was not respecting this rule. This commit add a R_NUM macro that maps to the R_<ARCH>_NUM macros and declare relocs_info using it. This commit also moves all linker-related macros from <arch>-gen.c files to <arch>-link.c ones.
2016-12-05 20:40:59 +00:00
#endif /* !TARGET_DEFS_ONLY */
Reference in a new issue Copy permalink