OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

meson: linux-user

Browse Source 
The most interesting or most complicated part here is the syscall_nr.h
generators.  In order to keep the generation logic all in meson.build,
I am adding to config_target the name of the .tbl file, and making the
generated file syscall<SUFFIX>_nr.h for input file syscall<SUFFIX>.tbl.

For architectures where the input file is not named syscall_nr.tbl,
syscall_nr.h has to be a source file; it's just a forwarder for x86
(i386/x86_64), while for MIPS64 it chooses between N32 and N64 ABIs.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Marc-André Lureau 2019-08-18 16:13:08 +04:00 committed by Paolo Bonzini
parent 1a82878a08
commit 3a30446aed
41 changed files with 166 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.target
View File

@ -131,9 +131,6 @@ QEMU_CFLAGS+=-I$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR) \
-I$(SRC_PATH)/linux-user \
-Ilinux-user/$(TARGET_ABI_DIR)
obj-y += linux-user/
obj-y += gdbstub.o thunk.o
endif #CONFIG_LINUX_USER
#########################################################

27
configure vendored
View File

@ -1992,20 +1992,6 @@ fi
# Remove old dependency files to make sure that they get properly regenerated
rm -f */config-devices.mak.d
# Remove syscall_nr.h to be sure they will be regenerated in the build
# directory, not in the source directory
for arch in alpha hppa m68k xtensa sh4 microblaze arm ppc s390x sparc sparc64 \
i386 x86_64 mips mips64 ; do
# remove the file if it has been generated in the source directory
rm -f "${source_path}/linux-user/${arch}/syscall_nr.h"
# remove the dependency files
for target in ${arch}*-linux-user ; do
test -d "${target}" && find "${target}" -type f -name "*.d" \
-exec grep -q "${source_path}/linux-user/${arch}/syscall_nr.h" {} \; \
-print | while read file ; do rm "${file}" "${file%.d}.o" ; done
done
done
if test -z "$python"
then
error_exit "Python not found. Use --python=/path/to/python"
@ -7999,18 +7985,22 @@ gdb_xml_files=""
TARGET_ARCH="$target_name"
TARGET_BASE_ARCH=""
TARGET_ABI_DIR=""
TARGET_SYSTBL_ABI=""
TARGET_SYSTBL=""
case "$target_name" in
i386)
mttcg="yes"
gdb_xml_files="i386-32bit.xml"
TARGET_SYSTBL_ABI=i386
TARGET_SYSTBL=syscall_32.tbl
;;
x86_64)
TARGET_BASE_ARCH=i386
TARGET_SYSTBL_ABI=common,64
TARGET_SYSTBL=syscall_64.tbl
mttcg="yes"
gdb_xml_files="i386-64bit.xml"
gdb_xml_files="i386-64bit.xml"
;;
alpha)
mttcg="yes"
@ -8058,6 +8048,7 @@ case "$target_name" in
TARGET_ARCH=mips
echo "TARGET_ABI_MIPSO32=y" >> $config_target_mak
TARGET_SYSTBL_ABI=o32
TARGET_SYSTBL=syscall_o32.tbl
;;
mipsn32|mipsn32el)
mttcg="yes"
@ -8066,6 +8057,7 @@ case "$target_name" in
echo "TARGET_ABI_MIPSN32=y" >> $config_target_mak
echo "TARGET_ABI32=y" >> $config_target_mak
TARGET_SYSTBL_ABI=n32
TARGET_SYSTBL=syscall_n32.tbl
;;
mips64|mips64el)
mttcg="no"
@ -8073,6 +8065,7 @@ case "$target_name" in
TARGET_BASE_ARCH=mips
echo "TARGET_ABI_MIPSN64=y" >> $config_target_mak
TARGET_SYSTBL_ABI=n64
TARGET_SYSTBL=syscall_n64.tbl
;;
moxie)
;;
@ -8171,6 +8164,9 @@ esac
if [ "$TARGET_BASE_ARCH" = "" ]; then
TARGET_BASE_ARCH=$TARGET_ARCH
fi
if [ "$TARGET_SYSTBL_ABI" != "" ] && [ "$TARGET_SYSTBL" = "" ]; then
TARGET_SYSTBL=syscall.tbl
fi
symlink "$source_path/Makefile.target" "$target_dir/Makefile"
@ -8191,6 +8187,7 @@ if [ "$HOST_VARIANT_DIR" != "" ]; then
fi
if [ "$TARGET_SYSTBL_ABI" != "" ]; then
echo "TARGET_SYSTBL_ABI=$TARGET_SYSTBL_ABI" >> $config_target_mak
echo "TARGET_SYSTBL=$TARGET_SYSTBL" >> $config_target_mak
fi
if supported_xen_target $target; then

