Index: src/system/boot/platform/bios_ia32/smp.cpp =================================================================== --- src/system/boot/platform/bios_ia32/smp.cpp (revision 37496) +++ src/system/boot/platform/bios_ia32/smp.cpp (working copy) @@ -472,7 +472,7 @@ uint32 j; // set this stack up - finalStack = (uint32 *)gKernelArgs.cpu_kstack[i].start; + finalStack = (uint32 *)(addr_t)gKernelArgs.cpu_kstack[i].start; memset((uint8*)finalStack + KERNEL_STACK_GUARD_PAGES * B_PAGE_SIZE, 0, KERNEL_STACK_SIZE); tempStack = (finalStack Index: src/system/boot/loader/elf.cpp =================================================================== --- src/system/boot/loader/elf.cpp (revision 37496) +++ src/system/boot/loader/elf.cpp (working copy) @@ -11,6 +11,7 @@ #include #include #include +#include #include #include @@ -60,6 +61,20 @@ static status_t +verify_elf64_header(struct Elf64_Ehdr &header) +{ + if (memcmp(header.e_ident, ELF_MAGIC, 4) != 0 + || header.e_ident[4] != ELFCLASS64 + || header.e_phoff == 0 + || !header.IsHostEndian() + || header.e_phentsize != sizeof(struct Elf64_Phdr)) + return B_BAD_TYPE; + + return B_OK; +} + + +static status_t elf_parse_dynamic_section(struct preloaded_image *image) { image->syms = 0; @@ -71,7 +86,7 @@ image->pltrel_len = 0; image->pltrel_type = 0; - struct Elf32_Dyn *d = (struct Elf32_Dyn *)image->dynamic_section.start; + struct Elf32_Dyn *d = (struct Elf32_Dyn *)(addr_t)image->dynamic_section.start; if (!d) return B_ERROR; @@ -123,6 +138,69 @@ static status_t +elf64_parse_dynamic_section(struct preloaded_image *image) +{ + image->syms64 = 0; + image->rel64 = 0; + image->rel_len = 0; + image->rela64 = 0; + image->rela_len = 0; + image->pltrel64 = 0; + image->pltrel_len = 0; + image->pltrel_type = 0; + + struct Elf64_Dyn *d = (struct Elf64_Dyn *)(addr_t)image->dynamic_section.start; + if (!d) + return B_ERROR; + + for (int i = 0; d[i].d_tag != DT_NULL; i++) { + switch (d[i].d_tag) { + case DT_HASH: + case DT_STRTAB: + break; + case DT_SYMTAB: + image->syms64 = (struct Elf64_Sym *)(d[i].d_un.d_ptr + + image->text_region.delta); + break; + case DT_REL: + image->rel64 = (struct Elf64_Rel *)(d[i].d_un.d_ptr + + image->text_region.delta); + break; + case DT_RELSZ: + image->rel_len = d[i].d_un.d_val; + break; + case DT_RELA: + image->rela64 = (struct Elf64_Rela *)(d[i].d_un.d_ptr + + image->text_region.delta); + break; + case DT_RELASZ: + image->rela_len = d[i].d_un.d_val; + break; + case DT_JMPREL: + image->pltrel64 = (struct Elf64_Rel *)(d[i].d_un.d_ptr + + image->text_region.delta); + break; + case DT_PLTRELSZ: + image->pltrel_len = d[i].d_un.d_val; + break; + case DT_PLTREL: + image->pltrel_type = d[i].d_un.d_val; + break; + + default: + continue; + } + } + + // lets make sure we found all the required sections + if (image->syms64 == NULL) + return B_ERROR; + + return B_OK; +} + + +static status_t load_elf_symbol_table(int fd, preloaded_image *image) { struct Elf32_Ehdr &elfHeader = image->elf_header; @@ -224,24 +302,116 @@ } +static status_t +load_elf64_symbol_table(int fd, preloaded_image *image) +{ + struct Elf64_Ehdr &elfHeader = image->elf_header64; + Elf64_Sym *symbolTable = NULL; + Elf64_Shdr *stringHeader = NULL; + uint32 numSymbols = 0; + char *stringTable; + status_t status; + + // get section headers + + ssize_t size = elfHeader.e_shnum * elfHeader.e_shentsize; + Elf64_Shdr *sectionHeaders = (struct Elf64_Shdr *)malloc(size); + if (sectionHeaders == NULL) { + dprintf("error allocating space for section headers\n"); + return B_NO_MEMORY; + } + + ssize_t length = read_pos(fd, elfHeader.e_shoff, sectionHeaders, size); + if (length < size) { + TRACE(("error reading in program headers\n")); + status = B_ERROR; + goto error1; + } + + // find symbol table in section headers + + for (int32 i = 0; i < elfHeader.e_shnum; i++) { + if (sectionHeaders[i].sh_type == SHT_SYMTAB) { + stringHeader = §ionHeaders[sectionHeaders[i].sh_link]; + + if (stringHeader->sh_type != SHT_STRTAB) { + TRACE(("doesn't link to string table\n")); + status = B_BAD_DATA; + goto error1; + } + + // read in symbol table + symbolTable = (Elf64_Sym *)kernel_args_malloc( + size = sectionHeaders[i].sh_size); + if (symbolTable == NULL) { + status = B_NO_MEMORY; + goto error1; + } + + length = read_pos(fd, sectionHeaders[i].sh_offset, symbolTable, + size); + if (length < size) { + TRACE(("error reading in symbol table\n")); + status = B_ERROR; + goto error1; + } + + numSymbols = size / sizeof(Elf64_Sym); + break; + } + } + + if (symbolTable == NULL) { + TRACE(("no symbol table\n")); + status = B_BAD_VALUE; + goto error1; + } + + // read in string table + + stringTable = (char *)kernel_args_malloc(size = stringHeader->sh_size); + if (stringTable == NULL) { + status = B_NO_MEMORY; + goto error2; + } + + length = read_pos(fd, stringHeader->sh_offset, stringTable, size); + if (length < size) { + TRACE(("error reading in string table\n")); + status = B_ERROR; + goto error3; + } + + TRACE(("loaded %ld debug symbols\n", numSymbols)); + + // insert tables into image + image->debug_symbols64 = symbolTable; + image->num_debug_symbols = numSymbols; + image->debug_string_table = stringTable; + image->debug_string_table_size = size; + + free(sectionHeaders); + return B_OK; + +error3: + kernel_args_free(stringTable); +error2: + kernel_args_free(symbolTable); +error1: + free(sectionHeaders); + + return status; +} + status_t -elf_load_image(int fd, preloaded_image *image) +elf32_load_image(int fd, preloaded_image *image) { size_t totalSize; status_t status; - TRACE(("elf_load_image(fd = %d, image = %p)\n", fd, image)); - struct Elf32_Ehdr &elfHeader = image->elf_header; - ssize_t length = read_pos(fd, 0, &elfHeader, sizeof(Elf32_Ehdr)); - if (length < (ssize_t)sizeof(Elf32_Ehdr)) - return B_BAD_TYPE; - status = verify_elf_header(elfHeader); - if (status < B_OK) - return status; - ssize_t size = elfHeader.e_phnum * elfHeader.e_phentsize; Elf32_Phdr *programHeaders = (struct Elf32_Phdr *)malloc(size); if (programHeaders == NULL) { @@ -407,8 +577,214 @@ return status; } +status_t +elf64_load_image(int fd, preloaded_image *image) +{ + size_t totalSize; + status_t status; + struct Elf64_Ehdr &elfHeader = image->elf_header64; + ssize_t length = read_pos(fd, 0, &elfHeader, sizeof(Elf64_Ehdr)); + + ssize_t size = elfHeader.e_phnum * elfHeader.e_phentsize; + Elf64_Phdr *programHeaders = (struct Elf64_Phdr *)malloc(size); + if (programHeaders == NULL) { + dprintf("error allocating space for program headers\n"); + return B_NO_MEMORY; + } + + length = read_pos(fd, elfHeader.e_phoff, programHeaders, size); + if (length < size) { + TRACE(("error reading in program headers\n")); + status = B_ERROR; + goto error1; + } + + // create an area large enough to hold the image + + image->data_region.size = 0; + image->text_region.size = 0; + + for (int32 i = 0; i < elfHeader.e_phnum; i++) { + Elf64_Phdr &header = programHeaders[i]; + + switch (header.p_type) { + case PT_LOAD: + break; + case PT_DYNAMIC: + image->dynamic_section.start = header.p_vaddr; + image->dynamic_section.size = header.p_memsz; + continue; + case PT_INTERP: + case PT_PHDR: + // known but unused type + continue; + default: + dprintf("unhandled pheader type 0x%lx\n", header.p_type); + continue; + } + + elf_region *region; + if (header.IsReadWrite()) { + if (image->data_region.size != 0) { + dprintf("elf: rw already handled!\n"); + continue; + } + region = &image->data_region; + } else if (header.IsExecutable()) { + if (image->text_region.size != 0) { + dprintf("elf: ro already handled!\n"); + continue; + } + region = &image->text_region; + } else + continue; + + region->start = ROUNDDOWN(header.p_vaddr, B_PAGE_SIZE); + region->size = ROUNDUP(header.p_memsz + (header.p_vaddr % B_PAGE_SIZE), + B_PAGE_SIZE); + region->delta = -region->start; + + TRACE(("segment %d: start = %p, size = %lu, delta = %lx\n", i, + region->start, region->size, region->delta)); + } + image->text_region.size = 1; + // found both, text and data? + if (image->data_region.size == 0 || image->text_region.size == 0) { + dprintf("Couldn't find both text and data segment!\n"); + status = B_BAD_DATA; + goto error1; + } + + // get the segment order + elf_region *firstRegion; + elf_region *secondRegion; + if (image->text_region.start < image->data_region.start) { + firstRegion = &image->text_region; + secondRegion = &image->data_region; + } else { + firstRegion = &image->data_region; + secondRegion = &image->text_region; + } + + // Check whether the segments have an unreasonable amount of unused space + // inbetween. + totalSize = secondRegion->start + secondRegion->size - firstRegion->start; +/* if (totalSize > image->text_region.size + image->data_region.size + + 8 * 1024) { + status = B_BAD_DATA; + goto error1; + } +*/ + // The kernel and the modules are relocatable, thus + // platform_allocate_region() can automatically allocate an address, + // but shall prefer the specified base address. + if (platform_allocate_region((void **)&firstRegion->start, totalSize, + B_READ_AREA | B_WRITE_AREA, false) < B_OK) { + status = B_NO_MEMORY; + goto error1; + } + + // initialize the region pointers to the allocated region + secondRegion->start += firstRegion->start + firstRegion->delta; + + image->data_region.delta += image->data_region.start; + image->text_region.delta += image->text_region.start; + + // load program data + + for (int i = 0; i < elfHeader.e_phnum; i++) { + Elf64_Phdr &header = programHeaders[i]; + + if (header.p_type != PT_LOAD) + continue; + + elf_region *region; + if (header.IsReadWrite()) + region = &image->data_region; + else if (header.IsExecutable()) + region = &image->text_region; + else + continue; + + TRACE(("load segment %d (%ld bytes)...\n", i, header.p_filesz)); + + length = read_pos(fd, header.p_offset, + (void *)(region->start + (header.p_vaddr % B_PAGE_SIZE)), + header.p_filesz); + if (length < (ssize_t)header.p_filesz) { + status = B_BAD_DATA; + dprintf("error reading in seg %d\n", i); + goto error2; + } + + // Clear anything above the file size (that may also contain the BSS + // area) + + uint32 offset = (header.p_vaddr % B_PAGE_SIZE) + header.p_filesz; + if (offset < region->size) + memset((void *)(region->start + offset), 0, region->size - offset); + } + + // offset dynamic section, and program entry addresses by the delta of the + // regions + image->dynamic_section.start += image->text_region.delta; + image->elf_header.e_entry += image->text_region.delta; + + image->num_debug_symbols = 0; + image->debug_symbols = NULL; + image->debug_string_table = NULL; + + if (sLoadElfSymbols) + load_elf64_symbol_table(fd, image); + + free(programHeaders); + + return B_OK; + +error2: + if (image->text_region.start != 0) + platform_free_region((void *)image->text_region.start, totalSize); +error1: + free(programHeaders); + + return status; +} + status_t +elf_load_image(int fd, preloaded_image *image) +{ + status_t status; + + TRACE(("elf_load_image(fd = %d, image = %p)\n", fd, image)); + + struct Elf32_Ehdr &elfHeader = image->elf_header; + struct Elf64_Ehdr &elfHeader64 = image->elf_header64; + + ssize_t length = read_pos(fd, 0, &elfHeader, sizeof(Elf32_Ehdr)); + if (length < (ssize_t)sizeof(Elf32_Ehdr)) + return B_BAD_TYPE; + + status = verify_elf_header(elfHeader); + if (status < B_OK) { //not elf32. Check if elf64. + ssize_t length = read_pos(fd, 0, &elfHeader64, sizeof(Elf64_Ehdr)); + if (length < (ssize_t)sizeof(Elf64_Ehdr)) + return B_BAD_TYPE; + + status = verify_elf64_header(elfHeader64); + if (status < B_OK) + return status; + + image->elf_size = 64; + return elf64_load_image(fd, image); + } + + image->elf_size = 32; + return elf32_load_image(fd, image); +} + + +status_t elf_load_image(Directory *directory, const char *path) { preloaded_image *image; @@ -458,7 +834,7 @@ status_t -elf_relocate_image(struct preloaded_image *image) +elf32_relocate_image(struct preloaded_image *image) { status_t status = elf_parse_dynamic_section(image); if (status != B_OK) @@ -503,6 +879,60 @@ status_t +elf64_relocate_image(struct preloaded_image *image) +{ + status_t status = elf64_parse_dynamic_section(image); + if (status != B_OK) + return status; + + // deal with the rels first + if (image->rel64) { + TRACE(("total %i relocs\n", + image->rel_len / (int)sizeof(struct Elf64_Rel))); + + status = boot_arch_elf64_relocate_rel(image, image->rel64, image->rel_len); + if (status < B_OK) + return status; + } + + if (image->pltrel64) { + TRACE(("total %i plt-relocs\n", + image->pltrel_len / (int)sizeof(struct Elf64_Rel))); + + if (image->pltrel_type == DT_REL) { + status = boot_arch_elf64_relocate_rel(image, image->pltrel64, + image->pltrel_len); + } else { + status = boot_arch_elf64_relocate_rela(image, + (struct Elf64_Rela *)image->pltrel64, image->pltrel_len); + } + if (status < B_OK) + return status; + } + + if (image->rela64) { + TRACE(("total %i rela relocs\n", + image->rela_len / (int)sizeof(struct Elf64_Rela))); + status = boot_arch_elf64_relocate_rela(image, image->rela64, + image->rela_len); + if (status < B_OK) + return status; + } + panic("relocate 4"); + return B_OK; +} + +status_t +elf_relocate_image(struct preloaded_image *image) +{ + if(image->elf_size == 32) + return elf32_relocate_image(image); + + return elf64_relocate_image(image); +} + + +status_t boot_elf_resolve_symbol(struct preloaded_image *image, struct Elf32_Sym *symbol, addr_t *symbolAddress) { @@ -524,3 +954,26 @@ return B_NO_ERROR; } } + +status_t +boot_elf64_resolve_symbol(struct preloaded_image *image, + struct Elf64_Sym *symbol, addr_t *symbolAddress) +{ + switch (symbol->st_shndx) { + case SHN_UNDEF: + // Since we do that only for the kernel, there shouldn't be + // undefined symbols. + return B_MISSING_SYMBOL; + case SHN_ABS: + *symbolAddress = symbol->st_value; + return B_NO_ERROR; + case SHN_COMMON: + // ToDo: finish this + TRACE(("elf_resolve_symbol: COMMON symbol, finish me!\n")); + return B_ERROR; + default: + // standard symbol + *symbolAddress = symbol->st_value + image->text_region.delta; + return B_NO_ERROR; + } +} Index: headers/private/system/elf32.h =================================================================== --- headers/private/system/elf32.h (revision 37496) +++ headers/private/system/elf32.h (working copy) @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009, Haiku Inc. All Rights Reserved. + * Copyright 2002-2010, Haiku Inc. All Rights Reserved. * Distributed under the terms of the MIT license. * * Copyright 2001, Travis Geiselbrecht. All rights reserved. @@ -8,13 +8,12 @@ #ifndef _ELF32_H #define _ELF32_H - #include #include #include +#include - typedef uint32 Elf32_Addr; typedef uint16 Elf32_Half; typedef uint32 Elf32_Off; @@ -25,8 +24,6 @@ /*** ELF header ***/ -#define EI_NIDENT 16 - struct Elf32_Ehdr { uint8 e_ident[EI_NIDENT]; Elf32_Half e_type; @@ -48,26 +45,6 @@ #endif }; -#define ELF_MAGIC "\x7f""ELF" - -// e_ident[] indices -#define EI_MAG0 0 -#define EI_MAG1 1 -#define EI_MAG2 2 -#define EI_MAG3 3 -#define EI_CLASS 4 -#define EI_DATA 5 -#define EI_VERSION 6 -#define EI_PAD 7 - -// architecture class (EI_CLASS) -#define ELFCLASS32 1 -#define ELFCLASS64 2 -// endian (EI_DATA) -#define ELFDATA2LSB 1 /* little endian */ -#define ELFDATA2MSB 2 /* big endian */ - - /*** section header ***/ struct Elf32_Shdr { @@ -83,46 +60,7 @@ Elf32_Word sh_entsize; }; -// special section indices -#define SHN_UNDEF 0 -#define SHN_LORESERVE 0xff00 -#define SHN_LOPROC 0xff00 -#define SHN_HIPROC 0xff1f -#define SHN_ABS 0xfff1 -#define SHN_COMMON 0xfff2 -#define SHN_HIRESERVE 0xffff -// section header type -#define SHT_NULL 0 -#define SHT_PROGBITS 1 -#define SHT_SYMTAB 2 -#define SHT_STRTAB 3 -#define SHT_RELA 4 -#define SHT_HASH 5 -#define SHT_DYNAMIC 6 -#define SHT_NOTE 7 -#define SHT_NOBITS 8 -#define SHT_REL 9 -#define SHT_SHLIB 10 -#define SHT_DYNSYM 11 - -#define SHT_GNU_verdef 0x6ffffffd /* version definition section */ -#define SHT_GNU_verneed 0x6ffffffe /* version needs section */ -#define SHT_GNU_versym 0x6fffffff /* version symbol table */ - -#define SHT_LOPROC 0x70000000 -#define SHT_HIPROC 0x7fffffff -#define SHT_LOUSER 0x80000000 -#define SHT_HIUSER 0xffffffff - -// section header flags -#define SHF_WRITE 1 -#define SHF_ALLOC 2 -#define SHF_EXECINSTR 4 - -#define SHF_MASKPROC 0xf0000000 - - /*** program header ***/ struct Elf32_Phdr { @@ -141,27 +79,6 @@ #endif }; -// program header segment types -#define PT_NULL 0 -#define PT_LOAD 1 -#define PT_DYNAMIC 2 -#define PT_INTERP 3 -#define PT_NOTE 4 -#define PT_SHLIB 5 -#define PT_PHDR 6 -#define PT_STACK 0x6474e551 - -#define PT_LOPROC 0x70000000 -#define PT_HIPROC 0x7fffffff - -// program header segment flags -#define PF_EXECUTE 0x1 -#define PF_WRITE 0x2 -#define PF_READ 0x4 -#define PF_PROTECTION_MASK (PF_EXECUTE | PF_WRITE | PF_READ) - -#define PF_MASKPROC 0xf0000000 - struct Elf32_Sym { Elf32_Word st_name; Elf32_Addr st_value; @@ -180,22 +97,6 @@ #define ELF32_ST_TYPE(i) ((i) & 0xf) #define ELF32_ST_INFO(b, t) (((b) << 4) + ((t) & 0xf)) -#define STT_NOTYPE 0 -#define STT_OBJECT 1 -#define STT_FUNC 2 -#define STT_SECTION 3 -#define STT_FILE 4 -#define STT_LOPROC 13 -#define STT_HIPROC 15 - -#define STB_LOCAL 0 -#define STB_GLOBAL 1 -#define STB_WEAK 2 -#define STB_LOPROC 13 -#define STB_HIPROC 15 - -#define STN_UNDEF 0 - struct Elf32_Rel { Elf32_Addr r_offset; Elf32_Word r_info; @@ -228,41 +129,6 @@ } d_un; }; -#define DT_NULL 0 -#define DT_NEEDED 1 -#define DT_PLTRELSZ 2 -#define DT_PLTGOT 3 -#define DT_HASH 4 -#define DT_STRTAB 5 -#define DT_SYMTAB 6 -#define DT_RELA 7 -#define DT_RELASZ 8 -#define DT_RELAENT 9 -#define DT_STRSZ 10 -#define DT_SYMENT 11 -#define DT_INIT 12 -#define DT_FINI 13 -#define DT_SONAME 14 -#define DT_RPATH 15 -#define DT_SYMBOLIC 16 -#define DT_REL 17 -#define DT_RELSZ 18 -#define DT_RELENT 19 -#define DT_PLTREL 20 -#define DT_DEBUG 21 -#define DT_TEXTREL 22 -#define DT_JMPREL 23 - -#define DT_VERSYM 0x6ffffff0 /* symbol version table */ -#define DT_VERDEF 0x6ffffffc /* version definition table */ -#define DT_VERDEFNUM 0x6ffffffd /* number of version definitions */ -#define DT_VERNEED 0x6ffffffe /* table with needed versions */ -#define DT_VERNEEDNUM 0x6fffffff /* number of needed versions */ - -#define DT_LOPROC 0x70000000 -#define DT_HIPROC 0x7fffffff - - /* version definition section */ struct Elf32_Verdef { @@ -276,31 +142,6 @@ Elf32_Word vd_next; /* byte offset to next verdef entry */ }; -/* values for vd_version (version revision) */ -#define VER_DEF_NONE 0 /* no version */ -#define VER_DEF_CURRENT 1 /* current version */ -#define VER_DEF_NUM 2 /* given version number */ - -/* values for vd_flags (version information flags) */ -#define VER_FLG_BASE 0x1 /* version definition of file itself */ -#define VER_FLG_WEAK 0x2 /* weak version identifier */ - -/* values for versym symbol index */ -#define VER_NDX_LOCAL 0 /* symbol is local */ -#define VER_NDX_GLOBAL 1 /* symbol is global/unversioned */ -#define VER_NDX_INITIAL 2 /* initial version -- that's the one given - to symbols when a library becomes - versioned; handled by the linker (and - runtime loader) similar to - VER_NDX_GLOBAL */ -#define VER_NDX_LORESERVE 0xff00 /* beginning of reserved entries */ -#define VER_NDX_ELIMINATE 0xff01 /* symbol is to be eliminated */ - -#define VER_NDX_FLAG_HIDDEN 0x8000 /* flag: version is hidden */ -#define VER_NDX_MASK 0x7fff /* mask to get the actual version index */ -#define VER_NDX(x) ((x) & VER_NDX_MASK) - - /* auxiliary version information */ struct Elf32_Verdaux { @@ -321,12 +162,6 @@ Elf32_Word vn_next; /* byte offset to next verneed entry */ }; -/* values for vn_version (version revision) */ -#define VER_NEED_NONE 0 /* no version */ -#define VER_NEED_CURRENT 1 /* current version */ -#define VER_NEED_NUM 2 /* given version number */ - - /* auxiliary needed version information */ struct Elf32_Vernaux { @@ -338,10 +173,6 @@ Elf32_Word vna_next; /* byte offset to next vernaux entry */ }; -/* values for vna_flags */ -#define VER_FLG_WEAK 0x2 /* weak version identifier */ - - /*** inline functions ***/ #ifdef __cplusplus Index: headers/private/system/elf_common.h =================================================================== --- headers/private/system/elf_common.h (revision 0) +++ headers/private/system/elf_common.h (revision 0) @@ -0,0 +1,197 @@ +/* + * Copyright 2002-2010, Haiku Inc. All Rights Reserved. + * Distributed under the terms of the MIT license. + * + * Copyright 2001, Travis Geiselbrecht. All rights reserved. + * Distributed under the terms of the NewOS License. + */ +#ifndef _ELF_COMMON_H +#define _ELF_COMMON_H + +#define EI_NIDENT 16 +#define ELF_MAGIC "\x7f""ELF" + +// e_ident[] indices +#define EI_MAG0 0 +#define EI_MAG1 1 +#define EI_MAG2 2 +#define EI_MAG3 3 +#define EI_CLASS 4 +#define EI_DATA 5 +#define EI_VERSION 6 +#define EI_OSABI 7 +#define EI_ABIVERSION 8 +#define EI_PAD 9 + +// architecture class (EI_CLASS) +#define ELFCLASS32 1 +#define ELFCLASS64 2 +// endian (EI_DATA) +#define ELFDATA2LSB 1 /* little endian */ +#define ELFDATA2MSB 2 /* big endian */ + + +// special section indices +#define SHN_LORESERVE 0xff00 +#define SHN_HIRESERVE 0xffff + +#define SHN_UNDEF 0 +#define SHN_LOPROC 0xff00 +#define SHN_HIPROC 0xff1f +#define SHN_LODS 0xff20 +#define SHN_HIOS 0xff3f +#define SHN_ABS 0xfff1 +#define SHN_COMMON 0xfff2 + +// section header type +#define SHT_NULL 0 +#define SHT_PROGBITS 1 +#define SHT_SYMTAB 2 +#define SHT_STRTAB 3 +#define SHT_RELA 4 +#define SHT_HASH 5 +#define SHT_DYNAMIC 6 +#define SHT_NOTE 7 +#define SHT_NOBITS 8 +#define SHT_REL 9 +#define SHT_SHLIB 10 +#define SHT_DYNSYM 11 + +#define SHT_GNU_verdef 0x6ffffffd /* version definition section */ +#define SHT_GNU_verneed 0x6ffffffe /* version needs section */ +#define SHT_GNU_versym 0x6fffffff /* version symbol table */ + +#define SHT_LODS 0x60000000 +#define SHT_HIOS 0x6fffffff +#define SHT_LOPROC 0x70000000 +#define SHT_HIPROC 0x7fffffff +#define SHT_LOUSER 0x80000000 +#define SHT_HIUSER 0xffffffff + +// section header flags +#define SHF_WRITE 1 +#define SHF_ALLOC 2 +#define SHF_EXECINSTR 4 + +#define SHF_MASKOS 0x0f000000 +#define SHF_MASKPROC 0xf0000000 + +// program header segment types +#define PT_NULL 0 +#define PT_LOAD 1 +#define PT_DYNAMIC 2 +#define PT_INTERP 3 +#define PT_NOTE 4 +#define PT_SHLIB 5 +#define PT_PHDR 6 +#define PT_STACK 0x6474e551 + +#define PT_LOOS 0x60000000 +#define PT_HIOS 0x6fffffff +#define PT_LOPROC 0x70000000 +#define PT_HIPROC 0x7fffffff + +// program header segment flags +#define PF_EXECUTE 0x1 +#define PF_WRITE 0x2 +#define PF_READ 0x4 +#define PF_PROTECTION_MASK (PF_EXECUTE | PF_WRITE | PF_READ) + +#define PF_MASKOS 0x00ff0000 +#define PF_MASKPROC 0xff000000 + +#define STT_NOTYPE 0 +#define STT_OBJECT 1 +#define STT_FUNC 2 +#define STT_SECTION 3 +#define STT_FILE 4 +#define STT_LOOS 10 +#define STT_HIOS 12 +#define STT_LOPROC 13 +#define STT_HIPROC 15 + +#define STB_LOCAL 0 +#define STB_GLOBAL 1 +#define STB_WEAK 2 +#define STB_LOOS 10 +#define STB_HIOS 11 +#define STB_LOPROC 13 +#define STB_HIPROC 15 + +#define STN_UNDEF 0 + +#define DT_NULL 0 +#define DT_NEEDED 1 +#define DT_PLTRELSZ 2 +#define DT_PLTGOT 3 +#define DT_HASH 4 +#define DT_STRTAB 5 +#define DT_SYMTAB 6 +#define DT_RELA 7 +#define DT_RELASZ 8 +#define DT_RELAENT 9 +#define DT_STRSZ 10 +#define DT_SYMENT 11 +#define DT_INIT 12 +#define DT_FINI 13 +#define DT_SONAME 14 +#define DT_RPATH 15 +#define DT_SYMBOLIC 16 +#define DT_REL 17 +#define DT_RELSZ 18 +#define DT_RELENT 19 +#define DT_PLTREL 20 +#define DT_DEBUG 21 +#define DT_TEXTREL 22 +#define DT_JMPREL 23 +#define DT_BIND_NOW 24 +#define DT_INIT_ARRAY 25 +#define DT_FINI_ARRAY 26 +#define DT_INIT_ARRAYSZ 27 +#define DT_FINI_ARRAYSZ 28 + + +#define DT_VERSYM 0x6ffffff0 /* symbol version table */ +#define DT_VERDEF 0x6ffffffc /* version definition table */ +#define DT_VERDEFNUM 0x6ffffffd /* number of version definitions */ +#define DT_VERNEED 0x6ffffffe /* table with needed versions */ +#define DT_VERNEEDNUM 0x6fffffff /* number of needed versions */ + +#define DT_LOPROC 0x70000000 +#define DT_HIPROC 0x7fffffff + + +/* values for vd_version (version revision) */ +#define VER_DEF_NONE 0 /* no version */ +#define VER_DEF_CURRENT 1 /* current version */ +#define VER_DEF_NUM 2 /* given version number */ + +/* values for vd_flags (version information flags) */ +#define VER_FLG_BASE 0x1 /* version definition of file itself */ +#define VER_FLG_WEAK 0x2 /* weak version identifier */ + +/* values for versym symbol index */ +#define VER_NDX_LOCAL 0 /* symbol is local */ +#define VER_NDX_GLOBAL 1 /* symbol is global/unversioned */ +#define VER_NDX_INITIAL 2 /* initial version -- that's the one given + to symbols when a library becomes + versioned; handled by the linker (and + runtime loader) similar to + VER_NDX_GLOBAL */ +#define VER_NDX_LORESERVE 0xff00 /* beginning of reserved entries */ +#define VER_NDX_ELIMINATE 0xff01 /* symbol is to be eliminated */ + +#define VER_NDX_FLAG_HIDDEN 0x8000 /* flag: version is hidden */ +#define VER_NDX_MASK 0x7fff /* mask to get the actual version index */ +#define VER_NDX(x) ((x) & VER_NDX_MASK) + +/* values for vn_version (version revision) */ +#define VER_NEED_NONE 0 /* no version */ +#define VER_NEED_CURRENT 1 /* current version */ +#define VER_NEED_NUM 2 /* given version number */ + +/* values for vna_flags */ +#define VER_FLG_WEAK 0x2 /* weak version identifier */ + + +#endif /* _ELF_COMMON_H */ Index: headers/private/system/elf64.h =================================================================== --- headers/private/system/elf64.h (revision 0) +++ headers/private/system/elf64.h (revision 0) @@ -0,0 +1,235 @@ +/* + * Copyright 2002-2010, Haiku Inc. All Rights Reserved. + * Distributed under the terms of the MIT license. + * + * Copyright 2001, Travis Geiselbrecht. All rights reserved. + * Distributed under the terms of the NewOS License. + */ +#ifndef _ELF64_H +#define _ELF64_H + +#include +#include + +#include +#include + +typedef uint64 Elf64_Addr; +typedef uint16 Elf64_Half; +typedef uint64 Elf64_Off; +typedef int32 Elf64_Sword; +typedef uint32 Elf64_Word; +typedef int64 Elf64_Sxword; +typedef uint64 Elf64_Xword; + +typedef Elf64_Half Elf64_Versym; + +/*** ELF header ***/ + +struct Elf64_Ehdr { + uint8 e_ident[EI_NIDENT]; + Elf64_Half e_type; + Elf64_Half e_machine; + Elf64_Word e_version; + Elf64_Addr e_entry; + Elf64_Off e_phoff; + Elf64_Off e_shoff; + Elf64_Word e_flags; + Elf64_Half e_ehsize; + Elf64_Half e_phentsize; + Elf64_Half e_phnum; + Elf64_Half e_shentsize; + Elf64_Half e_shnum; + Elf64_Half e_shstrndx; + +#ifdef __cplusplus + bool IsHostEndian() const; +#endif +}; + +/*** section header ***/ + +struct Elf64_Shdr { + Elf64_Word sh_name; + Elf64_Word sh_type; + Elf64_Xword sh_flags; + Elf64_Addr sh_addr; + Elf64_Off sh_offset; + Elf64_Xword sh_size; + Elf64_Word sh_link; + Elf64_Word sh_info; + Elf64_Xword sh_addralign; + Elf64_Xword sh_entsize; +}; + +/*** program header ***/ + +struct Elf64_Phdr { + Elf64_Word p_type; + Elf64_Word p_flags; + Elf64_Off p_offset; /* offset from the beginning of the file of the segment */ + Elf64_Addr p_vaddr; /* virtual address for the segment in memory */ + Elf64_Addr p_paddr; + Elf64_Xword p_filesz; /* the size of the segment in the file */ + Elf64_Xword p_memsz; /* the size of the segment in memory */ + Elf64_Xword p_align; + +#ifdef __cplusplus + bool IsReadWrite() const; + bool IsExecutable() const; +#endif +}; + +struct Elf64_Sym { + Elf64_Word st_name; + uint8 st_info; + uint8 st_other; + Elf64_Half st_shndx; + Elf64_Addr st_value; + Elf64_Xword st_size; + +#ifdef __cplusplus + uint8 Bind() const; + uint8 Type() const; +#endif +}; + +/* TODO: CHECK THESE DEFINES */ +#define ELF64_ST_BIND(i) ((i) >> 8) +#define ELF64_ST_TYPE(i) ((i) & 0xffffffffL) +#define ELF64_ST_INFO(b, t) (((b) << 8) + ((t) & 0xffffffffL)) + +struct Elf64_Rel { + Elf64_Addr r_offset; + Elf64_Xword r_info; + +#ifdef __cplusplus + uint8 SymbolIndex() const; + uint8 Type() const; +#endif +}; + +#ifdef __cplusplus +struct Elf64_Rela : public Elf64_Rel { +#else +struct Elf64_Rela { + Elf64_Addr r_offset; + Elf64_Xword r_info; +#endif + Elf64_Sxword r_addend; +}; + +#define ELF64_R_SYM(i) ((i) >> 32) +#define ELF64_R_TYPE(i) ((i) & 0xffffffffL) +#define ELF64_R_INFO(s,t) (((s) << 32) + ((t) & 0xffffffffL)) + +struct Elf64_Dyn { + Elf64_Sxword d_tag; + union { + Elf64_Xword d_val; + Elf64_Addr d_ptr; + } d_un; +}; + +/* version definition section */ +/* TODO: ELF64 VERSION TABLES are guesses. Look up structure */ +struct Elf64_Verdef { + Elf64_Half vd_version; /* version revision */ + Elf64_Half vd_flags; /* version information flags */ + Elf64_Half vd_ndx; /* version index as specified in the + symbol version table */ + Elf64_Half vd_cnt; /* number of associated verdaux entries */ + Elf64_Word vd_hash; /* version name hash value */ + Elf64_Xword vd_aux; /* byte offset to verdaux array */ + Elf64_Xword vd_next; /* byte offset to next verdef entry */ +}; + +/* auxiliary version information */ + +struct Elf64_Verdaux { + Elf64_Word vda_name; /* string table offset to version or dependency + name */ + Elf64_Xword vda_next; /* byte offset to next verdaux entry */ +}; + +/* version dependency section */ + +struct Elf64_Verneed { + Elf64_Half vn_version; /* version of structure */ + Elf64_Half vn_cnt; /* number of associated vernaux entries */ + Elf64_Xword vn_file; /* byte offset to file name for this + dependency */ + Elf64_Xword vn_aux; /* byte offset to vernaux array */ + Elf64_Xword vn_next; /* byte offset to next verneed entry */ +}; + +/* auxiliary needed version information */ + +struct Elf64_Vernaux { + Elf64_Word vna_hash; /* dependency name hash value */ + Elf64_Half vna_flags; /* dependency specific information flags */ + Elf64_Half vna_other; /* version index as specified in the symbol + version table */ + Elf64_Xword vna_name; /* string table offset to dependency name */ + Elf64_Xword vna_next; /* byte offset to next vernaux entry */ +}; + +/*** inline functions ***/ + +#ifdef __cplusplus + +inline bool +Elf64_Ehdr::IsHostEndian() const +{ +#if B_HOST_IS_LENDIAN + return e_ident[EI_DATA] == ELFDATA2LSB; +#elif B_HOST_IS_BENDIAN + return e_ident[EI_DATA] == ELFDATA2MSB; +#endif +} + + +inline bool +Elf64_Phdr::IsReadWrite() const +{ + return !(~p_flags & (PF_READ | PF_WRITE)); +} + + +inline bool +Elf64_Phdr::IsExecutable() const +{ + return (p_flags & PF_PROTECTION_MASK) == (PF_READ | PF_EXECUTE); +} + + +inline uint8 +Elf64_Sym::Bind() const +{ + return ELF64_ST_BIND(st_info); +} + + +inline uint8 +Elf64_Sym::Type() const +{ + return ELF64_ST_TYPE(st_info); +} + + +inline uint8 +Elf64_Rel::SymbolIndex() const +{ + return ELF64_R_SYM(r_info); +} + + +inline uint8 +Elf64_Rel::Type() const +{ + return ELF64_R_TYPE(r_info); +} + +#endif /* __cplusplus */ + +#endif /* _ELF64_H_ */ Index: headers/private/system/arch/x86/arch_elf.h =================================================================== --- headers/private/system/arch/x86/arch_elf.h (revision 37496) +++ headers/private/system/arch/x86/arch_elf.h (working copy) @@ -19,4 +19,22 @@ #define R_386_GOTOFF 9 /* add GOT relative symbol address */ #define R_386_GOTPC 10 /* add PC relative GOT table address */ +#define R_X86_64_NONE 0 +#define R_X86_64_64 1 /* add symbol value */ +#define R_X86_64_PC32 2 /* add PC relative symbol value */ +#define R_X86_64_GOT32 3 /* add PC relative GOT offset */ +#define R_X86_64_PLT32 4 /* add PC relative PLT offset */ +#define R_X86_64_COPY 5 /* copy data from shared object */ +#define R_X86_64_GLOB_DAT 6 /* set GOT entry to data address */ +#define R_X86_64_JMP_SLOT 7 /* set GOT entry to code address */ +#define R_X86_64_RELATIVE 8 /* add load address of shared object */ +#define R_X86_64_GOTOFF 9 /* add GOT relative symbol address */ +#define R_X86_64_32 10 /* Add 32 bit zero extended symbol value */ +#define R_X86_64_32S 11 /* Add 32 bit sign extended symbol value */ +#define R_X86_64_16 12 /* Add 16 bit zero extended symbol value */ +#define R_X86_64_PC16 13 /* Add 16 bit signed extended pc relative symbol value */ +#define R_X86_64_8 14 /* Add 8 bit zero extended symbol value */ +#define R_X86_64_PC8 15 /* Add 8 bit signed extended pc relative symbol value */ + + #endif /* _KERNEL_ARCH_x86_ELF_H */ Index: headers/private/kernel/boot/addr_range.h =================================================================== --- headers/private/kernel/boot/addr_range.h (revision 37496) +++ headers/private/kernel/boot/addr_range.h (working copy) @@ -6,22 +6,21 @@ #ifndef KERNEL_BOOT_ADDR_RANGE_H #define KERNEL_BOOT_ADDR_RANGE_H - #include +#include typedef struct addr_range { - addr_t start; - size_t size; + FixedWidthPointer start; + size_t size; } addr_range; typedef struct phys_addr_range { - phys_addr_t start; + FixedWidthPointer start; phys_size_t size; } phys_addr_range; - #ifdef __cplusplus extern "C" { #endif Index: headers/private/kernel/elf_priv.h =================================================================== --- headers/private/kernel/elf_priv.h (revision 37496) +++ headers/private/kernel/elf_priv.h (working copy) @@ -10,6 +10,7 @@ #include +#include #include @@ -67,6 +68,7 @@ #define STRING(image, offset) ((char *)(&(image)->strtab[(offset)])) #define SYMNAME(image, sym) STRING(image, (sym)->st_name) #define SYMBOL(image, num) ((struct Elf32_Sym *)&(image)->syms[num]) +#define SYMBOL64(image, num) ((struct Elf64_Sym *)&(image)->syms[num]) #define HASHTABSIZE(image) ((image)->symhash[0]) #define HASHBUCKETS(image) ((unsigned int *)&(image)->symhash[2]) #define HASHCHAINS(image) ((unsigned int *)&(image)->symhash[2+HASHTABSIZE(image)]) Index: headers/private/kernel/util/FixedWidthPointer.h =================================================================== --- headers/private/kernel/util/FixedWidthPointer.h (revision 0) +++ headers/private/kernel/util/FixedWidthPointer.h (revision 0) @@ -0,0 +1,56 @@ +/* + * Distributed under the terms of the MIT License. + */ +#ifndef KERNEL_UTIL_FIXED_WIDTH_POINTER_H +#define KERNEL_UTIL_FIXED_WIDTH_POINTER_H + +#include + +#ifdef __cplusplus +template +class FixedWidthPointer { +public: + operator Type() const + { + return (Type)(addr_t)fValue; + } + operator void*() const + { + return (void*)fValue; + } + Type* operator*() const + { + return *(Type)*this; + } + Type operator->() const + { + return *this; + } + FixedWidthPointer operator=(Type pointer) + { + fValue = (addr_t)pointer; + return *this; + } + FixedWidthPointer operator+=(Type pointer) + { + fValue = fValue + (addr_t)pointer; + return *this; + } + bool operator==(const Type pointer) const + { + return fValue == (addr_t)pointer; + } + bool operator>=(const Type pointer) const + { + return fValue >= (addr_t)pointer; + } + bool operator<(const Type pointer) const + { + return fValue < (addr_t)pointer; + } +private: + uint64 fValue; +}; +#endif + +#endif // _KERNEL_UTIL_FIXED_WIDTH_POINTER_H