The goal is to kill the massive target ifdef ladder in elfload.c.

The functions get moved to linux-user/target/elfload.c.
The macros get moved to linux-user/target/target_elf.h.
These are mostly use to parameterize include/elf.h or elfload.c.

The init_thread functions, storing into target_pt_regs, have been
merged with target_cpu_copy_regs, copying out of target_pt_regs
into CPUArchState.  Merging these found a few bits of silliness
where pt_regs fields were initialized but not used.  To encourage
this never to return, remove most target_pt_regs and hide the rest
within the relevant signal.c.

Changes for v2:
  - Cleanup semihosting user-only SYS_HEAPINFO.
  - No more weak functions.  Replaced with HAVE_* macros and
    strong fallback functions.  If the HAVE_* macro is missing
    and the target provides its own function, we'll get a link
    error for duplicate symbols.
  - No more target_coredump.c.inc.  This required killing
    target_elf_gregset_t so that the function signatures could
    match for all targets.
  - Misc other changes from review.


r~


Richard Henderson (95):
  semihosting: Retrieve stack top from image_info
  semihosting: Initialize heap once per process
  linux-user: Create target/elfload.c files
  linux-user: Move ppc uabi/asm/elf.h workaround to osdep.h
  linux-user: Move get_elf_cpu_model to target/elfload.c
  linux-user: Move get_elf_hwcap to {i386,x86_64}/elfload.c
  linux-user: Move hwcap functions to {arm,aarch64}/elfload.c
  linux-user: Move get_elf_hwcap to sparc/elfload.c
  linux-user: Move hwcap functions to ppc/elfload.c
  linux-user: Move get_elf_hwcap to loongarch64/elfload.c
  linux-user: Move get_elf_hwcap to mips/elfload.c
  linux-user: Move get_elf_hwcap to sh4/elfload.c
  linux-user: Move hwcap functions to s390x/elfload.c
  linux-user: Move get_elf_hwcap to riscv/elfload.c
  linux-user: Remove ELF_HWCAP
  linux-user: Remove ELF_HWCAP2
  linux-user: Move get_elf_platform to {i386,x86_64}/elfload.c
  linux-user/i386: Return const data from get_elf_platform
  linux-user: Move get_elf_platform to arm/elfload.c
  linux-user/loongarch64: Create get_elf_platform
  linux-user/hppa: Create get_elf_platform
  linux-user: Remove ELF_PLATFORM
  linux-user: Move get_elf_base_platform to mips/elfload.c
  linux-user: Move target_cpu_copy_regs decl to qemu.h
  linux-user: Create do_init_main_thread
  linux-user/i386: Create init_main_thread
  linux-user/arm: Create init_main_thread
  linux-user/arm: Remove a.out startup remenents
  linux-user/aarch64: Create init_main_thread
  linux-user/sparc: Create init_main_thread
  linux-user/ppc: Create init_main_thread
  linux-user/loongarch64: Create init_main_thread
  linux-user/mips: Create init_main_thread
  linux-user/microblaze: Create init_main_thread
  linux-user/openrisc: Create init_main_thread
  linux-user/sh4: Create init_main_thread
  linux-user/m68k: Create init_main_thread
  linux-user/alpha: Create init_main_thread
  linux-user/s390x: Create init_main_thread
  linux-user/riscv: Create init_main_thread
  linux-user/hppa: Create init_main_thread
  linux-user/xtensa: Create init_main_thread
  linux-user/hexagon: Create init_main_thread
  linux-user: Remove do_init_main_thread
  linux-user: Remove target_elf_greg_t
  linux-user: Replace tswapreg with tswapl
  linux-user: Unify elf_core_copy_regs signatures
  linux-user: Declare elf_core_copy_regs in loader.h
  linux-user: Remove USE_ELF_CORE_DUMP
  linux-user: Move elf_core_copy_regs to {i386,x86_64}/elfload.c
  linux-user: Move elf_core_copy_regs to arm/elfload.c
  linux-user: Move elf_core_copy_regs to aarch64/elfload.c
  linux-user: Move elf_core_copy_regs to ppc/elfload.c
  linux-user: Move elf_core_copy_regs to loongarch64/elfload.c
  linux-user: Move elf_core_copy_regs to mips/elfload.c
  linux-user: Move elf_core_copy_regs to microblaze/elfload.c
  linux-user: Move elf_core_copy_regs to openrisc/elfload.c
  linux-user: Move elf_core_copy_regs to sh4/elfload.c
  linux-user: Move elf_core_copy_regs to m68k/elfload.c
  linux-user: Move elf_core_copy_regs to s390x/elfload.c
  linux-user: Move elf_core_copy_regs to xtensa/elfload.c
  linux-user: Move init_guest_commpage to x86_64/elfload.c
  linux-user: Move init_guest_commpage to arm/elfload.c
  linux-user: Move init_guest_commpage to hppa/elfload.c
  linux-user: Replace init_guest_commpage macro with function
  linux-user: Move get_vdso_image_info to arm/elfload.c
  linux-user: Remove ELF_EXEC_PAGESIZE
  linux-user: Remove redundant ELF_DATA definitons
  linux-user: Move elf parameters to {i386,x86_64}/target_elf.h
  linux-user: Move elf parameters to {arm,aarch64}/target_elf.h
  linux-user: Move elf parameters to sparc/target_elf.h
  linux-user: Move elf parameters to ppc/target_elf.h
  linux-user: Move elf parameters to loongarch64/target_elf.h
  linux-user: Move elf parameters to {mips,mips64}/target_elf.h
  linux-user: Move elf parameters to microblaze/target_elf.h
  linux-user: Move elf parameters to openrisc/target_elf.h
  linux-user: Move elf parameters to sh4/target_elf.h
  linux-user: Move elf parameters to m68k/target_elf.h
  linux-user: Move elf parameters to alpha/target_elf.h
  linux-user: Move elf parameters to s390x/target_elf.h
  linux-user: Move elf parameters to riscv/target_elf.h
  linux-user: Move elf parameters to hppa/target_elf.h
  linux-user: Move elf parameters to xtensa/target_elf.h
  linux-user: Move elf parameters to hexagon/target_elf.h
  linux-user: Standardize on ELF_MACHINE not ELF_ARCH
  linux-user: Rename elf_check_arch
  linux-user: Remove ELIBBAD from elfload.c
  linux-user: Remove MAP_DENYWRITE from elfload.c
  linux-user: Move arch_parse_elf_property to aarch64/elfload.c
  linux-user: Remove a.out declarations from elfload.c
  linux-user/sparc: Move target_pt_regs to signal.c
  linux-user/microblaze: Move target_pt_regs to signal.c
  linux-user/openrisc: Move target_pt_regs to signal.c
  linux-user/s390x: Move target_psw_t to signal.c
  linux-user: Remove struct target_pt_regs from target_syscall.h

 include/qemu/osdep.h                    |    8 +
 include/user/cpu_loop.h                 |    4 -
 linux-user/aarch64/target_elf.h         |   21 +-
 linux-user/aarch64/target_syscall.h     |    7 -
 linux-user/alpha/target_elf.h           |    8 +-
 linux-user/alpha/target_syscall.h       |   40 -
 linux-user/arm/target_elf.h             |   17 +-
 linux-user/arm/target_proc.h            |    4 +-
 linux-user/arm/target_syscall.h         |    8 -
 linux-user/hexagon/target_elf.h         |   30 +-
 linux-user/hexagon/target_syscall.h     |    5 -
 linux-user/hppa/target_elf.h            |   15 +-
 linux-user/hppa/target_syscall.h        |   18 -
 linux-user/i386/target_elf.h            |   38 +-
 linux-user/i386/target_syscall.h        |   18 -
 linux-user/loader.h                     |   36 +-
 linux-user/loongarch64/target_elf.h     |   16 +-
 linux-user/loongarch64/target_syscall.h |   23 -
 linux-user/m68k/target_elf.h            |   15 +-
 linux-user/m68k/target_syscall.h        |   16 -
 linux-user/microblaze/target_elf.h      |   12 +-
 linux-user/microblaze/target_syscall.h  |   44 -
 linux-user/mips/target_elf.h            |   21 +-
 linux-user/mips/target_syscall.h        |   19 -
 linux-user/mips64/target_elf.h          |   43 +-
 linux-user/mips64/target_syscall.h      |   16 -
 linux-user/openrisc/target_elf.h        |   11 +-
 linux-user/openrisc/target_syscall.h    |   11 -
 linux-user/ppc/target_elf.h             |   50 +-
 linux-user/ppc/target_syscall.h         |   28 -
 linux-user/qemu.h                       |    8 +-
 linux-user/riscv/target_elf.h           |   17 +-
 linux-user/riscv/target_syscall.h       |   35 -
 linux-user/s390x/target_elf.h           |   14 +-
 linux-user/s390x/target_proc.h          |    2 +-
 linux-user/s390x/target_syscall.h       |   22 -
 linux-user/sh4/target_elf.h             |   13 +-
 linux-user/sh4/target_syscall.h         |   11 -
 linux-user/sparc/target_elf.h           |   18 +-
 linux-user/sparc/target_syscall.h       |   19 -
 linux-user/x86_64/target_elf.h          |   21 +-
 linux-user/x86_64/target_syscall.h      |   28 -
 linux-user/xtensa/target_elf.h          |    9 +-
 linux-user/xtensa/target_syscall.h      |   35 -
 hw/core/loader.c                        |    4 -
 linux-user/aarch64/cpu_loop.c           |   22 +-
 linux-user/aarch64/elfload.c            |  378 ++++
 linux-user/alpha/cpu_loop.c             |   11 +-
 linux-user/alpha/elfload.c              |   11 +
 linux-user/arm/cpu_loop.c               |   75 +-
 linux-user/arm/elfload.c                |  276 +++
 linux-user/elfload.c                    | 2159 +----------------------
 linux-user/hexagon/cpu_loop.c           |    8 +-
 linux-user/hexagon/elfload.c            |   35 +
 linux-user/hppa/cpu_loop.c              |   18 +-
 linux-user/hppa/elfload.c               |   47 +
 linux-user/i386/cpu_loop.c              |   48 +-
 linux-user/i386/elfload.c               |   46 +
 linux-user/linuxload.c                  |    6 +-
 linux-user/loongarch64/cpu_loop.c       |   11 +-
 linux-user/loongarch64/elfload.c        |   83 +
 linux-user/m68k/cpu_loop.c              |   32 +-
 linux-user/m68k/elfload.c               |   42 +
 linux-user/main.c                       |   13 +-
 linux-user/microblaze/cpu_loop.c        |   39 +-
 linux-user/microblaze/elfload.c         |   28 +
 linux-user/microblaze/signal.c          |   44 +
 linux-user/mips/cpu_loop.c              |   16 +-
 linux-user/mips/elfload.c               |  165 ++
 linux-user/mips64/elfload.c             |    1 +
 linux-user/openrisc/cpu_loop.c          |   11 +-
 linux-user/openrisc/elfload.c           |   22 +
 linux-user/openrisc/signal.c            |    9 +-
 linux-user/ppc/cpu_loop.c               |   26 +-
 linux-user/ppc/elfload.c                |  150 ++
 linux-user/riscv/cpu_loop.c             |   15 +-
 linux-user/riscv/elfload.c              |   23 +
 linux-user/s390x/cpu_loop.c             |   15 +-
 linux-user/s390x/elfload.c              |   93 +
 linux-user/s390x/signal.c               |    5 +
 linux-user/sh4/cpu_loop.c               |   10 +-
 linux-user/sh4/elfload.c                |   66 +
 linux-user/sparc/cpu_loop.c             |   16 +-
 linux-user/sparc/elfload.c              |   42 +
 linux-user/sparc/signal.c               |   20 +
 linux-user/x86_64/elfload.c             |   72 +
 linux-user/xtensa/cpu_loop.c            |   22 +-
 linux-user/xtensa/elfload.c             |   43 +
 semihosting/arm-compat-semi.c           |   28 +-
 meson.build                             |    6 +-
 90 files changed, 2255 insertions(+), 2911 deletions(-)
 create mode 100644 linux-user/aarch64/elfload.c
 create mode 100644 linux-user/alpha/elfload.c
 create mode 100644 linux-user/arm/elfload.c
 create mode 100644 linux-user/hexagon/elfload.c
 create mode 100644 linux-user/hppa/elfload.c
 create mode 100644 linux-user/i386/elfload.c
 create mode 100644 linux-user/loongarch64/elfload.c
 create mode 100644 linux-user/m68k/elfload.c
 create mode 100644 linux-user/microblaze/elfload.c
 create mode 100644 linux-user/mips/elfload.c
 create mode 100644 linux-user/mips64/elfload.c
 create mode 100644 linux-user/openrisc/elfload.c
 create mode 100644 linux-user/ppc/elfload.c
 create mode 100644 linux-user/riscv/elfload.c
 create mode 100644 linux-user/s390x/elfload.c
 create mode 100644 linux-user/sh4/elfload.c
 create mode 100644 linux-user/sparc/elfload.c
 create mode 100644 linux-user/x86_64/elfload.c
 create mode 100644 linux-user/xtensa/elfload.c

-- 
2.43.0


Reply via email to