25
linux-user/Makefile.objs
View File

@ -1,25 +0,0 @@
obj-y = main.o syscall.o strace.o mmap.o signal.o \
elfload.o linuxload.o uaccess.o uname.o \
safe-syscall.o $(TARGET_ABI_DIR)/signal.o \
$(TARGET_ABI_DIR)/cpu_loop.o exit.o fd-trans.o
obj-$(TARGET_HAS_BFLT) += flatload.o
obj-$(TARGET_I386) += vm86.o
obj-$(TARGET_AARCH64) += arm/semihost.o
obj-$(TARGET_ALPHA) += alpha/
obj-$(TARGET_ARM) += arm/
obj-$(TARGET_HPPA) += hppa/
obj-$(TARGET_I386) += i386/
obj-$(TARGET_M68K) += m68k/
obj-$(TARGET_MICROBLAZE) += microblaze/
obj-$(TARGET_MIPS) += mips/
obj-$(TARGET_MIPS64) += mips64/
obj-$(TARGET_PPC) += ppc/
obj-$(TARGET_PPC64) += ppc/
obj-$(TARGET_S390X) += s390x/
obj-$(TARGET_SH4) += sh4/
obj-$(TARGET_SPARC) += sparc/
obj-$(TARGET_SPARC64) += $(TARGET_ABI_DIR)/
obj-$(TARGET_X86_64) += x86_64/
obj-$(TARGET_XTENSA) += xtensa/

5
linux-user/alpha/Makefile.objs
View File

@ -1,5 +0,0 @@
generated-files-y += linux-user/alpha/syscall_nr.h
syshdr := $(SRC_PATH)/linux-user/alpha/syscallhdr.sh
%/syscall_nr.h: $(SRC_PATH)/linux-user/alpha/syscall.tbl $(syshdr)
$(call quiet-command, sh $(syshdr) $< $@ $(TARGET_SYSTBL_ABI),"GEN","$@")

5
linux-user/alpha/meson.build Normal file
View File

@ -0,0 +1,5 @@
syscall_nr_generators += {
'alpha': generator(sh,
arguments: [ meson.current_source_dir() / 'syscallhdr.sh', '@INPUT@', '@OUTPUT@', '@EXTRA_ARGS@' ],
output: '@BASENAME@_nr.h')
}

8
linux-user/arm/Makefile.objs
View File

@ -1,8 +0,0 @@
obj-$(TARGET_ARM) += nwfpe/
obj-$(TARGET_ARM) += semihost.o
generated-files-y += linux-user/arm/syscall_nr.h
syshdr := $(SRC_PATH)/linux-user/arm/syscallhdr.sh
%/syscall_nr.h: $(SRC_PATH)/linux-user/arm/syscall.tbl $(syshdr)
$(call quiet-command, sh $(syshdr) $< $@ $(TARGET_SYSTBL_ABI),"GEN","$@")

10
linux-user/arm/meson.build Normal file
View File

@ -0,0 +1,10 @@
linux_user_ss.add(when: 'TARGET_AARCH64', if_true: files('semihost.c'))
linux_user_ss.add(when: 'TARGET_ARM', if_true: files('semihost.c'))
subdir('nwfpe')
syscall_nr_generators += {
'arm': generator(sh,
arguments: [ meson.current_source_dir() / 'syscallhdr.sh', '@INPUT@', '@OUTPUT@', '@EXTRA_ARGS@' ],
output: '@BASENAME@_nr.h')
}

