mirror/nasm
2
0
Fork 0
mirror of https://github.com/netwide-assembler/nasm.git synced 2025-04-24 19:00:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

out: Elf32, Elfx32, Elf64 -- Unify elf_init and elf_deflabel

Browse Source 
Note FIXMEs for address later.

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
This commit is contained in:
Cyrill Gorcunov 2016-03-13 22:43:56 +03:00
parent 8ba28bc20b
commit a087d49f70
3 changed files with 36 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
output/outelf32.c
View File

@ -200,6 +200,11 @@ static void elf_init(void)
fwds = NULL; fwds = NULL;
/*
* FIXME: tlsie is Elf32 only and
* gottpoff is Elfx32|64 only.
*/
elf_gotpc_sect = seg_alloc(); elf_gotpc_sect = seg_alloc();
define_label("..gotpc", elf_gotpc_sect + 1, 0L, NULL, false, false); define_label("..gotpc", elf_gotpc_sect + 1, 0L, NULL, false, false);
elf_gotoff_sect = seg_alloc(); elf_gotoff_sect = seg_alloc();
@ -210,6 +215,8 @@ static void elf_init(void)
define_label("..plt", elf_plt_sect + 1, 0L, NULL, false, false); define_label("..plt", elf_plt_sect + 1, 0L, NULL, false, false);
elf_sym_sect = seg_alloc(); elf_sym_sect = seg_alloc();
define_label("..sym", elf_sym_sect + 1, 0L, NULL, false, false); define_label("..sym", elf_sym_sect + 1, 0L, NULL, false, false);
elf_gottpoff_sect = seg_alloc();
define_label("..gottpoff", elf_gottpoff_sect + 1, 0L, NULL, false, false);
elf_tlsie_sect = seg_alloc(); elf_tlsie_sect = seg_alloc();
define_label("..tlsie", elf_tlsie_sect + 1, 0L, NULL, false, false); define_label("..tlsie", elf_tlsie_sect + 1, 0L, NULL, false, false);
@ -351,10 +358,13 @@ static void elf_deflabel(char *name, int32_t segment, int64_t offset,
* This is a NASM special symbol. We never allow it into * This is a NASM special symbol. We never allow it into
* the ELF symbol table, even if it's a valid one. If it * the ELF symbol table, even if it's a valid one. If it
* _isn't_ a valid one, we should barf immediately. * _isn't_ a valid one, we should barf immediately.
*
* FIXME: tlsie is Elf32 only, and gottpoff is Elfx32|64 only.
*/ */
if (strcmp(name, "..gotpc") && strcmp(name, "..gotoff") && if (strcmp(name, "..gotpc") && strcmp(name, "..gotoff") &&
strcmp(name, "..got") && strcmp(name, "..plt") && strcmp(name, "..got") && strcmp(name, "..plt") &&
strcmp(name, "..sym") && strcmp(name, "..tlsie")) strcmp(name, "..sym") && strcmp(name, "..gottpoff") &&
strcmp(name, "..tlsie"))
nasm_error(ERR_NONFATAL, "unrecognised special symbol `%s'", name); nasm_error(ERR_NONFATAL, "unrecognised special symbol `%s'", name);
return; return;
} }

12
output/outelf64.c
View File

@ -200,6 +200,11 @@ static void elf_init(void)
fwds = NULL; fwds = NULL;
/*
* FIXME: tlsie is Elf32 only and
* gottpoff is Elfx32|64 only.
*/
elf_gotpc_sect = seg_alloc(); elf_gotpc_sect = seg_alloc();
define_label("..gotpc", elf_gotpc_sect + 1, 0L, NULL, false, false); define_label("..gotpc", elf_gotpc_sect + 1, 0L, NULL, false, false);
elf_gotoff_sect = seg_alloc(); elf_gotoff_sect = seg_alloc();
@ -212,6 +217,8 @@ static void elf_init(void)
define_label("..sym", elf_sym_sect + 1, 0L, NULL, false, false); define_label("..sym", elf_sym_sect + 1, 0L, NULL, false, false);
elf_gottpoff_sect = seg_alloc(); elf_gottpoff_sect = seg_alloc();
define_label("..gottpoff", elf_gottpoff_sect + 1, 0L, NULL, false, false); define_label("..gottpoff", elf_gottpoff_sect + 1, 0L, NULL, false, false);
elf_tlsie_sect = seg_alloc();
define_label("..tlsie", elf_tlsie_sect + 1, 0L, NULL, false, false);
def_seg = seg_alloc(); def_seg = seg_alloc();
} }
@ -351,10 +358,13 @@ static void elf_deflabel(char *name, int32_t segment, int64_t offset,
* This is a NASM special symbol. We never allow it into * This is a NASM special symbol. We never allow it into
* the ELF symbol table, even if it's a valid one. If it * the ELF symbol table, even if it's a valid one. If it
* _isn't_ a valid one, we should barf immediately. * _isn't_ a valid one, we should barf immediately.
*
* FIXME: tlsie is Elf32 only, and gottpoff is Elfx32|64 only.
*/ */
if (strcmp(name, "..gotpc") && strcmp(name, "..gotoff") && if (strcmp(name, "..gotpc") && strcmp(name, "..gotoff") &&
strcmp(name, "..got") && strcmp(name, "..plt") && strcmp(name, "..got") && strcmp(name, "..plt") &&
strcmp(name, "..sym") && strcmp(name, "..gottpoff")) strcmp(name, "..sym") && strcmp(name, "..gottpoff") &&
strcmp(name, "..tlsie"))
nasm_error(ERR_NONFATAL, "unrecognised special symbol `%s'", name); nasm_error(ERR_NONFATAL, "unrecognised special symbol `%s'", name);
return; return;
} }

