[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH for 6.2 05/49] bsd-user: move arch specific defines out of elfloa
From: |
Warner Losh |
Subject: |
[PATCH for 6.2 05/49] bsd-user: move arch specific defines out of elfload.c |
Date: |
Sat, 7 Aug 2021 15:41:58 -0600 |
Move the arcitecture specific defines to target_arch_elf.h and delete them from
elfload.c. unifdef as appropriate for i386 vs x86_64 versions.
Signed-off-by: Warner Losh <imp@bsdimp.com>
---
bsd-user/elfload.c | 81 +------------------------------
bsd-user/i386/target_arch_elf.h | 54 +++++++++++++++++++++
bsd-user/x86_64/target_arch_elf.h | 41 ++++++++++++++++
3 files changed, 97 insertions(+), 79 deletions(-)
create mode 100644 bsd-user/i386/target_arch_elf.h
create mode 100644 bsd-user/x86_64/target_arch_elf.h
diff --git a/bsd-user/elfload.c b/bsd-user/elfload.c
index fffa24f041..639673f5b7 100644
--- a/bsd-user/elfload.c
+++ b/bsd-user/elfload.c
@@ -23,6 +23,8 @@
#include "disas/disas.h"
#include "qemu/path.h"
+#include "target_arch_elf.h"
+
/* from personality.h */
/*
@@ -93,85 +95,6 @@ enum {
#define ELIBBAD 80
#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
#define ELF_PLATFORM (NULL)
#endif
diff --git a/bsd-user/i386/target_arch_elf.h b/bsd-user/i386/target_arch_elf.h
new file mode 100644
index 0000000000..084c9a7814
--- /dev/null
+++ b/bsd-user/i386/target_arch_elf.h
@@ -0,0 +1,54 @@
+
+#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
diff --git a/bsd-user/x86_64/target_arch_elf.h
b/bsd-user/x86_64/target_arch_elf.h
new file mode 100644
index 0000000000..08a86da1a5
--- /dev/null
+++ b/bsd-user/x86_64/target_arch_elf.h
@@ -0,0 +1,41 @@
+#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
--
2.32.0
- [PATCH for 6.2 00/49] bsd-user updates to run hello world, Warner Losh, 2021/08/07
- [PATCH for 6.2 02/49] bsd-user: add copyright header to elfload.c, Warner Losh, 2021/08/07
- [PATCH for 6.2 01/49] bsd-user: remove sparc and sparc64, Warner Losh, 2021/08/07
- [PATCH for 6.2 03/49] bsd-user: Add Stacey's copyright to main.c, Warner Losh, 2021/08/07
- [PATCH for 6.2 04/49] bsd-user: Remove all non-x86 code from elfload.c, Warner Losh, 2021/08/07
- [PATCH for 6.2 05/49] bsd-user: move arch specific defines out of elfload.c,
Warner Losh <=
- [PATCH for 6.2 07/49] bsd-user: style nits: apply qemu style to these files, Warner Losh, 2021/08/07
- [PATCH for 6.2 06/49] bsd-user: merge comments and guards from bsd-user fork, Warner Losh, 2021/08/07
- [PATCH for 6.2 08/49] bsd-user: style nits: fix whitespace issues to be qemu standard, Warner Losh, 2021/08/07
- [PATCH for 6.2 09/49] bsd-user: add license, Warner Losh, 2021/08/07
- [PATCH for 6.2 10/49] bsd-user: pass the bsd_param into loader_exec, Warner Losh, 2021/08/07