2
linux-user/arm/nwfpe/Makefile.objs
View File

@ -1,2 +0,0 @@
obj-y = fpa11.o fpa11_cpdo.o fpa11_cpdt.o fpa11_cprt.o fpopcode.o
obj-y += single_cpdo.o double_cpdo.o extended_cpdo.o

10
linux-user/arm/nwfpe/meson.build Normal file
View File

@ -0,0 +1,10 @@
linux_user_ss.add(when: 'TARGET_ARM', if_true: files(
'double_cpdo.c',
'extended_cpdo.c',
'fpa11.c',
'fpa11_cpdo.c',
'fpa11_cpdt.c',
'fpa11_cprt.c',
'fpopcode.c',
'single_cpdo.c',
))

5
linux-user/hppa/Makefile.objs
View File

@ -1,5 +0,0 @@
generated-files-y += linux-user/hppa/syscall_nr.h
syshdr := $(SRC_PATH)/linux-user/hppa/syscallhdr.sh
%/syscall_nr.h: $(SRC_PATH)/linux-user/hppa/syscall.tbl $(syshdr)
$(call quiet-command, sh $(syshdr) $< $@ $(TARGET_SYSTBL_ABI),"GEN","$@")

5
linux-user/hppa/meson.build Normal file
View File

@ -0,0 +1,5 @@
syscall_nr_generators += {
'hppa': generator(sh,
arguments: [ meson.current_source_dir() / 'syscallhdr.sh', '@INPUT@', '@OUTPUT@', '@EXTRA_ARGS@' ],
output: '@BASENAME@_nr.h')
}

5
linux-user/i386/Makefile.objs
View File

@ -1,5 +0,0 @@
generated-files-y += linux-user/i386/syscall_nr.h
syshdr := $(SRC_PATH)/linux-user/i386/syscallhdr.sh
%/syscall_nr.h: $(SRC_PATH)/linux-user/i386/syscall_32.tbl $(syshdr)
$(call quiet-command, sh $(syshdr) $< $@ $(TARGET_SYSTBL_ABI),"GEN","$@")

5
linux-user/i386/meson.build Normal file
View File

@ -0,0 +1,5 @@
syscall_nr_generators += {
'i386': generator(sh,
arguments: [ meson.current_source_dir() / 'syscallhdr.sh', '@INPUT@', '@OUTPUT@', '@EXTRA_ARGS@' ],
output: '@BASENAME@_nr.h')
}

1
linux-user/i386/syscall_nr.h Normal file
View File

@ -0,0 +1 @@
#include "syscall_32_nr.h"

5
linux-user/m68k/Makefile.objs
View File

@ -1,5 +0,0 @@
generated-files-y += linux-user/m68k/syscall_nr.h
syshdr := $(SRC_PATH)/linux-user/m68k/syscallhdr.sh
%/syscall_nr.h: $(SRC_PATH)/linux-user/m68k/syscall.tbl $(syshdr)
$(call quiet-command, sh $(syshdr) $< $@ $(TARGET_SYSTBL_ABI),"GEN","$@")

5
linux-user/m68k/meson.build Normal file
View File

@ -0,0 +1,5 @@
syscall_nr_generators += {
'm68k': generator(sh,
arguments: [ meson.current_source_dir() / 'syscallhdr.sh', '@INPUT@', '@OUTPUT@', '@EXTRA_ARGS@' ],
output: '@BASENAME@_nr.h')
}

37
linux-user/meson.build Normal file
View File