20
output/outelfx32.c
View File

@ -177,14 +177,12 @@ static void dwarf_findfile(const char *);
static void dwarf_findsect(const int); static void dwarf_findsect(const int);
/* /*
* Special section numbers which are used to define ELF special * Special NASM section numbers which are used to define ELF special
* symbols, which can be used with WRT to provide PIC relocation * symbols.
* types.
*/ */
static int32_t elf_gotpc_sect, elf_gotoff_sect; static int32_t elf_gotpc_sect, elf_gotoff_sect;
static int32_t elf_got_sect, elf_plt_sect; static int32_t elf_got_sect, elf_plt_sect;
static int32_t elf_sym_sect; static int32_t elf_sym_sect, elf_gottpoff_sect, elf_tlsie_sect;
static int32_t elf_gottpoff_sect;
static void elf_init(void) static void elf_init(void)
{ {
@ -203,6 +201,11 @@ static void elf_init(void)
fwds = NULL; fwds = NULL;
/*
* FIXME: tlsie is Elf32 only and
* gottpoff is Elfx32|64 only.
*/
elf_gotpc_sect = seg_alloc(); elf_gotpc_sect = seg_alloc();
define_label("..gotpc", elf_gotpc_sect + 1, 0L, NULL, false, false); define_label("..gotpc", elf_gotpc_sect + 1, 0L, NULL, false, false);
elf_gotoff_sect = seg_alloc(); elf_gotoff_sect = seg_alloc();
@ -215,6 +218,8 @@ static void elf_init(void)
define_label("..sym", elf_sym_sect + 1, 0L, NULL, false, false); define_label("..sym", elf_sym_sect + 1, 0L, NULL, false, false);
elf_gottpoff_sect = seg_alloc(); elf_gottpoff_sect = seg_alloc();
define_label("..gottpoff", elf_gottpoff_sect + 1, 0L, NULL, false, false); define_label("..gottpoff", elf_gottpoff_sect + 1, 0L, NULL, false, false);
elf_tlsie_sect = seg_alloc();
define_label("..tlsie", elf_tlsie_sect + 1, 0L, NULL, false, false);
def_seg = seg_alloc(); def_seg = seg_alloc();
} }
@ -354,10 +359,13 @@ static void elf_deflabel(char *name, int32_t segment, int64_t offset,
* This is a NASM special symbol. We never allow it into * This is a NASM special symbol. We never allow it into
* the ELF symbol table, even if it's a valid one. If it * the ELF symbol table, even if it's a valid one. If it
* _isn't_ a valid one, we should barf immediately. * _isn't_ a valid one, we should barf immediately.
*
* FIXME: tlsie is Elf32 only, and gottpoff is Elfx32|64 only.
*/ */
if (strcmp(name, "..gotpc") && strcmp(name, "..gotoff") && if (strcmp(name, "..gotpc") && strcmp(name, "..gotoff") &&
strcmp(name, "..got") && strcmp(name, "..plt") && strcmp(name, "..got") && strcmp(name, "..plt") &&
strcmp(name, "..sym") && strcmp(name, "..gottpoff")) strcmp(name, "..sym") && strcmp(name, "..gottpoff") &&
strcmp(name, "..tlsie"))
nasm_error(ERR_NONFATAL, "unrecognised special symbol `%s'", name); nasm_error(ERR_NONFATAL, "unrecognised special symbol `%s'", name);
return; return;
} }