mirror of https://github.com/xemu-project/xemu.git
bsd-user: move arch specific defines out of elfload.c
Move the architecture specific defines to target_arch_elf.h and delete them from elfload.c. Only retain ifdefs appropriate for i386 and x86_64. Add the copyright/license comments, and guard ifdefs. Signed-off-by: Warner Losh <imp@bsdimp.com> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Warner Losh
parent
dd869a9665
commit
66ef252fab
|
|
@ -23,6 +23,8 @@
|
||||||
#include "disas/disas.h"
|
#include "disas/disas.h"
|
||||||
#include "qemu/path.h"
|
#include "qemu/path.h"
|
||||||
|
|
||||||
|
#include "target_arch_elf.h"
|
||||||
|
|
||||||
/* from personality.h */
|
/* from personality.h */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
@ -93,85 +95,6 @@ enum {
|
||||||
#define ELIBBAD 80
|
#define ELIBBAD 80
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef TARGET_I386
|
|
||||||
|
|
||||||
#define ELF_PLATFORM get_elf_platform()
|
|
||||||
|
|
||||||
static const char *get_elf_platform(void)
|
|
||||||
{
|
|
||||||
static char elf_platform[] = "i386";
|
|
||||||
int family = object_property_get_int(OBJECT(thread_cpu), "family", NULL);
|
|
||||||
if (family > 6)
|
|
||||||
family = 6;
|
|
||||||
if (family >= 3)
|
|
||||||
elf_platform[1] = '0' + family;
|
|
||||||
return elf_platform;
|
|
||||||
}
|
|
||||||
|
|
||||||
#define ELF_HWCAP get_elf_hwcap()
|
|
||||||
|
|
||||||
static uint32_t get_elf_hwcap(void)
|
|
||||||
{
|
|
||||||
X86CPU *cpu = X86_CPU(thread_cpu);
|
|
||||||
|
|
||||||
return cpu->env.features[FEAT_1_EDX];
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef TARGET_X86_64
|
|
||||||
#define ELF_START_MMAP 0x2aaaaab000ULL
|
|
||||||
#define elf_check_arch(x) (((x) == ELF_ARCH))
|
|
||||||
|
|
||||||
#define ELF_CLASS ELFCLASS64
|
|
||||||
#define ELF_DATA ELFDATA2LSB
|
|
||||||
#define ELF_ARCH EM_X86_64
|
|
||||||
|
|
||||||
static inline void init_thread(struct target_pt_regs *regs, struct image_info *infop)
|
|
||||||
{
|
|
||||||
regs->rax = 0;
|
|
||||||
regs->rsp = infop->start_stack;
|
|
||||||
regs->rip = infop->entry;
|
|
||||||
if (bsd_type == target_freebsd) {
|
|
||||||
regs->rdi = infop->start_stack;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#else /* !TARGET_X86_64 */
|
|
||||||
|
|
||||||
#define ELF_START_MMAP 0x80000000
|
|
||||||
|
|
||||||
/*
|
|
||||||
* This is used to ensure we don't load something for the wrong architecture.
|
|
||||||
*/
|
|
||||||
#define elf_check_arch(x) (((x) == EM_386) || ((x) == EM_486))
|
|
||||||
|
|
||||||
/*
|
|
||||||
* These are used to set parameters in the core dumps.
|
|
||||||
*/
|
|
||||||
#define ELF_CLASS ELFCLASS32
|
|
||||||
#define ELF_DATA ELFDATA2LSB
|
|
||||||
#define ELF_ARCH EM_386
|
|
||||||
|
|
||||||
static inline void init_thread(struct target_pt_regs *regs, struct image_info *infop)
|
|
||||||
{
|
|
||||||
regs->esp = infop->start_stack;
|
|
||||||
regs->eip = infop->entry;
|
|
||||||
|
|
||||||
/* SVR4/i386 ABI (pages 3-31, 3-32) says that when the program
|
|
||||||
starts %edx contains a pointer to a function which might be
|
|
||||||
registered using `atexit'. This provides a mean for the
|
|
||||||
dynamic linker to call DT_FINI functions for shared libraries
|
|
||||||
that have been loaded before the code runs.
|
|
||||||
|
|
||||||
A value of 0 tells we have no such handler. */
|
|
||||||
regs->edx = 0;
|
|
||||||
}
|
|
||||||
#endif /* !TARGET_X86_64 */
|
|
||||||
|
|
||||||
#define USE_ELF_CORE_DUMP
|
|
||||||
#define ELF_EXEC_PAGESIZE 4096
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef ELF_PLATFORM
|
#ifndef ELF_PLATFORM
|
||||||
#define ELF_PLATFORM (NULL)
|
#define ELF_PLATFORM (NULL)
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,81 @@
|
||||||
|
/*
|
||||||
|
* i386 ELF definitions
|
||||||
|
*
|
||||||
|
* Copyright (c) 2013 Stacey D. Son
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation; either version 2 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; if not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
#ifndef _TARGET_ARCH_ELF_H_
|
||||||
|
#define _TARGET_ARCH_ELF_H_
|
||||||
|
|
||||||
|
#define ELF_PLATFORM get_elf_platform()
|
||||||
|
|
||||||
|
static const char *get_elf_platform(void)
|
||||||
|
{
|
||||||
|
static char elf_platform[] = "i386";
|
||||||
|
int family = object_property_get_int(OBJECT(thread_cpu), "family", NULL);
|
||||||
|
if (family > 6) {
|
||||||
|
family = 6;
|
||||||
|
}
|
||||||
|
if (family >= 3) {
|
||||||
|
elf_platform[1] = '0' + family;
|
||||||
|
}
|
||||||
|
return elf_platform;
|
||||||
|
}
|
||||||
|
|
||||||
|
#define ELF_HWCAP get_elf_hwcap()
|
||||||
|
|
||||||
|
static uint32_t get_elf_hwcap(void)
|
||||||
|
{
|
||||||
|
X86CPU *cpu = X86_CPU(thread_cpu);
|
||||||
|
|
||||||
|
return cpu->env.features[FEAT_1_EDX];
|
||||||
|
}
|
||||||
|
|
||||||
|
#define ELF_START_MMAP 0x80000000
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This is used to ensure we don't load something for the wrong architecture.
|
||||||
|
*/
|
||||||
|
#define elf_check_arch(x) (((x) == EM_386) || ((x) == EM_486))
|
||||||
|
|
||||||
|
/*
|
||||||
|
* These are used to set parameters in the core dumps.
|
||||||
|
*/
|
||||||
|
#define ELF_CLASS ELFCLASS32
|
||||||
|
#define ELF_DATA ELFDATA2LSB
|
||||||
|
#define ELF_ARCH EM_386
|
||||||
|
|
||||||
|
static inline void init_thread(struct target_pt_regs *regs,
|
||||||
|
struct image_info *infop)
|
||||||
|
{
|
||||||
|
regs->esp = infop->start_stack;
|
||||||
|
regs->eip = infop->entry;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* SVR4/i386 ABI (pages 3-31, 3-32) says that when the program
|
||||||
|
* starts %edx contains a pointer to a function which might be
|
||||||
|
* registered using `atexit'. This provides a mean for the
|
||||||
|
* dynamic linker to call DT_FINI functions for shared libraries
|
||||||
|
* that have been loaded before the code runs.
|
||||||
|
*
|
||||||
|
* A value of 0 tells we have no such handler.
|
||||||
|
*/
|
||||||
|
regs->edx = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
#define USE_ELF_CORE_DUMP
|
||||||
|
#define ELF_EXEC_PAGESIZE 4096
|
||||||
|
|
||||||
|
#endif /* _TARGET_ARCH_ELF_H_ */
|
||||||
|
|
@ -0,0 +1,67 @@
|
||||||
|
/*
|
||||||
|
* x86_64 ELF definitions
|
||||||
|
*
|
||||||
|
* Copyright (c) 2013 Stacey D. Son
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation; either version 2 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; if not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
#ifndef _TARGET_ARCH_ELF_H_
|
||||||
|
#define _TARGET_ARCH_ELF_H_
|
||||||
|
|
||||||
|
#define ELF_PLATFORM get_elf_platform()
|
||||||
|
|
||||||
|
static const char *get_elf_platform(void)
|
||||||
|
{
|
||||||
|
static char elf_platform[] = "i386";
|
||||||
|
int family = object_property_get_int(OBJECT(thread_cpu), "family", NULL);
|
||||||
|
if (family > 6) {
|
||||||
|
family = 6;
|
||||||
|
}
|
||||||
|
if (family >= 3) {
|
||||||
|
elf_platform[1] = '0' + family;
|
||||||
|
}
|
||||||
|
return elf_platform;
|
||||||
|
}
|
||||||
|
|
||||||
|
#define ELF_HWCAP get_elf_hwcap()
|
||||||
|
|
||||||
|
static uint32_t get_elf_hwcap(void)
|
||||||
|
{
|
||||||
|
X86CPU *cpu = X86_CPU(thread_cpu);
|
||||||
|
|
||||||
|
return cpu->env.features[FEAT_1_EDX];
|
||||||
|
}
|
||||||
|
|
||||||
|
#define ELF_START_MMAP 0x2aaaaab000ULL
|
||||||
|
#define elf_check_arch(x) (((x) == ELF_ARCH))
|
||||||
|
|
||||||
|
#define ELF_CLASS ELFCLASS64
|
||||||
|
#define ELF_DATA ELFDATA2LSB
|
||||||
|
#define ELF_ARCH EM_X86_64
|
||||||
|
|
||||||
|
static inline void init_thread(struct target_pt_regs *regs,
|
||||||
|
struct image_info *infop)
|
||||||
|
{
|
||||||
|
regs->rax = 0;
|
||||||
|
regs->rsp = infop->start_stack;
|
||||||
|
regs->rip = infop->entry;
|
||||||
|
if (bsd_type == target_freebsd) {
|
||||||
|
regs->rdi = infop->start_stack;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#define USE_ELF_CORE_DUMP
|
||||||
|
#define ELF_EXEC_PAGESIZE 4096
|
||||||
|
|
||||||
|
#endif /* _TARGET_ARCH_ELF_H_ */
|
||||||
Loading…
Reference in New Issue