@ -0,0 +1,37 @@
linux_user_ss.add(files(
'elfload.c',
'exit.c',
'fd-trans.c',
'linuxload.c',
'main.c',
'mmap.c',
'safe-syscall.S',
'signal.c',
'strace.c',
'syscall.c',
'uaccess.c',
'uname.c',
))
linux_user_ss.add(rt)
linux_user_ss.add(when: 'TARGET_HAS_BFLT', if_true: files('flatload.c'))
linux_user_ss.add(when: 'TARGET_I386', if_true: files('vm86.c'))
syscall_nr_generators = {}
subdir('alpha')
subdir('arm')
subdir('hppa')
subdir('i386')
subdir('m68k')
subdir('microblaze')
subdir('mips64')
subdir('mips')
subdir('ppc')
subdir('s390x')
subdir('sh4')
subdir('sparc64')
subdir('sparc')
subdir('x86_64')
subdir('xtensa')

5
linux-user/microblaze/Makefile.objs
View File

@ -1,5 +0,0 @@
generated-files-y += linux-user/microblaze/syscall_nr.h
syshdr := $(SRC_PATH)/linux-user/microblaze/syscallhdr.sh
%/syscall_nr.h: $(SRC_PATH)/linux-user/microblaze/syscall.tbl $(syshdr)
$(call quiet-command, sh $(syshdr) $< $@ $(TARGET_SYSTBL_ABI),"GEN","$@")

5
linux-user/microblaze/meson.build Normal file
View File

@ -0,0 +1,5 @@
syscall_nr_generators += {
'microblaze': generator(sh,
arguments: [ meson.current_source_dir() / 'syscallhdr.sh', '@INPUT@', '@OUTPUT@', '@EXTRA_ARGS@' ],
output: '@BASENAME@_nr.h')
}

5
linux-user/mips/Makefile.objs
View File

@ -1,5 +0,0 @@
generated-files-y += linux-user/mips/syscall_nr.h
syshdr := $(SRC_PATH)/linux-user/mips/syscallhdr.sh
%/syscall_nr.h: $(SRC_PATH)/linux-user/mips/syscall_o32.tbl $(syshdr)
$(call quiet-command, sh $(syshdr) $< $@ $(TARGET_SYSTBL_ABI) "" 4000,"GEN","$@")

6
linux-user/mips/meson.build Normal file
View File

@ -0,0 +1,6 @@
syscall_nr_generators += {
'mips': generator(sh,
arguments: [ meson.current_source_dir() / 'syscallhdr.sh', '@INPUT@', '@OUTPUT@', '@EXTRA_ARGS@',
'', '4000' ],
output: '@BASENAME@_nr.h')
}

1
linux-user/mips/syscall_nr.h Normal file
View File

@ -0,0 +1 @@
#include "syscall_o32_nr.h"

12
linux-user/mips64/Makefile.objs
View File

@ -1,12 +0,0 @@
generated-files-y += linux-user/$(TARGET_ABI_DIR)/syscall_nr.h
syshdr := $(SRC_PATH)/linux-user/$(TARGET_ABI_DIR)/syscallhdr.sh
ifeq ($(TARGET_SYSTBL_ABI),n32)
%/syscall_nr.h: $(SRC_PATH)/linux-user/$(TARGET_ABI_DIR)/syscall_n32.tbl $(syshdr)
$(call quiet-command, sh $(syshdr) $< $@ n32 "" 6000,"GEN","$@")
endif
ifeq ($(TARGET_SYSTBL_ABI),n64)
%/syscall_nr.h: $(SRC_PATH)/linux-user/$(TARGET_ABI_DIR)/syscall_n64.tbl $(syshdr)
$(call quiet-command, sh $(syshdr) $< $@ n64 "" 5000,"GEN","$@")
endif

6
linux-user/mips64/meson.build Normal file
View File

@ -0,0 +1,6 @@
syscall_nr_generators += {
'mips64': generator(sh,
arguments: [ meson.current_source_dir() / 'syscallhdr.sh', '@INPUT@', '@OUTPUT@', '@EXTRA_ARGS@',
'', 'TARGET_SYSCALL_OFFSET' ],
output: '@BASENAME@_nr.h')
}

7
linux-user/mips64/syscall_nr.h Normal file
View File

@ -0,0 +1,7 @@
#ifdef TARGET_ABI_MIPSN32
#define TARGET_SYSCALL_OFFSET 6000
#include "syscall_n32_nr.h"
#else
#define TARGET_SYSCALL_OFFSET 5000
#include "syscall_n64_nr.h"
#endif

6
linux-user/ppc/Makefile.objs
View File

@ -1,6 +0,0 @@
generated-files-y += linux-user/$(TARGET_ABI_DIR)/syscall_nr.h
syshdr := $(SRC_PATH)/linux-user/$(TARGET_ABI_DIR)/syscallhdr.sh
%/syscall_nr.h: $(SRC_PATH)/linux-user/$(TARGET_ABI_DIR)/syscall.tbl $(syshdr)
$(call quiet-command, sh $(syshdr) $< $@ $(TARGET_SYSTBL_ABI),"GEN","$@")

5
linux-user/ppc/meson.build Normal file
View File

@ -0,0 +1,5 @@
syscall_nr_generators += {
'ppc': generator(sh,
arguments: [ meson.current_source_dir() / 'syscallhdr.sh', '@INPUT@', '@OUTPUT@', '@EXTRA_ARGS@' ],
output: '@BASENAME@_nr.h')
}

5
linux-user/s390x/Makefile.objs
View File

@ -1,5 +0,0 @@
generated-files-y += linux-user/s390x/syscall_nr.h
syshdr := $(SRC_PATH)/linux-user/s390x/syscallhdr.sh
%/syscall_nr.h: $(SRC_PATH)/linux-user/s390x/syscall.tbl $(syshdr)
$(call quiet-command, sh $(syshdr) $< $@ $(TARGET_SYSTBL_ABI),"GEN","$@")

5
linux-user/s390x/meson.build Normal file
View File

@ -0,0 +1,5 @@
syscall_nr_generators += {
's390x': generator(sh,
arguments: [ meson.current_source_dir() / 'syscallhdr.sh', '@INPUT@', '@OUTPUT@', '@EXTRA_ARGS@' ],
output: '@BASENAME@_nr.h')
}

5
linux-user/sh4/Makefile.objs
View File

@ -1,5 +0,0 @@
generated-files-y += linux-user/sh4/syscall_nr.h
syshdr := $(SRC_PATH)/linux-user/sh4/syscallhdr.sh
%/syscall_nr.h: $(SRC_PATH)/linux-user/sh4/syscall.tbl $(syshdr)
$(call quiet-command, sh $(syshdr) $< $@ $(TARGET_SYSTBL_ABI),"GEN","$@")

5
linux-user/sh4/meson.build Normal file
View File

@ -0,0 +1,5 @@
syscall_nr_generators += {
'sh4': generator(sh,
arguments: [ meson.current_source_dir() / 'syscallhdr.sh', '@INPUT@', '@OUTPUT@', '@EXTRA_ARGS@' ],
output: '@BASENAME@_nr.h')
}

5
linux-user/sparc/Makefile.objs
View File

@ -1,5 +0,0 @@
generated-files-y += linux-user/sparc/syscall_nr.h
syshdr := $(SRC_PATH)/linux-user/sparc/syscallhdr.sh
%/syscall_nr.h: $(SRC_PATH)/linux-user/sparc/syscall.tbl $(syshdr)
$(call quiet-command, sh $(syshdr) $< $@ $(TARGET_SYSTBL_ABI),"GEN","$@")

5
linux-user/sparc/meson.build Normal file
View File

@ -0,0 +1,5 @@
syscall_nr_generators += {
'sparc': generator(sh,
arguments: [ meson.current_source_dir() / 'syscallhdr.sh', '@INPUT@', '@OUTPUT@', '@EXTRA_ARGS@' ],
output: '@BASENAME@_nr.h')
}

5
linux-user/sparc64/Makefile.objs
View File

@ -1,5 +0,0 @@
generated-files-y += linux-user/sparc64/syscall_nr.h
syshdr := $(SRC_PATH)/linux-user/sparc64/syscallhdr.sh
%/syscall_nr.h: $(SRC_PATH)/linux-user/sparc/syscall.tbl $(syshdr)
$(call quiet-command, sh $(syshdr) $< $@ $(TARGET_SYSTBL_ABI),"GEN","$@")

5
linux-user/sparc64/meson.build Normal file
View File

@ -0,0 +1,5 @@
syscall_nr_generators += {
'sparc64': generator(sh,
arguments: [ meson.current_source_dir() / 'syscallhdr.sh', '@INPUT@', '@OUTPUT@', '@EXTRA_ARGS@' ],
output: '@BASENAME@_nr.h')
}

5
linux-user/x86_64/Makefile.objs
View File

@ -1,5 +0,0 @@
generated-files-y += linux-user/x86_64/syscall_nr.h
syshdr := $(SRC_PATH)/linux-user/x86_64/syscallhdr.sh
%/syscall_nr.h: $(SRC_PATH)/linux-user/x86_64/syscall_64.tbl $(syshdr)
$(call quiet-command, sh $(syshdr) $< $@ $(TARGET_SYSTBL_ABI),"GEN","$@")

5
linux-user/x86_64/meson.build Normal file
View File

@ -0,0 +1,5 @@
syscall_nr_generators += {
'x86_64': generator(sh,
arguments: [ meson.current_source_dir() / 'syscallhdr.sh', '@INPUT@', '@OUTPUT@', '@EXTRA_ARGS@' ],
output: '@BASENAME@_nr.h')
}

1
linux-user/x86_64/syscall_nr.h Normal file
View File

@ -0,0 +1 @@
#include "syscall_64_nr.h"

5
linux-user/xtensa/Makefile.objs
View File

@ -1,5 +0,0 @@
generated-files-y += linux-user/xtensa/syscall_nr.h
syshdr := $(SRC_PATH)/linux-user/xtensa/syscallhdr.sh
%/syscall_nr.h: $(SRC_PATH)/linux-user/xtensa/syscall.tbl $(syshdr)
$(call quiet-command, sh $(syshdr) $< $@ $(TARGET_SYSTBL_ABI),"GEN","$@")

5
linux-user/xtensa/meson.build Normal file
View File

@ -0,0 +1,5 @@
syscall_nr_generators += {
'xtensa': generator(sh,
arguments: [ meson.current_source_dir() / 'syscallhdr.sh', '@INPUT@', '@OUTPUT@', '@EXTRA_ARGS@' ],
output: '@BASENAME@_nr.h')
}

16
meson.build
View File

@ -705,6 +705,10 @@ subdir('net')
subdir('replay')
subdir('hw')
subdir('accel')
subdir('linux-user')
linux_user_ss.add(files('gdbstub.c', 'thunk.c'))
specific_ss.add_all(when: 'CONFIG_LINUX_USER', if_true: linux_user_ss)
# needed for fuzzing binaries
subdir('tests/qtest/libqos')
@ -802,6 +806,7 @@ foreach target : target_dirs
arch_srcs += config_devices_h[target]
else
abi = config_target['TARGET_ABI_DIR']
target_type='user'
qemu_target_name = 'qemu-' + target_name
if 'CONFIG_LINUX_USER' in config_target
@ -812,8 +817,17 @@ foreach target : target_dirs
endif
target_inc += include_directories(
base_dir,
base_dir / config_target['TARGET_ABI_DIR'],
base_dir / abi,
)
if 'CONFIG_LINUX_USER' in config_target
dir = base_dir / abi
arch_srcs += files(dir / 'signal.c', dir / 'cpu_loop.c')
if config_target.has_key('TARGET_SYSTBL_ABI')
arch_srcs += \
syscall_nr_generators[abi].process(base_dir / abi / config_target['TARGET_SYSTBL'],
extra_args : config_target['TARGET_SYSTBL_ABI'])
endif
endif
endif
t = target_arch[arch].apply(config_target, strict: false)