From nobody Fri May 3 11:23:16 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1600387136; cv=none; d=zohomail.com; s=zohoarc; b=XwST4aQtKyWNEC31TTwoBFcvN4XL/fF/fv0TAEjov81yHgSjfsa/Ryc9xa0o/auYa8OOMwnFmsZdUZF9MwabZkQ4nGB4XHHwVGTX5g5XoOw7Kjsz81TN1VKp9h540TYMfJWyKMyQHrCV9JCmklD3K3/FOMnT2FrLBaHoJndNsQs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600387136; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=KjFu5b4+hUYm8BG83d94xLZTJRSthOAw2tbe5KJR4AY=; b=lKh9J+cKl597EgDA0HoqfuV6Jj8CNE7ueBF3a9NT0I6ZeRA94vohTFJAWdNwQqzkpDkTN6BloJIO4N8YNaEZjDoWsMQgp8Kk71BkNluHTjQKKLHZ2Q/KVxlXXpyl5Z+4Ys5u0BqCEXxYEF1lFCCu8UT44EFL8aCaJngvlS7DluY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1600387136563125.5222032641368; Thu, 17 Sep 2020 16:58:56 -0700 (PDT) Received: from localhost ([::1]:35594 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kJ3ni-0005Nb-BM for importer@patchew.org; Thu, 17 Sep 2020 19:58:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36188) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJ3mL-0003kY-IL for qemu-devel@nongnu.org; Thu, 17 Sep 2020 19:57:29 -0400 Received: from mail-pf1-x443.google.com ([2607:f8b0:4864:20::443]:46475) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kJ3mI-0006dm-De for qemu-devel@nongnu.org; Thu, 17 Sep 2020 19:57:29 -0400 Received: by mail-pf1-x443.google.com with SMTP id b124so2240109pfg.13 for ; Thu, 17 Sep 2020 16:57:25 -0700 (PDT) Received: from localhost.localdomain ([71.212.141.89]) by smtp.gmail.com with ESMTPSA id m13sm772699pfk.103.2020.09.17.16.57.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Sep 2020 16:57:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KjFu5b4+hUYm8BG83d94xLZTJRSthOAw2tbe5KJR4AY=; b=KfhVp2HTT7bkyjIh9zrtJpPRKP0IbEi7QHDHIJPbfM4Wm+J6B9teDuZR/lKOqa5NvA 2r4FlCC3WoypuqizmkKUdm6VrH8wNTYGQqC8vrRiVuJZM0n6uls6ta6VTr8SKtfOpUuh ag4ocEgxvmj0ZeJbeqAzemdgrPWR64+elm8AA8iOwcoUKp/R9gnRe/Aw6N8n4MCozAzf 9c4iUv8eMA26sRb479a7R3w8DJAX2dFjp7GARjBx1ZBGv7S9uG5aCFv9/L5/fFLWKdEC aoD88AMOmphJ+Yk4lEbWY8LIoXeeKmbLxBwZWiXe3fLSBuufW2hBBtsnMavh681h8Ikd uGNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KjFu5b4+hUYm8BG83d94xLZTJRSthOAw2tbe5KJR4AY=; b=W3iB660VSSuTKAx5+12fNzJGrk47cAapdbYhoZbMD0yQlCG6iXuOdPt5YsHU81gsXX vFoImYmoSF6WVuTP3FQDkeP+0fi0buX/9DwRB/M6hZDmjrgoP+CNHkrGIsYDBBKBpcUs PPBa4qIjbesSUqZkrhVoMqWngyIJedJI7oOvgnj0ZivmSjycPO3j52c+kf2/tSJ596On /+eZHyI51HO6IPcbEZA6sKN0cqiyxcwKkUMf1bvnfYcey9vd/6DL34qpPj4LynCSBvJV 3ICkpl18Vhr0GuX25e7frEHPe7AfDDF4cXgFH+fAaXcR1OM4rAkG7Zy4H4QkzQGg0hgr A/3A== X-Gm-Message-State: AOAM531VK60Ko/LH2u8sfpy3htnopgpVm/q/4DxwoDz2FLCPd4f3TZmk tiHxdDhGeo3PIbOOFu9Pm0csrMTwWCHWOQ== X-Google-Smtp-Source: ABdhPJwtnthRfSD2he1+kEV8XWwVXoKPAZzJvn6/tDV498nuWhjZkJKeKP/6RrGLI3aNVy3ULE/B3w== X-Received: by 2002:a63:ea4f:: with SMTP id l15mr23755628pgk.434.1600387043928; Thu, 17 Sep 2020 16:57:23 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 01/10] capstone: Convert Makefile bits to meson bits Date: Thu, 17 Sep 2020 16:57:11 -0700 Message-Id: <20200917235720.2685978-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200917235720.2685978-1-richard.henderson@linaro.org> References: <20200917235720.2685978-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::443; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x443.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" There are better ways to do this, e.g. meson cmake subproject, but that requires cmake 3.7 and some of our CI environments only provide cmake 3.5. Nor can we add a meson.build file to capstone/, because the git submodule would then always report "untracked files". Fixing that would require creating our own branch on the qemu git mirror, at which point we could just as easily create a native meson subproject. Instead, build the library via the main meson.build. This improves the current state of affairs in that we will re-link the qemu executables against a changed libcapstone.a, which we wouldn't do before-hand. In addition, the use of the configuration header file instead of command-line -DEFINES means that we will rebuild the capstone objects with changes to meson.build. Signed-off-by: Richard Henderson Acked-by: Paolo Bonzini --- Cc: Paolo Bonzini v2: Further reduce probing in configure (paolo), Drop state 'internal' and use 'git' even when it isn't git. Move CONFIG_CAPSTONE to config_host_data. v3: Add Submodules separator; fix default in meson_options.txt. --- configure | 61 +++---------------------- Makefile | 16 ------- meson.build | 111 +++++++++++++++++++++++++++++++++++++++++++--- meson_options.txt | 4 ++ 4 files changed, 115 insertions(+), 77 deletions(-) diff --git a/configure b/configure index 7564479008..76636c430d 100755 --- a/configure +++ b/configure @@ -478,7 +478,7 @@ opengl=3D"" opengl_dmabuf=3D"no" cpuid_h=3D"no" avx2_opt=3D"" -capstone=3D"" +capstone=3D"auto" lzo=3D"" snappy=3D"" bzip2=3D"" @@ -1580,7 +1580,7 @@ for opt do ;; --enable-capstone) capstone=3D"yes" ;; - --enable-capstone=3Dgit) capstone=3D"git" + --enable-capstone=3Dgit) capstone=3D"internal" ;; --enable-capstone=3Dsystem) capstone=3D"system" ;; @@ -5128,51 +5128,11 @@ fi # capstone =20 case "$capstone" in - "" | yes) - if $pkg_config capstone; then - capstone=3Dsystem - elif test -e "${source_path}/.git" && test $git_update =3D 'yes' ; then - capstone=3Dgit - elif test -e "${source_path}/capstone/Makefile" ; then - capstone=3Dinternal - elif test -z "$capstone" ; then - capstone=3Dno - else - feature_not_found "capstone" "Install capstone devel or git submodul= e" - fi - ;; - - system) - if ! $pkg_config capstone; then - feature_not_found "capstone" "Install capstone devel" - fi - ;; -esac - -case "$capstone" in - git | internal) - if test "$capstone" =3D git; then + auto | yes | internal) + # Simpler to always update submodule, even if not needed. + if test -e "${source_path}/.git" && test $git_update =3D 'yes' ; then git_submodules=3D"${git_submodules} capstone" fi - mkdir -p capstone - if test "$mingw32" =3D "yes"; then - LIBCAPSTONE=3Dcapstone.lib - else - LIBCAPSTONE=3Dlibcapstone.a - fi - capstone_libs=3D"-Lcapstone -lcapstone" - capstone_cflags=3D"-I${source_path}/capstone/include" - ;; - - system) - capstone_libs=3D"$($pkg_config --libs capstone)" - capstone_cflags=3D"$($pkg_config --cflags capstone)" - ;; - - no) - ;; - *) - error_exit "Unknown state for capstone: $capstone" ;; esac =20 @@ -7292,11 +7252,6 @@ fi if test "$ivshmem" =3D "yes" ; then echo "CONFIG_IVSHMEM=3Dy" >> $config_host_mak fi -if test "$capstone" !=3D "no" ; then - echo "CONFIG_CAPSTONE=3Dy" >> $config_host_mak - echo "CAPSTONE_CFLAGS=3D$capstone_cflags" >> $config_host_mak - echo "CAPSTONE_LIBS=3D$capstone_libs" >> $config_host_mak -fi if test "$debug_mutex" =3D "yes" ; then echo "CONFIG_DEBUG_MUTEX=3Dy" >> $config_host_mak fi @@ -7819,9 +7774,6 @@ done # for target in $targets if [ "$fdt" =3D "git" ]; then subdirs=3D"$subdirs dtc" fi -if [ "$capstone" =3D "git" -o "$capstone" =3D "internal" ]; then - subdirs=3D"$subdirs capstone" -fi echo "SUBDIRS=3D$subdirs" >> $config_host_mak if test -n "$LIBCAPSTONE"; then echo "LIBCAPSTONE=3D$LIBCAPSTONE" >> $config_host_mak @@ -8008,7 +7960,8 @@ NINJA=3D${ninja:-$PWD/ninjatool} $meson setup \ -Db_coverage=3D$(if test "$gcov" =3D yes; then echo true; else ech= o false; fi) \ -Dsdl=3D$sdl -Dsdl_image=3D$sdl_image \ -Dvnc=3D$vnc -Dvnc_sasl=3D$vnc_sasl -Dvnc_jpeg=3D$vnc_jpeg -Dvnc_png=3D$v= nc_png \ - -Dgettext=3D$gettext -Dxkbcommon=3D$xkbcommon -Du2f=3D$u2f\ + -Dgettext=3D$gettext -Dxkbcommon=3D$xkbcommon -Du2f=3D$u2f \ + -Dcapstone=3D$capstone \ $cross_arg \ "$PWD" "$source_path" =20 diff --git a/Makefile b/Makefile index 7c60b9dcb8..f3da1760ad 100644 --- a/Makefile +++ b/Makefile @@ -156,22 +156,6 @@ dtc/all: .git-submodule-status dtc/libfdt dtc/%: .git-submodule-status @mkdir -p $@ =20 -# Overriding CFLAGS causes us to lose defines added in the sub-makefile. -# Not overriding CFLAGS leads to mis-matches between compilation modes. -# Therefore we replicate some of the logic in the sub-makefile. -# Remove all the extra -Warning flags that QEMU uses that Capstone doesn't; -# no need to annoy QEMU developers with such things. -CAP_CFLAGS =3D $(patsubst -W%,,$(CFLAGS) $(QEMU_CFLAGS)) $(CAPSTONE_CFLAGS) -CAP_CFLAGS +=3D -DCAPSTONE_USE_SYS_DYN_MEM -CAP_CFLAGS +=3D -DCAPSTONE_HAS_ARM -CAP_CFLAGS +=3D -DCAPSTONE_HAS_ARM64 -CAP_CFLAGS +=3D -DCAPSTONE_HAS_POWERPC -CAP_CFLAGS +=3D -DCAPSTONE_HAS_X86 - -.PHONY: capstone/all -capstone/all: .git-submodule-status - $(call quiet-command,$(MAKE) -C $(SRC_PATH)/capstone CAPSTONE_SHARED=3Dno= BUILDDIR=3D"$(BUILD_DIR)/capstone" CC=3D"$(CC)" AR=3D"$(AR)" LD=3D"$(LD)" = RANLIB=3D"$(RANLIB)" CFLAGS=3D"$(CAP_CFLAGS)" $(SUBDIR_MAKEFLAGS) $(BUILD_D= IR)/capstone/$(LIBCAPSTONE)) - .PHONY: slirp/all slirp/all: .git-submodule-status $(call quiet-command,$(MAKE) -C $(SRC_PATH)/slirp \ diff --git a/meson.build b/meson.build index f4d1ab1096..f23273693d 100644 --- a/meson.build +++ b/meson.build @@ -10,6 +10,7 @@ else keyval =3D import('unstable-keyval') endif ss =3D import('sourceset') +fs =3D import('fs') =20 sh =3D find_program('sh') cc =3D meson.get_compiler('c') @@ -409,11 +410,6 @@ if 'CONFIG_USB_LIBUSB' in config_host libusb =3D declare_dependency(compile_args: config_host['LIBUSB_CFLAGS']= .split(), link_args: config_host['LIBUSB_LIBS'].split(= )) endif -capstone =3D not_found -if 'CONFIG_CAPSTONE' in config_host - capstone =3D declare_dependency(compile_args: config_host['CAPSTONE_CFLA= GS'].split(), - link_args: config_host['CAPSTONE_LIBS'].sp= lit()) -endif libpmem =3D not_found if 'CONFIG_LIBPMEM' in config_host libpmem =3D declare_dependency(compile_args: config_host['LIBPMEM_CFLAGS= '].split(), @@ -470,7 +466,6 @@ foreach k, v: config_host config_host_data.set(k, v =3D=3D 'y' ? 1 : v) endif endforeach -genh +=3D configure_file(output: 'config-host.h', configuration: config_ho= st_data) =20 minikconf =3D find_program('scripts/minikconf.py') config_all_devices =3D {} @@ -610,6 +605,108 @@ config_all +=3D { 'CONFIG_ALL': true, } =20 +# Submodules + +capstone =3D not_found +capstone_opt =3D get_option('capstone') +if capstone_opt =3D=3D 'no' + capstone_opt =3D false +elif capstone_opt in ['yes', 'auto', 'system'] + have_internal =3D fs.exists('capstone/Makefile') + capstone =3D dependency('capstone', static: enable_static, + required: capstone_opt =3D=3D 'system' or + capstone_opt =3D=3D 'yes' and not have_i= nternal) + if capstone.found() + capstone_opt =3D 'system' + elif have_internal + capstone_opt =3D 'internal' + else + capstone_opt =3D false + endif +endif +if capstone_opt =3D=3D 'internal' + capstone_data =3D configuration_data() + capstone_data.set('CAPSTONE_USE_SYS_DYN_MEM', '1') + + capstone_files =3D files( + 'capstone/cs.c', + 'capstone/MCInst.c', + 'capstone/MCInstrDesc.c', + 'capstone/MCRegisterInfo.c', + 'capstone/SStream.c', + 'capstone/utils.c' + ) + + if 'CONFIG_ARM_DIS' in config_all_disas + capstone_data.set('CAPSTONE_HAS_ARM', '1') + capstone_files +=3D files( + 'capstone/arch/ARM/ARMDisassembler.c', + 'capstone/arch/ARM/ARMInstPrinter.c', + 'capstone/arch/ARM/ARMMapping.c', + 'capstone/arch/ARM/ARMModule.c' + ) + endif + + # FIXME: This config entry currently depends on a c++ compiler. + # Which is needed for building libvixl, but not for capstone. + if 'CONFIG_ARM_A64_DIS' in config_all_disas + capstone_data.set('CAPSTONE_HAS_ARM64', '1') + capstone_files +=3D files( + 'capstone/arch/AArch64/AArch64BaseInfo.c', + 'capstone/arch/AArch64/AArch64Disassembler.c', + 'capstone/arch/AArch64/AArch64InstPrinter.c', + 'capstone/arch/AArch64/AArch64Mapping.c', + 'capstone/arch/AArch64/AArch64Module.c' + ) + endif + + if 'CONFIG_PPC_DIS' in config_all_disas + capstone_data.set('CAPSTONE_HAS_POWERPC', '1') + capstone_files +=3D files( + 'capstone/arch/PowerPC/PPCDisassembler.c', + 'capstone/arch/PowerPC/PPCInstPrinter.c', + 'capstone/arch/PowerPC/PPCMapping.c', + 'capstone/arch/PowerPC/PPCModule.c' + ) + endif + + if 'CONFIG_I386_DIS' in config_all_disas + capstone_data.set('CAPSTONE_HAS_X86', 1) + capstone_files +=3D files( + 'capstone/arch/X86/X86Disassembler.c', + 'capstone/arch/X86/X86DisassemblerDecoder.c', + 'capstone/arch/X86/X86ATTInstPrinter.c', + 'capstone/arch/X86/X86IntelInstPrinter.c', + 'capstone/arch/X86/X86Mapping.c', + 'capstone/arch/X86/X86Module.c' + ) + endif + + configure_file(output: 'capstone-defs.h', configuration: capstone_data) + + capstone_cargs =3D [ + # FIXME: There does not seem to be a way to completely replace the c_a= rgs + # that come from add_project_arguments() -- we can only add to them. + # So: disable all warnings with a big hammer. + '-Wno-error', '-w', + + # Include all configuration defines via a header file, which will wind= up + # as a dependency on the object file, and thus changes here will result + # in a rebuild. + '-include', 'capstone-defs.h' + ] + + libcapstone =3D static_library('capstone', + sources: capstone_files, + c_args: capstone_cargs, + include_directories: 'capstone/include') + capstone =3D declare_dependency(link_with: libcapstone, + include_directories: 'capstone/include') +endif +config_host_data.set('CONFIG_CAPSTONE', capstone.found()) + +genh +=3D configure_file(output: 'config-host.h', configuration: config_ho= st_data) + # Generators =20 hxtool =3D find_program('scripts/hxtool') @@ -1512,7 +1609,7 @@ summary_info +=3D {'vvfat support': config_host.h= as_key('CONFIG_VVFAT')} summary_info +=3D {'qed support': config_host.has_key('CONFIG_QED')} summary_info +=3D {'parallels support': config_host.has_key('CONFIG_PARALL= ELS')} summary_info +=3D {'sheepdog support': config_host.has_key('CONFIG_SHEEPD= OG')} -summary_info +=3D {'capstone': config_host.has_key('CONFIG_CAPSTO= NE')} +summary_info +=3D {'capstone': capstone_opt} summary_info +=3D {'libpmem support': config_host.has_key('CONFIG_LIBPME= M')} summary_info +=3D {'libdaxctl support': config_host.has_key('CONFIG_LIBDAX= CTL')} summary_info +=3D {'libudev': config_host.has_key('CONFIG_LIBUDE= V')} diff --git a/meson_options.txt b/meson_options.txt index 543cf70043..e650a937e7 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -22,3 +22,7 @@ option('vnc_sasl', type : 'feature', value : 'auto', description: 'SASL authentication for VNC server') option('xkbcommon', type : 'feature', value : 'auto', description: 'xkbcommon support') + +option('capstone', type: 'combo', value: 'auto', + choices: ['no', 'yes', 'auto', 'system', 'internal'], + description: 'Whether and how to find the capstone library') --=20 2.25.1 From nobody Fri May 3 11:23:16 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1600387133; cv=none; d=zohomail.com; s=zohoarc; b=NfDuSbmYc81AD+JXvp70K/qG69VvjMAqDDrXVjq8xatGrVhtgYa8DPyJtCzrn4isXcyDs5fDv9YT3NjTqxIregKGH++FfNqQjkIpYSFSWGUQFX9FBKIoepVPivv8qwabbbeb0ceXc2UNV6YBc7/ikuk+Ef5qxpN6swLlYK+38Zs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600387133; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=uTrm0sdq7gARiBpxaC3cYgqckLUxE92nb3e9fV7DsLA=; b=EM7XYYSSNqWYwlP2NeK+XQiQ2iJNzVhv0BerA1CtagItN7wvP1rgOMPYCeqwg+GfMDybuXEpOPiTYBVDB5sUJvd5jnnCl/cx8pcn5xU2ZWSR3QArcTwiNCN2Cljy8g0Vur9QszotF7rgpYW6fm16A59PKH5eDfFJUZYmmz5h7Ro= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1600387133638744.5354677754905; Thu, 17 Sep 2020 16:58:53 -0700 (PDT) Received: from localhost ([::1]:35392 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kJ3nf-0005Im-CB for importer@patchew.org; Thu, 17 Sep 2020 19:58:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36196) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJ3mL-0003kf-Vc for qemu-devel@nongnu.org; Thu, 17 Sep 2020 19:57:29 -0400 Received: from mail-pl1-x641.google.com ([2607:f8b0:4864:20::641]:45130) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kJ3mK-0006du-8z for qemu-devel@nongnu.org; Thu, 17 Sep 2020 19:57:29 -0400 Received: by mail-pl1-x641.google.com with SMTP id q12so1981938plr.12 for ; Thu, 17 Sep 2020 16:57:26 -0700 (PDT) Received: from localhost.localdomain ([71.212.141.89]) by smtp.gmail.com with ESMTPSA id m13sm772699pfk.103.2020.09.17.16.57.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Sep 2020 16:57:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uTrm0sdq7gARiBpxaC3cYgqckLUxE92nb3e9fV7DsLA=; b=l30gwEIFVxytLmJeEP0GRYF9BTHFlcbeB568YVbbigVaClybqQxlk78bHOdltWILne aMEHpVicYHW4pyL+aWBnU4SC/0m10IisRILhuITrKu/4b6ltIFm0K7YqQrZjZVczYdiN SN8an7OzmDTc7GGzz7GbjMzk4UvPza9lEFAWRFAYMrtkHSZriklcsINIykyk/jtbs49Z weYTtCGA6reruFPgHl8QX7BwFh2kFezej+bWcD17Y+KE2yZhpO0AyJmq3OtASYLAYW37 kBHsr9lFKYGMbIW3M51iQCKO/GxUYxpoqvRq5yVYWT0yPxCW4+RS4WejkgiN4VocmHhv b80Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uTrm0sdq7gARiBpxaC3cYgqckLUxE92nb3e9fV7DsLA=; b=fH2NsZCwnzpODCUI6ENmQz/kBxeRytCYg7LbY+B+9zvZkyx7JMVuafKmktlsLMfR3m Jg5T4uXWyFJeFoLUnO48m6SunEePRjy1Xzjeum2KKRvlcywKwS5TcpkrgfL/ZnfaL/oJ rkZT3k3BB0ZAw+3eTdJ3ect+0lR87WqKvBoqPWPAP2SIaTWmhSC1lay5EXFOM2Eg0j+2 zXLHswQfVsN0umZUGfJJca4pogr2BxZNr+lJhIulEr5CQUzlT7HeUUoAA3axzsx0hosm a0De9ChF2RD2PfdQkHRj4RN0+UG9UiztwmN1+P5Cj0VzI/O+vUynw4uyVTPoZSbcvl/i de0A== X-Gm-Message-State: AOAM532DuTllCRZAGkL70gFYhP23z4OJeEhyZ0S1v84j7uSZAmfetnEz g9vMUshC6SHYWEMsAXZ0dqW5I/8eUJBGPg== X-Google-Smtp-Source: ABdhPJw/1/230V1gHJFq9r09RNJbzyy4VR/lRPsXyRY5XBZLCzCIapqVIgyEbfeoe81C2f/QyT4Afg== X-Received: by 2002:a17:902:fe84:b029:d1:e598:3ff6 with SMTP id x4-20020a170902fe84b02900d1e5983ff6mr13364654plm.48.1600387044921; Thu, 17 Sep 2020 16:57:24 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 02/10] capstone: Update to upstream "next" branch Date: Thu, 17 Sep 2020 16:57:12 -0700 Message-Id: <20200917235720.2685978-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200917235720.2685978-1-richard.henderson@linaro.org> References: <20200917235720.2685978-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::641; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x641.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) This branch contains a number of improvements over master, including making all of the disassembler data constant. We are skipping past the 4.0 branchpoint, which changed the location of the includes within the source directory. Tested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson --- capstone | 2 +- meson.build | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/capstone b/capstone index 22ead3e0bf..f8b1b83301 160000 --- a/capstone +++ b/capstone @@ -1 +1 @@ -Subproject commit 22ead3e0bfdb87516656453336160e0a37b066bf +Subproject commit f8b1b833015a4ae47110ed068e0deb7106ced66d diff --git a/meson.build b/meson.build index f23273693d..4c92b43fe5 100644 --- a/meson.build +++ b/meson.build @@ -677,6 +677,7 @@ if capstone_opt =3D=3D 'internal' 'capstone/arch/X86/X86DisassemblerDecoder.c', 'capstone/arch/X86/X86ATTInstPrinter.c', 'capstone/arch/X86/X86IntelInstPrinter.c', + 'capstone/arch/X86/X86InstPrinterCommon.c', 'capstone/arch/X86/X86Mapping.c', 'capstone/arch/X86/X86Module.c' ) @@ -701,7 +702,7 @@ if capstone_opt =3D=3D 'internal' c_args: capstone_cargs, include_directories: 'capstone/include') capstone =3D declare_dependency(link_with: libcapstone, - include_directories: 'capstone/include') + include_directories: 'capstone/include/cap= stone') endif config_host_data.set('CONFIG_CAPSTONE', capstone.found()) =20 --=20 2.25.1 From nobody Fri May 3 11:23:16 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1600387136; cv=none; d=zohomail.com; s=zohoarc; b=KiWHBjNCWelVcfWOyOHGdackBjosQ0wlbuUgtOJNsU5eO7NbyMMgktVAvfiQTBShN4OZiYfVVtnGcIwcgqhXLA6tbPBsM8JLF07RaWevspblJsgL4ybWsmPMerHlr/sZawACS3sAZeKdUTUkvx5EzFObuDtPdl9w4RMsAkxTq0I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600387136; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=MS/1tLLb4oetx2r+bYB6y25h/eLEAPaiuMEVSm1K/g8=; b=LEOvc6RILI5gexENXgg6C5JDDotd/ZwNVmfaNrktsBcArCtrKXhWKD4CyI8GipqsBB27MOCTYc5OIXPRABIAIfj8kqyj8Mvqv17wiG+entvp1L3PaaP7TYgoVbHYp9g7zIcaCzXqwbh2d7K7HYfigOpUjmdfTmMLTKM3sFmNLlo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1600387136957199.62705701052846; Thu, 17 Sep 2020 16:58:56 -0700 (PDT) Received: from localhost ([::1]:35700 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kJ3ni-0005Q7-QY for importer@patchew.org; Thu, 17 Sep 2020 19:58:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36220) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJ3mM-0003kn-TP for qemu-devel@nongnu.org; Thu, 17 Sep 2020 19:57:30 -0400 Received: from mail-pg1-x535.google.com ([2607:f8b0:4864:20::535]:44507) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kJ3mK-0006e9-9z for qemu-devel@nongnu.org; Thu, 17 Sep 2020 19:57:30 -0400 Received: by mail-pg1-x535.google.com with SMTP id 7so2312778pgm.11 for ; Thu, 17 Sep 2020 16:57:27 -0700 (PDT) Received: from localhost.localdomain ([71.212.141.89]) by smtp.gmail.com with ESMTPSA id m13sm772699pfk.103.2020.09.17.16.57.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Sep 2020 16:57:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MS/1tLLb4oetx2r+bYB6y25h/eLEAPaiuMEVSm1K/g8=; b=UjUNVDC4R2lTf4RT66DbOu1/GsDEHMTjLluIhBfRzM++O5Sh/Bn+E9Fp95qxer1EDZ fLmmHM0F42+6ct+bvwfQhUBCMW3dQJBgPALwXV1SZHkcUd9yN72fsoXOfr9rJ0r2ulnd 5Nl194/sshXOH5lflJRIbEqayc7gTeuZgXkC1d4G0aUl6/Es3NOtxc4FooUHyvv/gLej 3rGCW4chl6yHr1Ztpt5t9u/kYHxtZDJJ+26zSEXAqxpmgKrpegCyjtqkmG7Miuw0K6tD Mh8/wVftn3mwO0lDmymYZdwJ4RBMKOgYis7xQW/hpWMm9cqK9hmnGID2FTeL8tyzo68u U4rg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MS/1tLLb4oetx2r+bYB6y25h/eLEAPaiuMEVSm1K/g8=; b=LdUWMPSJ8xXW9nioCczjazjjE8D41MgthEI0KIYqg5Xm2UEkC6/mrk+HkFbtuyuarA IHZfGBd80p/jee9o5DIWV9P1aNqJK3QjrGV7t/DmwKyAZKhirv/rVIq+6ss5k1UZK79T SFU71h/e6WjS9Wi1pzKw2jrvg3c+hcwrq3GX2wdLTlQG6BdZx2Bl7wvEvFsJpl8EaNKb 8KIaUSQ8bmYVwkfSFA4UPEJRtyJcK8Xn7BufIBVNEm76kJ3/Ptb3y/8BwJlOxcITuTaQ zj3X/krEKvbYFxCH7zHL35L8Hzfm/x1Kp3eiR+PYKDoPEL0FlgXFGNOSvzIV9C/E0+WX ycHw== X-Gm-Message-State: AOAM530nf5qT0AxjUUmeCkxyBcAtMyCEihnqV2WLwH40u0yvEQa1OJIa gN8SNxjYkW6J5tGELP76SFlPHg6KmT2XlQ== X-Google-Smtp-Source: ABdhPJwTP19m3f5kxeBvwphXWmnzvtUMcY1u0/9yNMBxCGhjW8Zah+R2kCxf7K0cKu/fyn6Jh99eYg== X-Received: by 2002:a63:f354:: with SMTP id t20mr2378266pgj.299.1600387045976; Thu, 17 Sep 2020 16:57:25 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 03/10] disas: Move host asm annotations to tb_gen_code Date: Thu, 17 Sep 2020 16:57:13 -0700 Message-Id: <20200917235720.2685978-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200917235720.2685978-1-richard.henderson@linaro.org> References: <20200917235720.2685978-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::535; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x535.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" Instead of creating GStrings and passing them into log_disas, just print the annotations directly in tb_gen_code. Fix the annotations for the slow paths of the TB, after the part implementing the final guest instruction. Reviewed-by: Thomas Huth Signed-off-by: Richard Henderson --- include/disas/disas.h | 2 +- include/exec/log.h | 4 ++-- accel/tcg/translate-all.c | 24 +++++++++++++++--------- disas.c | 29 +++++++++-------------------- tcg/tcg.c | 4 ++-- 5 files changed, 29 insertions(+), 34 deletions(-) diff --git a/include/disas/disas.h b/include/disas/disas.h index 1b6e035e32..36c33f6f19 100644 --- a/include/disas/disas.h +++ b/include/disas/disas.h @@ -7,7 +7,7 @@ #include "cpu.h" =20 /* Disassemble this for me please... (debugging). */ -void disas(FILE *out, void *code, unsigned long size, const char *note); +void disas(FILE *out, void *code, unsigned long size); void target_disas(FILE *out, CPUState *cpu, target_ulong code, target_ulong size); =20 diff --git a/include/exec/log.h b/include/exec/log.h index 3ed797c1c8..fcc7b9e00b 100644 --- a/include/exec/log.h +++ b/include/exec/log.h @@ -56,13 +56,13 @@ static inline void log_target_disas(CPUState *cpu, targ= et_ulong start, rcu_read_unlock(); } =20 -static inline void log_disas(void *code, unsigned long size, const char *n= ote) +static inline void log_disas(void *code, unsigned long size) { QemuLogFile *logfile; rcu_read_lock(); logfile =3D atomic_rcu_read(&qemu_logfile); if (logfile) { - disas(logfile->fd, code, size, note); + disas(logfile->fd, code, size); } rcu_read_unlock(); } diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index 2d83013633..2874104a6a 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -1815,10 +1815,9 @@ TranslationBlock *tb_gen_code(CPUState *cpu, qemu_log_in_addr_range(tb->pc)) { FILE *logfile =3D qemu_log_lock(); int code_size, data_size =3D 0; - g_autoptr(GString) note =3D g_string_new("[tb header & initial ins= truction]"); - size_t chunk_start =3D 0; + size_t chunk_start; int insn =3D 0; - qemu_log("OUT: [size=3D%d]\n", gen_code_size); + if (tcg_ctx->data_gen_ptr) { code_size =3D tcg_ctx->data_gen_ptr - tb->tc.ptr; data_size =3D gen_code_size - code_size; @@ -1827,26 +1826,33 @@ TranslationBlock *tb_gen_code(CPUState *cpu, } =20 /* Dump header and the first instruction */ + qemu_log("OUT: [size=3D%d]\n", gen_code_size); + qemu_log(" -- guest addr 0x" TARGET_FMT_lx " + tb prologue\n", + tcg_ctx->gen_insn_data[insn][0]); chunk_start =3D tcg_ctx->gen_insn_end_off[insn]; - log_disas(tb->tc.ptr, chunk_start, note->str); + log_disas(tb->tc.ptr, chunk_start); =20 /* * Dump each instruction chunk, wrapping up empty chunks into * the next instruction. The whole array is offset so the * first entry is the beginning of the 2nd instruction. */ - while (insn <=3D tb->icount && chunk_start < code_size) { + while (insn < tb->icount) { size_t chunk_end =3D tcg_ctx->gen_insn_end_off[insn]; if (chunk_end > chunk_start) { - g_string_printf(note, "[guest addr: " TARGET_FMT_lx "]", - tcg_ctx->gen_insn_data[insn][0]); - log_disas(tb->tc.ptr + chunk_start, chunk_end - chunk_star= t, - note->str); + qemu_log(" -- guest addr 0x" TARGET_FMT_lx "\n", + tcg_ctx->gen_insn_data[insn][0]); + log_disas(tb->tc.ptr + chunk_start, chunk_end - chunk_star= t); chunk_start =3D chunk_end; } insn++; } =20 + if (chunk_start < code_size) { + qemu_log(" -- tb slow paths + alignment\n"); + log_disas(tb->tc.ptr + chunk_start, code_size - chunk_start); + } + /* Finally dump any data we may have after the block */ if (data_size) { int i; diff --git a/disas.c b/disas.c index c1397d3933..a4304e8137 100644 --- a/disas.c +++ b/disas.c @@ -262,8 +262,7 @@ static void cap_dump_insn_units(disassemble_info *info,= cs_insn *insn, } } =20 -static void cap_dump_insn(disassemble_info *info, cs_insn *insn, - const char *note) +static void cap_dump_insn(disassemble_info *info, cs_insn *insn) { fprintf_function print =3D info->fprintf_func; int i, n, split; @@ -284,11 +283,7 @@ static void cap_dump_insn(disassemble_info *info, cs_i= nsn *insn, } =20 /* Print the actual instruction. */ - print(info->stream, " %-8s %s", insn->mnemonic, insn->op_str); - if (note) { - print(info->stream, "\t\t%s", note); - } - print(info->stream, "\n"); + print(info->stream, " %-8s %s\n", insn->mnemonic, insn->op_str); =20 /* Dump any remaining part of the insn on subsequent lines. */ for (i =3D split; i < n; i +=3D split) { @@ -320,7 +315,7 @@ static bool cap_disas_target(disassemble_info *info, ui= nt64_t pc, size_t size) size -=3D tsize; =20 while (cs_disasm_iter(handle, &cbuf, &csize, &pc, insn)) { - cap_dump_insn(info, insn, NULL); + cap_dump_insn(info, insn); } =20 /* If the target memory is not consumed, go back for more... */ @@ -349,8 +344,7 @@ static bool cap_disas_target(disassemble_info *info, ui= nt64_t pc, size_t size) } =20 /* Disassemble SIZE bytes at CODE for the host. */ -static bool cap_disas_host(disassemble_info *info, void *code, size_t size, - const char *note) +static bool cap_disas_host(disassemble_info *info, void *code, size_t size) { csh handle; const uint8_t *cbuf; @@ -366,8 +360,7 @@ static bool cap_disas_host(disassemble_info *info, void= *code, size_t size, pc =3D (uintptr_t)code; =20 while (cs_disasm_iter(handle, &cbuf, &size, &pc, insn)) { - cap_dump_insn(info, insn, note); - note =3D NULL; + cap_dump_insn(info, insn); } if (size !=3D 0) { (*info->fprintf_func)(info->stream, @@ -411,7 +404,7 @@ static bool cap_disas_monitor(disassemble_info *info, u= int64_t pc, int count) csize +=3D tsize; =20 if (cs_disasm_iter(handle, &cbuf, &csize, &pc, insn)) { - cap_dump_insn(info, insn, NULL); + cap_dump_insn(info, insn); if (--count <=3D 0) { break; } @@ -425,7 +418,7 @@ static bool cap_disas_monitor(disassemble_info *info, u= int64_t pc, int count) #endif /* !CONFIG_USER_ONLY */ #else # define cap_disas_target(i, p, s) false -# define cap_disas_host(i, p, s, n) false +# define cap_disas_host(i, p, s) false # define cap_disas_monitor(i, p, c) false # define cap_disas_plugin(i, p, c) false #endif /* CONFIG_CAPSTONE */ @@ -595,7 +588,7 @@ char *plugin_disas(CPUState *cpu, uint64_t addr, size_t= size) } =20 /* Disassemble this for me please... (debugging). */ -void disas(FILE *out, void *code, unsigned long size, const char *note) +void disas(FILE *out, void *code, unsigned long size) { uintptr_t pc; int count; @@ -673,7 +666,7 @@ void disas(FILE *out, void *code, unsigned long size, c= onst char *note) print_insn =3D print_insn_hppa; #endif =20 - if (s.info.cap_arch >=3D 0 && cap_disas_host(&s.info, code, size, note= )) { + if (s.info.cap_arch >=3D 0 && cap_disas_host(&s.info, code, size)) { return; } =20 @@ -683,10 +676,6 @@ void disas(FILE *out, void *code, unsigned long size, = const char *note) for (pc =3D (uintptr_t)code; size > 0; pc +=3D count, size -=3D count)= { fprintf(out, "0x%08" PRIxPTR ": ", pc); count =3D print_insn(pc, &s.info); - if (note) { - fprintf(out, "\t\t%s", note); - note =3D NULL; - } fprintf(out, "\n"); if (count < 0) { break; diff --git a/tcg/tcg.c b/tcg/tcg.c index 62f299e36e..9a111ce604 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -1101,7 +1101,7 @@ void tcg_prologue_init(TCGContext *s) size_t data_size =3D prologue_size - code_size; size_t i; =20 - log_disas(buf0, code_size, NULL); + log_disas(buf0, code_size); =20 for (i =3D 0; i < data_size; i +=3D sizeof(tcg_target_ulong)) { if (sizeof(tcg_target_ulong) =3D=3D 8) { @@ -1115,7 +1115,7 @@ void tcg_prologue_init(TCGContext *s) } } } else { - log_disas(buf0, prologue_size, NULL); + log_disas(buf0, prologue_size); } qemu_log("\n"); qemu_log_flush(); --=20 2.25.1 From nobody Fri May 3 11:23:16 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1600387425; cv=none; d=zohomail.com; s=zohoarc; b=I0rnB06pKGr3IY+hszn62R4I00hhjxFyit6JIySjOYQc+F3mIyGNDjUKIkymHWOCCEcCXQrhyacdR97oD/mOzHfnhCN3yFfETnsHRiBIo+TajElvfqA288StyzaYKaOUkCUyIwjdUlV1zllnxbEKni+Jynheq0m/uK+Qc1nYk2o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600387425; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=DnCN/9x1tYqxjptozTGJnjC0ux82UgLag8dZqpZrS28=; b=XNUH7LdVdmn2u+wpTfDXczFMCEJ5l/HLbnAW4ZISKde6ktZOGfbQWRJ5+SFFoI5jVDwtMRdikVInPfitizq4V1ySXcB0h66ZoCI3EInzY9HiVCehpML8+iALHyVQ3sTZzoYkue7PsFknTOjd4f9bkKwYMDsRAKoYmdu/6ZXkqjk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 160038742520150.65368799282294; Thu, 17 Sep 2020 17:03:45 -0700 (PDT) Received: from localhost ([::1]:50166 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kJ3sO-0002yP-1P for importer@patchew.org; Thu, 17 Sep 2020 20:03:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36282) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJ3mQ-0003rD-Eg for qemu-devel@nongnu.org; Thu, 17 Sep 2020 19:57:34 -0400 Received: from mail-pl1-x643.google.com ([2607:f8b0:4864:20::643]:45132) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kJ3mL-0006eN-Bi for qemu-devel@nongnu.org; Thu, 17 Sep 2020 19:57:34 -0400 Received: by mail-pl1-x643.google.com with SMTP id q12so1981990plr.12 for ; Thu, 17 Sep 2020 16:57:28 -0700 (PDT) Received: from localhost.localdomain ([71.212.141.89]) by smtp.gmail.com with ESMTPSA id m13sm772699pfk.103.2020.09.17.16.57.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Sep 2020 16:57:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=U6fE0rS6g/PgpT0BfNKV2MVny74HOKVIxnGhNrYyK/8=; b=paVyLvqkUpPo6A0HhT0885UlO5hdOBlxDtK/BJx7m4oUzHB/dJbEV6I+mWcHLEfTnO LOgqDg46ax/9qYACPUgY8EKPeveyCCf+V8xCNTfmku1wx5enPsMxGpmNWjWRH9ecEhop GtZElnClStPtj2BRIt41ZmlNwSTWh2aLbWLFL/bGTI3z5/0Glg2bpIZqMKVLpcLQfUfx 80lQaVpmF+c11tNUwTrHZkHZGfS/LOPICyBvFGKtlhaa/fhjqRbX7CylSFMVUNYxnsTl e5HgwQaUKKP0x1QpnPgd0BsE3PxjRyuaRp8Rjqn5GXu9PKtfU0s1sxi/wJyl67DTt9oo mu8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=U6fE0rS6g/PgpT0BfNKV2MVny74HOKVIxnGhNrYyK/8=; b=EdMChsmJvndcsuzwTQG1f8RKyu3kbe9YpTqHh8gXliToviaZxyTSg2pEHLV55K/f9N omOTKNg0BinyrJLSU9CXVDi5SYdGbOB3cBDFGgfSDBJnWhvltj99peVerI5Z82risxy2 rtvJul0cSKljqpZxTmYmDD5rzn8tnzEQ+JuJJ5DWebiAKHuVGs6RKdtpj3zcywpmd72C /CdcSMPAX5mrKyM33o8Bw0eMeG0C3uRNUmjiUgmQL8OWNhek2SefsQOeyt5OuDFgoyER jcm2qjXN8aYfII02DbGpv4Fw66ckNBBCOJga5kzBBmQtKS4GXKWTfiFv+z4qIhirccf+ wk1g== X-Gm-Message-State: AOAM530EEook1Ic6ZpGJ3vgLMV6Cg5gYLk7axR/kEj2M17xS6uHRxwLn 2+1qnIoBcJVcUD2oY/C1B3bLYqQhbC8f2Q== X-Google-Smtp-Source: ABdhPJyAwk+4Ns5d43zIJy4yI+eXdrTo8lVx3pUJVUK+vgHzgcjXOQjdm9HkuEnmLzsNcla3uVZD3g== X-Received: by 2002:a17:902:9692:b029:d1:e5e7:be18 with SMTP id n18-20020a1709029692b02900d1e5e7be18mr12313497plp.75.1600387047197; Thu, 17 Sep 2020 16:57:27 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 04/10] disas: Clean up CPUDebug initialization Date: Thu, 17 Sep 2020 16:57:14 -0700 Message-Id: <20200917235720.2685978-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200917235720.2685978-1-richard.henderson@linaro.org> References: <20200917235720.2685978-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::643; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x643.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_PDS_OTHER_BAD_TLD=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" Rename several functions, dropping "generic" and making "host" vs "target" clearer. Make a bunch of functions static that are not used outside this file. Replace INIT_DISASSEMBLE_INFO with a trio of functions. Acked-by: Thomas Huth Signed-off-by: Richard Henderson --- include/disas/dis-asm.h | 62 -------- disas.c | 326 ++++++++++++++++++---------------------- 2 files changed, 148 insertions(+), 240 deletions(-) diff --git a/include/disas/dis-asm.h b/include/disas/dis-asm.h index 9856bf7921..dda247eaf2 100644 --- a/include/disas/dis-asm.h +++ b/include/disas/dis-asm.h @@ -406,7 +406,6 @@ typedef struct disassemble_info { =20 } disassemble_info; =20 -=0C /* Standard disassemblers. Disassemble one instruction at the given target address. Return number of bytes processed. */ typedef int (*disassembler_ftype) (bfd_vma, disassemble_info *); @@ -461,67 +460,6 @@ int print_insn_riscv32 (bfd_vma, disassemble_= info*); int print_insn_riscv64 (bfd_vma, disassemble_info*); int print_insn_rx(bfd_vma, disassemble_info *); =20 -#if 0 -/* Fetch the disassembler for a given BFD, if that support is available. = */ -disassembler_ftype disassembler(bfd *); -#endif - -=0C -/* This block of definitions is for particular callers who read instructio= ns - into a buffer before calling the instruction decoder. */ - -/* Here is a function which callers may wish to use for read_memory_func. - It gets bytes from a buffer. */ -int buffer_read_memory(bfd_vma, bfd_byte *, int, struct disassemble_info *= ); - -/* This function goes with buffer_read_memory. - It prints a message using info->fprintf_func and info->stream. */ -void perror_memory(int, bfd_vma, struct disassemble_info *); - - -/* Just print the address in hex. This is included for completeness even - though both GDB and objdump provide their own (to print symbolic - addresses). */ -void generic_print_address(bfd_vma, struct disassemble_info *); - -/* Always true. */ -int generic_symbol_at_address(bfd_vma, struct disassemble_info *); - -/* Macro to initialize a disassemble_info struct. This should be called - by all applications creating such a struct. */ -#define INIT_DISASSEMBLE_INFO(INFO, STREAM, FPRINTF_FUNC) \ - (INFO).flavour =3D bfd_target_unknown_flavour, \ - (INFO).arch =3D bfd_arch_unknown, \ - (INFO).mach =3D 0, \ - (INFO).endian =3D BFD_ENDIAN_UNKNOWN, \ - INIT_DISASSEMBLE_INFO_NO_ARCH(INFO, STREAM, FPRINTF_FUNC) - -/* Call this macro to initialize only the internal variables for the - disassembler. Architecture dependent things such as byte order, or mac= hine - variant are not touched by this macro. This makes things much easier f= or - GDB which must initialize these things separately. */ - -#define INIT_DISASSEMBLE_INFO_NO_ARCH(INFO, STREAM, FPRINTF_FUNC) \ - (INFO).fprintf_func =3D (FPRINTF_FUNC), \ - (INFO).stream =3D (STREAM), \ - (INFO).symbols =3D NULL, \ - (INFO).num_symbols =3D 0, \ - (INFO).private_data =3D NULL, \ - (INFO).buffer =3D NULL, \ - (INFO).buffer_vma =3D 0, \ - (INFO).buffer_length =3D 0, \ - (INFO).read_memory_func =3D buffer_read_memory, \ - (INFO).memory_error_func =3D perror_memory, \ - (INFO).print_address_func =3D generic_print_address, \ - (INFO).print_insn =3D NULL, \ - (INFO).symbol_at_address_func =3D generic_symbol_at_address, \ - (INFO).flags =3D 0, \ - (INFO).bytes_per_line =3D 0, \ - (INFO).bytes_per_chunk =3D 0, \ - (INFO).display_endian =3D BFD_ENDIAN_UNKNOWN, \ - (INFO).disassembler_options =3D NULL, \ - (INFO).insn_info_valid =3D 0 - #ifndef ATTRIBUTE_UNUSED #define ATTRIBUTE_UNUSED __attribute__((unused)) #endif diff --git a/disas.c b/disas.c index a4304e8137..7bc8e9a037 100644 --- a/disas.c +++ b/disas.c @@ -16,78 +16,66 @@ typedef struct CPUDebug { /* Filled in by elfload.c. Simplistic, but will do for now. */ struct syminfo *syminfos =3D NULL; =20 -/* Get LENGTH bytes from info's buffer, at target address memaddr. - Transfer them to myaddr. */ -int -buffer_read_memory(bfd_vma memaddr, bfd_byte *myaddr, int length, - struct disassemble_info *info) +/* + * Get LENGTH bytes from info's buffer, at host address memaddr. + * Transfer them to myaddr. + */ +static int host_read_memory(bfd_vma memaddr, bfd_byte *myaddr, int length, + struct disassemble_info *info) { if (memaddr < info->buffer_vma - || memaddr + length > info->buffer_vma + info->buffer_length) + || memaddr + length > info->buffer_vma + info->buffer_length) { /* Out of bounds. Use EIO because GDB uses it. */ return EIO; + } memcpy (myaddr, info->buffer + (memaddr - info->buffer_vma), length); return 0; } =20 -/* Get LENGTH bytes from info's buffer, at target address memaddr. - Transfer them to myaddr. */ -static int -target_read_memory (bfd_vma memaddr, - bfd_byte *myaddr, - int length, - struct disassemble_info *info) +/* + * Get LENGTH bytes from info's buffer, at target address memaddr. + * Transfer them to myaddr. + */ +static int target_read_memory(bfd_vma memaddr, bfd_byte *myaddr, int lengt= h, + struct disassemble_info *info) { CPUDebug *s =3D container_of(info, CPUDebug, info); - int r; - - r =3D cpu_memory_rw_debug(s->cpu, memaddr, myaddr, length, 0); - + int r =3D cpu_memory_rw_debug(s->cpu, memaddr, myaddr, length, 0); return r ? EIO : 0; } =20 /* Print an error message. We can assume that this is in response to - an error return from buffer_read_memory. */ -void -perror_memory (int status, bfd_vma memaddr, struct disassemble_info *info) + an error return from {host,target}_read_memory. */ +static void perror_memory(int status, bfd_vma memaddr, + struct disassemble_info *info) { - if (status !=3D EIO) - /* Can't happen. */ - (*info->fprintf_func) (info->stream, "Unknown error %d\n", status); - else - /* Actually, address between memaddr and memaddr + len was - out of bounds. */ - (*info->fprintf_func) (info->stream, - "Address 0x%" PRIx64 " is out of bounds.\n", memaddr); + if (status !=3D EIO) { + /* Can't happen. */ + info->fprintf_func(info->stream, "Unknown error %d\n", status); + } else { + /* Address between memaddr and memaddr + len was out of bounds. */ + info->fprintf_func(info->stream, + "Address 0x%" PRIx64 " is out of bounds.\n", + memaddr); + } } =20 -/* This could be in a separate file, to save minuscule amounts of space - in statically linked executables. */ - -/* Just print the address is hex. This is included for completeness even - though both GDB and objdump provide their own (to print symbolic - addresses). */ - -void -generic_print_address (bfd_vma addr, struct disassemble_info *info) +/* Print address in hex. */ +static void print_address(bfd_vma addr, struct disassemble_info *info) { - (*info->fprintf_func) (info->stream, "0x%" PRIx64, addr); + info->fprintf_func(info->stream, "0x%" PRIx64, addr); } =20 /* Print address in hex, truncated to the width of a host virtual address.= */ -static void -generic_print_host_address(bfd_vma addr, struct disassemble_info *info) +static void host_print_address(bfd_vma addr, struct disassemble_info *info) { - uint64_t mask =3D ~0ULL >> (64 - (sizeof(void *) * 8)); - generic_print_address(addr & mask, info); + print_address((uintptr_t)addr, info); } =20 -/* Just return the given address. */ - -int -generic_symbol_at_address (bfd_vma addr, struct disassemble_info *info) +/* Stub prevents some fruitless earching in optabs disassemblers. */ +static int symbol_at_address(bfd_vma addr, struct disassemble_info *info) { - return 1; + return 1; } =20 bfd_vma bfd_getl64 (const bfd_byte *addr) @@ -423,36 +411,116 @@ static bool cap_disas_monitor(disassemble_info *info= , uint64_t pc, int count) # define cap_disas_plugin(i, p, c) false #endif /* CONFIG_CAPSTONE */ =20 +static void initialize_debug(CPUDebug *s) +{ + memset(s, 0, sizeof(*s)); + s->info.arch =3D bfd_arch_unknown; + s->info.cap_arch =3D -1; + s->info.cap_insn_unit =3D 4; + s->info.cap_insn_split =3D 4; + s->info.memory_error_func =3D perror_memory; + s->info.symbol_at_address_func =3D symbol_at_address; +} + +static void initialize_debug_target(CPUDebug *s, CPUState *cpu) +{ + initialize_debug(s); + + s->cpu =3D cpu; + s->info.read_memory_func =3D target_read_memory; + s->info.print_address_func =3D print_address; +#ifdef TARGET_WORDS_BIGENDIAN + s->info.endian =3D BFD_ENDIAN_BIG; +#else + s->info.endian =3D BFD_ENDIAN_LITTLE; +#endif + + CPUClass *cc =3D CPU_GET_CLASS(cpu); + if (cc->disas_set_info) { + cc->disas_set_info(cpu, &s->info); + } +} + +static void initialize_debug_host(CPUDebug *s) +{ + initialize_debug(s); + + s->info.read_memory_func =3D host_read_memory; + s->info.print_address_func =3D host_print_address; +#ifdef HOST_WORDS_BIGENDIAN + s->info.endian =3D BFD_ENDIAN_BIG; +#else + s->info.endian =3D BFD_ENDIAN_LITTLE; +#endif +#if defined(CONFIG_TCG_INTERPRETER) + s->info.print_insn =3D print_insn_tci; +#elif defined(__i386__) + s->info.mach =3D bfd_mach_i386_i386; + s->info.print_insn =3D print_insn_i386; + s->info.cap_arch =3D CS_ARCH_X86; + s->info.cap_mode =3D CS_MODE_32; + s->info.cap_insn_unit =3D 1; + s->info.cap_insn_split =3D 8; +#elif defined(__x86_64__) + s->info.mach =3D bfd_mach_x86_64; + s->info.print_insn =3D print_insn_i386; + s->info.cap_arch =3D CS_ARCH_X86; + s->info.cap_mode =3D CS_MODE_64; + s->info.cap_insn_unit =3D 1; + s->info.cap_insn_split =3D 8; +#elif defined(_ARCH_PPC) + s->info.disassembler_options =3D (char *)"any"; + s->info.print_insn =3D print_insn_ppc; + s->info.cap_arch =3D CS_ARCH_PPC; +# ifdef _ARCH_PPC64 + s->info.cap_mode =3D CS_MODE_64; +# endif +#elif defined(__riscv) && defined(CONFIG_RISCV_DIS) +#if defined(_ILP32) || (__riscv_xlen =3D=3D 32) + s->info.print_insn =3D print_insn_riscv32; +#elif defined(_LP64) + s->info.print_insn =3D print_insn_riscv64; +#else +#error unsupported RISC-V ABI +#endif +#elif defined(__aarch64__) && defined(CONFIG_ARM_A64_DIS) + s->info.print_insn =3D print_insn_arm_a64; + s->info.cap_arch =3D CS_ARCH_ARM64; +#elif defined(__alpha__) + s->info.print_insn =3D print_insn_alpha; +#elif defined(__sparc__) + s->info.print_insn =3D print_insn_sparc; + s->info.mach =3D bfd_mach_sparc_v9b; +#elif defined(__arm__) + /* TCG only generates code for arm mode. */ + s->info.print_insn =3D print_insn_arm; + s->info.cap_arch =3D CS_ARCH_ARM; +#elif defined(__MIPSEB__) + s->info.print_insn =3D print_insn_big_mips; +#elif defined(__MIPSEL__) + s->info.print_insn =3D print_insn_little_mips; +#elif defined(__m68k__) + s->info.print_insn =3D print_insn_m68k; +#elif defined(__s390__) + s->info.print_insn =3D print_insn_s390; +#elif defined(__hppa__) + s->info.print_insn =3D print_insn_hppa; +#endif +} + /* Disassemble this for me please... (debugging). */ void target_disas(FILE *out, CPUState *cpu, target_ulong code, target_ulong size) { - CPUClass *cc =3D CPU_GET_CLASS(cpu); target_ulong pc; int count; CPUDebug s; =20 - INIT_DISASSEMBLE_INFO(s.info, out, fprintf); - - s.cpu =3D cpu; - s.info.read_memory_func =3D target_read_memory; + initialize_debug_target(&s, cpu); + s.info.fprintf_func =3D fprintf; + s.info.stream =3D out; s.info.buffer_vma =3D code; s.info.buffer_length =3D size; - s.info.print_address_func =3D generic_print_address; - s.info.cap_arch =3D -1; - s.info.cap_mode =3D 0; - s.info.cap_insn_unit =3D 4; - s.info.cap_insn_split =3D 4; - -#ifdef TARGET_WORDS_BIGENDIAN - s.info.endian =3D BFD_ENDIAN_BIG; -#else - s.info.endian =3D BFD_ENDIAN_LITTLE; -#endif - - if (cc->disas_set_info) { - cc->disas_set_info(cpu, &s.info); - } =20 if (s.info.cap_arch >=3D 0 && cap_disas_target(&s.info, code, size)) { return; @@ -540,34 +608,17 @@ bool cap_disas_plugin(disassemble_info *info, uint64_= t pc, size_t size) */ char *plugin_disas(CPUState *cpu, uint64_t addr, size_t size) { - CPUClass *cc =3D CPU_GET_CLASS(cpu); int count; CPUDebug s; GString *ds =3D g_string_set_size(&plugin_disas_output, 0); =20 g_assert(ds =3D=3D &plugin_disas_output); =20 - INIT_DISASSEMBLE_INFO(s.info, NULL, plugin_printf); - - s.cpu =3D cpu; - s.info.read_memory_func =3D target_read_memory; + initialize_debug_target(&s, cpu); + s.info.fprintf_func =3D plugin_printf; s.info.buffer_vma =3D addr; s.info.buffer_length =3D size; s.info.print_address_func =3D plugin_print_address; - s.info.cap_arch =3D -1; - s.info.cap_mode =3D 0; - s.info.cap_insn_unit =3D 4; - s.info.cap_insn_split =3D 4; - -#ifdef TARGET_WORDS_BIGENDIAN - s.info.endian =3D BFD_ENDIAN_BIG; -#else - s.info.endian =3D BFD_ENDIAN_LITTLE; -#endif - - if (cc->disas_set_info) { - cc->disas_set_info(cpu, &s.info); - } =20 if (s.info.cap_arch >=3D 0 && cap_disas_plugin(&s.info, addr, size)) { return g_strdup(ds->str); @@ -593,89 +644,24 @@ void disas(FILE *out, void *code, unsigned long size) uintptr_t pc; int count; CPUDebug s; - int (*print_insn)(bfd_vma pc, disassemble_info *info) =3D NULL; - - INIT_DISASSEMBLE_INFO(s.info, out, fprintf); - s.info.print_address_func =3D generic_print_host_address; =20 + initialize_debug_host(&s); + s.info.fprintf_func =3D fprintf; + s.info.stream =3D out; s.info.buffer =3D code; s.info.buffer_vma =3D (uintptr_t)code; s.info.buffer_length =3D size; - s.info.cap_arch =3D -1; - s.info.cap_mode =3D 0; - s.info.cap_insn_unit =3D 4; - s.info.cap_insn_split =3D 4; - -#ifdef HOST_WORDS_BIGENDIAN - s.info.endian =3D BFD_ENDIAN_BIG; -#else - s.info.endian =3D BFD_ENDIAN_LITTLE; -#endif -#if defined(CONFIG_TCG_INTERPRETER) - print_insn =3D print_insn_tci; -#elif defined(__i386__) - s.info.mach =3D bfd_mach_i386_i386; - print_insn =3D print_insn_i386; - s.info.cap_arch =3D CS_ARCH_X86; - s.info.cap_mode =3D CS_MODE_32; - s.info.cap_insn_unit =3D 1; - s.info.cap_insn_split =3D 8; -#elif defined(__x86_64__) - s.info.mach =3D bfd_mach_x86_64; - print_insn =3D print_insn_i386; - s.info.cap_arch =3D CS_ARCH_X86; - s.info.cap_mode =3D CS_MODE_64; - s.info.cap_insn_unit =3D 1; - s.info.cap_insn_split =3D 8; -#elif defined(_ARCH_PPC) - s.info.disassembler_options =3D (char *)"any"; - print_insn =3D print_insn_ppc; - s.info.cap_arch =3D CS_ARCH_PPC; -# ifdef _ARCH_PPC64 - s.info.cap_mode =3D CS_MODE_64; -# endif -#elif defined(__riscv) && defined(CONFIG_RISCV_DIS) -#if defined(_ILP32) || (__riscv_xlen =3D=3D 32) - print_insn =3D print_insn_riscv32; -#elif defined(_LP64) - print_insn =3D print_insn_riscv64; -#else -#error unsupported RISC-V ABI -#endif -#elif defined(__aarch64__) && defined(CONFIG_ARM_A64_DIS) - print_insn =3D print_insn_arm_a64; - s.info.cap_arch =3D CS_ARCH_ARM64; -#elif defined(__alpha__) - print_insn =3D print_insn_alpha; -#elif defined(__sparc__) - print_insn =3D print_insn_sparc; - s.info.mach =3D bfd_mach_sparc_v9b; -#elif defined(__arm__) - print_insn =3D print_insn_arm; - s.info.cap_arch =3D CS_ARCH_ARM; - /* TCG only generates code for arm mode. */ -#elif defined(__MIPSEB__) - print_insn =3D print_insn_big_mips; -#elif defined(__MIPSEL__) - print_insn =3D print_insn_little_mips; -#elif defined(__m68k__) - print_insn =3D print_insn_m68k; -#elif defined(__s390__) - print_insn =3D print_insn_s390; -#elif defined(__hppa__) - print_insn =3D print_insn_hppa; -#endif =20 if (s.info.cap_arch >=3D 0 && cap_disas_host(&s.info, code, size)) { return; } =20 - if (print_insn =3D=3D NULL) { - print_insn =3D print_insn_od_host; + if (s.info.print_insn =3D=3D NULL) { + s.info.print_insn =3D print_insn_od_host; } for (pc =3D (uintptr_t)code; size > 0; pc +=3D count, size -=3D count)= { fprintf(out, "0x%08" PRIxPTR ": ", pc); - count =3D print_insn(pc, &s.info); + count =3D s.info.print_insn(pc, &s.info); fprintf(out, "\n"); if (count < 0) { break; @@ -720,31 +706,15 @@ physical_read_memory(bfd_vma memaddr, bfd_byte *myadd= r, int length, void monitor_disas(Monitor *mon, CPUState *cpu, target_ulong pc, int nb_insn, int is_physical) { - CPUClass *cc =3D CPU_GET_CLASS(cpu); int count, i; CPUDebug s; =20 - INIT_DISASSEMBLE_INFO(s.info, NULL, qemu_fprintf); - - s.cpu =3D cpu; - s.info.read_memory_func - =3D (is_physical ? physical_read_memory : target_read_memory); - s.info.print_address_func =3D generic_print_address; - s.info.buffer_vma =3D pc; - s.info.cap_arch =3D -1; - s.info.cap_mode =3D 0; - s.info.cap_insn_unit =3D 4; - s.info.cap_insn_split =3D 4; - -#ifdef TARGET_WORDS_BIGENDIAN - s.info.endian =3D BFD_ENDIAN_BIG; -#else - s.info.endian =3D BFD_ENDIAN_LITTLE; -#endif - - if (cc->disas_set_info) { - cc->disas_set_info(cpu, &s.info); + initialize_debug_target(&s, cpu); + s.info.fprintf_func =3D qemu_fprintf; + if (is_physical) { + s.info.read_memory_func =3D physical_read_memory; } + s.info.buffer_vma =3D pc; =20 if (s.info.cap_arch >=3D 0 && cap_disas_monitor(&s.info, pc, nb_insn))= { return; --=20 2.25.1 From nobody Fri May 3 11:23:16 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1600387342; cv=none; d=zohomail.com; s=zohoarc; b=bk5ckMch6ti9l2x5tdhFrko66Pz8bOktfp2D472URAlDUWlC//roFqXo3Wdvvb9gD2+WrGx9gWP9vY7VzhOUls2uDdJGFfDJhcFdNTBZo1Kn+DNOOYpqhCAQ2oaBqt9TXmVbXS7ibO35eAQ0GuAjdl4bcWzEMAjYak5SyWV80RA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600387342; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=kjSlGDaz/gKdqZUsB3eBl8fd3FyvHs6q0rMsilYCIuA=; b=DLdQGUiHrXAp6dNYTy8mVgRcYic1HBeEYKwJNYrO7oTc11yapFsDqRblLOhce+9K82S8h4j3sO3xntXLiA3oKBNOf7L33ib+MBuubAmgVAeLnR12s7FKdevtUiAOAmIUzsP49lFTEEs5PD7D7Q32hrpiXrLoRmEZsq62e/Qc9mU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1600387342510345.02009746753254; Thu, 17 Sep 2020 17:02:22 -0700 (PDT) Received: from localhost ([::1]:43910 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kJ3r2-0000Qs-Va for importer@patchew.org; Thu, 17 Sep 2020 20:02:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36242) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJ3mN-0003li-OW for qemu-devel@nongnu.org; Thu, 17 Sep 2020 19:57:31 -0400 Received: from mail-pf1-x443.google.com ([2607:f8b0:4864:20::443]:39000) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kJ3mL-0006eV-VC for qemu-devel@nongnu.org; Thu, 17 Sep 2020 19:57:31 -0400 Received: by mail-pf1-x443.google.com with SMTP id n14so2252868pff.6 for ; Thu, 17 Sep 2020 16:57:29 -0700 (PDT) Received: from localhost.localdomain ([71.212.141.89]) by smtp.gmail.com with ESMTPSA id m13sm772699pfk.103.2020.09.17.16.57.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Sep 2020 16:57:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kjSlGDaz/gKdqZUsB3eBl8fd3FyvHs6q0rMsilYCIuA=; b=uG+j9ebaGVqMlWfPMwT/68dawIqiIiGUB+ERUgi86sesnpmmGo8xnWTzWVJe4dBboG J1G7pbaCg+c8Opm9x0WkUkMYBjucs4ktez7L/XtQg4VCZnzyaGTLkWXGGhLm/D+PtQEa oFIXPblM+dednCrgGLMF9ZatPdaupiLCQjSgDrmGyIXeWO9hNXwI6KbZK58/zg46ZPRf uV26wBzrRDnm7ODSU3Ed0TeI3N9ijm1VvZkzRzWD8qcoRTy+eaRHfhCyd6/6AAhk6yD4 0zpkxXlJvGfsOgmRLBRhAjX37DVIosM43azM3d+JqY1gBgTNYTNP9GLLbvOfkY2isNIQ ws7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kjSlGDaz/gKdqZUsB3eBl8fd3FyvHs6q0rMsilYCIuA=; b=GrVgWBTJYyDerijxXGR6fIahSNRK/iRRR04YSuWu9C82lyTsf7US9OdPwzoM871j0K zNg8qsEcUiQKOcoIlwC9zx9Y0HAa8Y1fsn1KOEWZlfule2TrZkhOzd9mCbVQ1lHWoH6f stve5eAqfmhzakLKu9dTT33tc9o/lCUQWOid6z0iC0KU5FjmHDXeF2fCZiXl8XjkMyQu g/AsDCZHSSSlDAVDDk4uy18e3AGVZMwLOqiBaZo9spRWjsYCEYUGEw1lafoaJW8sTnZS jkNARn+VMmJ5j/C3OSiT0eOp1JAlGXn1+d+UfKyads1/wjN/O+39gJqTTP12A1gYnzM1 Nz0A== X-Gm-Message-State: AOAM531muz51qzKi3StxL3JqMAmdu4+W7awWwJiImtlZ/6BP0yvj/xT/ SuH8bMTQPLR7J6eggJxUKmAAucgMwEu/CQ== X-Google-Smtp-Source: ABdhPJwVuMJVl0M0z68cph5gwoBFTtm01irYEYWcznLzZ8zG+hMkAGEenSwJ1qicZUcGkuH9cebiyw== X-Received: by 2002:a63:6fc6:: with SMTP id k189mr23895970pgc.165.1600387048333; Thu, 17 Sep 2020 16:57:28 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 05/10] disas: Use qemu/bswap.h for bfd endian loads Date: Thu, 17 Sep 2020 16:57:15 -0700 Message-Id: <20200917235720.2685978-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200917235720.2685978-1-richard.henderson@linaro.org> References: <20200917235720.2685978-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::443; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x443.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Use the routines we have already instead of open-coding. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson --- include/disas/dis-asm.h | 32 ++++++++++++++++++++---- disas.c | 55 ----------------------------------------- 2 files changed, 27 insertions(+), 60 deletions(-) diff --git a/include/disas/dis-asm.h b/include/disas/dis-asm.h index dda247eaf2..6b45aa9898 100644 --- a/include/disas/dis-asm.h +++ b/include/disas/dis-asm.h @@ -466,11 +466,33 @@ int print_insn_rx(bfd_vma, disassemble_info *); =20 /* from libbfd */ =20 -bfd_vma bfd_getl64 (const bfd_byte *addr); -bfd_vma bfd_getl32 (const bfd_byte *addr); -bfd_vma bfd_getb32 (const bfd_byte *addr); -bfd_vma bfd_getl16 (const bfd_byte *addr); -bfd_vma bfd_getb16 (const bfd_byte *addr); +#include "qemu/bswap.h" + +static inline bfd_vma bfd_getl64(const bfd_byte *addr) +{ + return ldq_le_p(addr); +} + +static inline bfd_vma bfd_getl32(const bfd_byte *addr) +{ + return (uint32_t)ldl_le_p(addr); +} + +static inline bfd_vma bfd_getl16(const bfd_byte *addr) +{ + return lduw_le_p(addr); +} + +static inline bfd_vma bfd_getb32(const bfd_byte *addr) +{ + return (uint32_t)ldl_be_p(addr); +} + +static inline bfd_vma bfd_getb16(const bfd_byte *addr) +{ + return lduw_be_p(addr); +} + typedef bool bfd_boolean; =20 #endif /* DISAS_DIS_ASM_H */ diff --git a/disas.c b/disas.c index 7bc8e9a037..bf19b1b0bf 100644 --- a/disas.c +++ b/disas.c @@ -78,61 +78,6 @@ static int symbol_at_address(bfd_vma addr, struct disass= emble_info *info) return 1; } =20 -bfd_vma bfd_getl64 (const bfd_byte *addr) -{ - unsigned long long v; - - v =3D (unsigned long long) addr[0]; - v |=3D (unsigned long long) addr[1] << 8; - v |=3D (unsigned long long) addr[2] << 16; - v |=3D (unsigned long long) addr[3] << 24; - v |=3D (unsigned long long) addr[4] << 32; - v |=3D (unsigned long long) addr[5] << 40; - v |=3D (unsigned long long) addr[6] << 48; - v |=3D (unsigned long long) addr[7] << 56; - return (bfd_vma) v; -} - -bfd_vma bfd_getl32 (const bfd_byte *addr) -{ - unsigned long v; - - v =3D (unsigned long) addr[0]; - v |=3D (unsigned long) addr[1] << 8; - v |=3D (unsigned long) addr[2] << 16; - v |=3D (unsigned long) addr[3] << 24; - return (bfd_vma) v; -} - -bfd_vma bfd_getb32 (const bfd_byte *addr) -{ - unsigned long v; - - v =3D (unsigned long) addr[0] << 24; - v |=3D (unsigned long) addr[1] << 16; - v |=3D (unsigned long) addr[2] << 8; - v |=3D (unsigned long) addr[3]; - return (bfd_vma) v; -} - -bfd_vma bfd_getl16 (const bfd_byte *addr) -{ - unsigned long v; - - v =3D (unsigned long) addr[0]; - v |=3D (unsigned long) addr[1] << 8; - return (bfd_vma) v; -} - -bfd_vma bfd_getb16 (const bfd_byte *addr) -{ - unsigned long v; - - v =3D (unsigned long) addr[0] << 24; - v |=3D (unsigned long) addr[1] << 16; - return (bfd_vma) v; -} - static int print_insn_objdump(bfd_vma pc, disassemble_info *info, const char *prefix) { --=20 2.25.1 From nobody Fri May 3 11:23:16 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1600387342; cv=none; d=zohomail.com; s=zohoarc; b=YVMQAkJfqamoDyays39/HXJOx+MZRxmNFdYM2LCwMCJQH+xBiAo9tCggaJ4IZH0sNgWP/4zg2hGX59YOccsD5+otbNO1in8BSjdG/JtOqIX0MaPthyVBGI/3SzBLiF8A+pw3dr4zat658pwlqREU8YPOmdSVVlj9GKjBZKvf7qE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600387342; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=AcobOMV5CV8pSJwR9n+sDy8pDWv6IjgjNuunOfxWOco=; b=GEMwUGVCiv3yPlM8rhVXKrZf06im3v7yX27h8yCGF9rdY2W65leqDVb1hADn5gh3m9ZFxZR+7SU1VU6ZHRYZ0KUf/9Hd5QEMrq7AxD/6z2JnxBq2S/1dFd0nn06WsyPbZLvUGMFmPKBLuREnveJBLL8Eym+teI5nbmI376/q//s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1600387342273246.62156589217818; Thu, 17 Sep 2020 17:02:22 -0700 (PDT) Received: from localhost ([::1]:44004 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kJ3r3-0000TD-64 for importer@patchew.org; Thu, 17 Sep 2020 20:02:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36256) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJ3mO-0003nx-V2 for qemu-devel@nongnu.org; Thu, 17 Sep 2020 19:57:32 -0400 Received: from mail-pl1-x644.google.com ([2607:f8b0:4864:20::644]:44603) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kJ3mN-0006er-3E for qemu-devel@nongnu.org; Thu, 17 Sep 2020 19:57:32 -0400 Received: by mail-pl1-x644.google.com with SMTP id j7so1982123plk.11 for ; Thu, 17 Sep 2020 16:57:30 -0700 (PDT) Received: from localhost.localdomain ([71.212.141.89]) by smtp.gmail.com with ESMTPSA id m13sm772699pfk.103.2020.09.17.16.57.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Sep 2020 16:57:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=AcobOMV5CV8pSJwR9n+sDy8pDWv6IjgjNuunOfxWOco=; b=pEDHUqBrU6q5a/sS3cYJpf2ubqxocJK1ib0B7QJW0v5XVdX8SVJhJx9I1A8hqe9t7Z +UTbeB8hWLudH3/HNhsQ23UD8IW7wvEd9rx3JGEsll2OJ/eZ6Z/j4Dlu51yU1mC+QdMS jJoDCdVEZCQvx57qXIgi6tBVumGKh/IQqkFnSKLjyXgM0R6Fj1OmjwYJ3TSFTsMBgqNf Lklg4ovZ4e+Z/TC510u3BJ9RHE/3DJgQiUSuSLAJU3UzgK2O3UAn2jE+V9ZWpgeoorh3 jrPaUqGZAHo2OTu8vwvt3MpvelxcS+Bd1x06K9bcuWKdrPpdEl3acTppnES1PsCNTk7x b+Kg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=AcobOMV5CV8pSJwR9n+sDy8pDWv6IjgjNuunOfxWOco=; b=DsMEiuPXUuxEoudXuKYoWgAk+BUgv7ni9ZfyYafE/bizEZ3bXH40MpyB8hYgfq8p4S piFT9E0ELSIzq49N1RGD4MQTZ1fJ2xFj0vmXF6AzCy1hHc7amHiTXAPqtyEoyCpAmKGm 1iJp1aNHdym3fZ5xUAFjJ4z9X3j6QP6YFtDfqCY+NcsDPeSJOwWRbfpIzWVKUIAdi2W0 9MgARYme2wfUPlYQd4e5WtLzCkqizLz4+UBGuICm569di6YQtMHhkvwperoAif6kwLbA HYwtnkB+QjAIDJDLGrsGPHg8/m6udzhjfZk3R0zc9JZnf+Etie3QDJSOdCZqsOH8ghKU 3pGQ== X-Gm-Message-State: AOAM532oj0ftGomSsXpJ6Mtw7PA2d0w7ZCaT7n3oXCnvIwbpEX6Cj0mu jhWzF5mlqcDMDylK1iJM5bqm1lSnvCnNFQ== X-Google-Smtp-Source: ABdhPJyP1P9V+zDgJ05lzW5VVvjMJkDWu7IDAxDP2blf/fYLYwpYQYUbFDI6nMmJerwRDqiDWSZizg== X-Received: by 2002:a17:902:8bc2:b029:d0:cbe1:e7a6 with SMTP id r2-20020a1709028bc2b02900d0cbe1e7a6mr30779035plo.23.1600387049432; Thu, 17 Sep 2020 16:57:29 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 06/10] disas: Cleanup plugin_disas Date: Thu, 17 Sep 2020 16:57:16 -0700 Message-Id: <20200917235720.2685978-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200917235720.2685978-1-richard.henderson@linaro.org> References: <20200917235720.2685978-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::644; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x644.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_PDS_OTHER_BAD_TLD=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" Do not retain a GString in thread-local storage. Allocate a new one and free it on every invocation. Do not g_strdup the result; return the buffer from the GString. Do not use warn_report. Using cs_disasm allocated memory via the &insn parameter, but that was never freed. Use cs_disasm_iter so that we use the memory that we've already allocated, and so that we only try to disassemble one insn, as desired. Do not allocate 1k to hold the bytes for a single instruction. Signed-off-by: Richard Henderson --- disas.c | 55 +++++++++++++++++++------------------------------------ 1 file changed, 19 insertions(+), 36 deletions(-) diff --git a/disas.c b/disas.c index bf19b1b0bf..d0ccd4b727 100644 --- a/disas.c +++ b/disas.c @@ -491,13 +491,12 @@ void target_disas(FILE *out, CPUState *cpu, target_ul= ong code, } } =20 -static __thread GString plugin_disas_output; - static int plugin_printf(FILE *stream, const char *fmt, ...) { - va_list va; - GString *s =3D &plugin_disas_output; + /* We abuse the FILE parameter to pass a GString. */ + GString *s =3D (GString *)stream; int initial_len =3D s->len; + va_list va; =20 va_start(va, fmt); g_string_append_vprintf(s, fmt, va); @@ -517,28 +516,20 @@ static void plugin_print_address(bfd_vma addr, struct= disassemble_info *info) static bool cap_disas_plugin(disassemble_info *info, uint64_t pc, size_t size) { - uint8_t cap_buf[1024]; + uint8_t cap_buf[64]; + const uint8_t *cbuf =3D cap_buf; csh handle; - cs_insn *insn; - size_t csize =3D 0; - int count; - GString *s =3D &plugin_disas_output; =20 if (cap_disas_start(info, &handle) !=3D CS_ERR_OK) { return false; } - insn =3D cap_insn; =20 - size_t tsize =3D MIN(sizeof(cap_buf) - csize, size); - const uint8_t *cbuf =3D cap_buf; - target_read_memory(pc, cap_buf, tsize, info); + assert(size < sizeof(cap_buf)); + target_read_memory(pc, cap_buf, size, info); =20 - count =3D cs_disasm(handle, cbuf, size, 0, 1, &insn); - - if (count) { - g_string_printf(s, "%s %s", insn->mnemonic, insn->op_str); - } else { - g_string_printf(s, "cs_disasm failed"); + if (cs_disasm_iter(handle, &cbuf, &size, &pc, cap_insn)) { + GString *s =3D (GString *)info->stream; + g_string_printf(s, "%s %s", cap_insn->mnemonic, cap_insn->op_str); } =20 cs_close(&handle); @@ -553,34 +544,26 @@ bool cap_disas_plugin(disassemble_info *info, uint64_= t pc, size_t size) */ char *plugin_disas(CPUState *cpu, uint64_t addr, size_t size) { - int count; CPUDebug s; - GString *ds =3D g_string_set_size(&plugin_disas_output, 0); - - g_assert(ds =3D=3D &plugin_disas_output); + GString *ds =3D g_string_new(NULL); =20 initialize_debug_target(&s, cpu); s.info.fprintf_func =3D plugin_printf; + s.info.stream =3D (FILE *)ds; /* abuse this slot */ s.info.buffer_vma =3D addr; s.info.buffer_length =3D size; s.info.print_address_func =3D plugin_print_address; =20 if (s.info.cap_arch >=3D 0 && cap_disas_plugin(&s.info, addr, size)) { - return g_strdup(ds->str); + ; /* done */ + } else if (s.info.print_insn) { + s.info.print_insn(addr, &s.info); + } else { + ; /* cannot disassemble -- return empty string */ } =20 - if (s.info.print_insn =3D=3D NULL) { - s.info.print_insn =3D print_insn_od_target; - } - - count =3D s.info.print_insn(addr, &s.info); - - /* The decoder probably read more than it needed it's not critical */ - if (count < size) { - warn_report("%s: %zu bytes left over", __func__, size - count); - } - - return g_strdup(ds->str); + /* Return the buffer, freeing the GString container. */ + return g_string_free(ds, false); } =20 /* Disassemble this for me please... (debugging). */ --=20 2.25.1 From nobody Fri May 3 11:23:16 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1600387378; cv=none; d=zohomail.com; s=zohoarc; b=MrO+ZBNT0GQIdhJtoVHsl6W8O2kQkJl88JAsuSwVvqE8lP1L1sUnOiCzjwiaIafQZl6bhVrFGByL0eOW5pBlRvHS3fpcLEFYUy8w8/C54m1A5Qtg++yu2L6gbVAVYy9+sLEyP00aWsvDwshWS++9We59v8FiLRkcYoI/j9xhxjs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600387378; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=h5z7SnNwk2VZk90FP96rDl2asHH4IwwqX+odhVzyeAE=; b=HjRVjPTeCBkV+nTBMmdDe1M3zu+bVAomkVJqCn5OdIDH8nHLvEo9MGCEtWX68LsABAQjWckfV84NAeYdx5eNKThh3TTDQAzWkgIJeSdE0LHsPJ1EAokv668wKZsUMg7mLd3eDtTvgxwgr5DHiL670jLQ+jCl948s5vRPcaX7QBU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1600387378139528.6709983965217; Thu, 17 Sep 2020 17:02:58 -0700 (PDT) Received: from localhost ([::1]:47016 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kJ3rb-0001hj-HN for importer@patchew.org; Thu, 17 Sep 2020 20:02:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36324) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJ3mS-0003xs-Rz for qemu-devel@nongnu.org; Thu, 17 Sep 2020 19:57:36 -0400 Received: from mail-pf1-x444.google.com ([2607:f8b0:4864:20::444]:33316) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kJ3mO-0006fI-KQ for qemu-devel@nongnu.org; Thu, 17 Sep 2020 19:57:36 -0400 Received: by mail-pf1-x444.google.com with SMTP id z18so2270815pfg.0 for ; Thu, 17 Sep 2020 16:57:32 -0700 (PDT) Received: from localhost.localdomain ([71.212.141.89]) by smtp.gmail.com with ESMTPSA id m13sm772699pfk.103.2020.09.17.16.57.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Sep 2020 16:57:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=h5z7SnNwk2VZk90FP96rDl2asHH4IwwqX+odhVzyeAE=; b=u54oCRdb12zlUkempGW1AxdiSN2pSg1PSBh1rCI3G1NjR3JRw6HK4NyL2kLlzR5rIe p+OIXh1zGPj8eWjBtKVUW+fCTRVBYbCAC9y9an378tf0W5g+vDKrWDDnP22/YM41+Dkv b/qdr2x88/l/GHG/pg1s+WfzYhBX+aPqPDfqQz6x6oqlp3VBUqdwcs0nQPiTf64DCxYz /sDNl8QaLCJ+FhLvuw0mfnMrF6g0TD8vBdn53smjOOT0k2EWzUjCv7Tjp9lbJ5uSLTfx WFuDRGCdn0XhRpkIt9ipIRVBukaAiMYBZ0mCdhDYR4arz6lrFX4eAuuiZxEd+ZpvJLRK 8EwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=h5z7SnNwk2VZk90FP96rDl2asHH4IwwqX+odhVzyeAE=; b=WSpYogewiPvLwU0swDDz6PHsAkOAE4Wpw1m4lg0JdIqyIyhr96jjwMfCAYk0PGxquu VRKQOdrpGNFX1M4xHMRAWqgpM9p6J4AoukWJ09loeJsRVREzEAQMWbv1aG7x2fa6qgwy zNGGLTgMAgXbeOvT0QKvlDItFO9jcM7y7kbsSfWNBE5x7eFW+x0+80cGtWTYr6kxCWw9 26Ll070viGJNJv9vVtTlBUnfXAbe1/bTbc5ttuz7+XtrMm9MBAn6CuM8S52lB0lUQqnG Up8I8fnae5xZtEAdImI+2+pa5sU06oLeAUoZ/diHHx45QsdcRBEQRc8B2+9W/GdsG0bk I6Dg== X-Gm-Message-State: AOAM530qLvuoYSGriEqb4hcFFW5BVASWs9Xqvuu9jQGBTiT8dAZMn8T9 LFnuQr+IEZdQcDtZTFwh1sbK/xVGL8DxJw== X-Google-Smtp-Source: ABdhPJxpEDz8hu+pBn67n3wiHPzgeo0r4/ZB0J5lDchrLUnvgVTTlH/A1t7r9pQZSYk+FuaBowlyug== X-Received: by 2002:a63:205d:: with SMTP id r29mr23638143pgm.278.1600387050898; Thu, 17 Sep 2020 16:57:30 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 07/10] disas: Configure capstone for aarch64 host without libvixl Date: Thu, 17 Sep 2020 16:57:17 -0700 Message-Id: <20200917235720.2685978-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200917235720.2685978-1-richard.henderson@linaro.org> References: <20200917235720.2685978-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::444; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x444.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" The ifdef tangle failed to set cap_arch if libvixl itself was not configured (e.g. due to lack of c++ compiler). Reviewed-by: Thomas Huth Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- disas.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/disas.c b/disas.c index d0ccd4b727..01c8bc6c9e 100644 --- a/disas.c +++ b/disas.c @@ -428,9 +428,11 @@ static void initialize_debug_host(CPUDebug *s) #else #error unsupported RISC-V ABI #endif -#elif defined(__aarch64__) && defined(CONFIG_ARM_A64_DIS) - s->info.print_insn =3D print_insn_arm_a64; +#elif defined(__aarch64__) s->info.cap_arch =3D CS_ARCH_ARM64; +# ifdef CONFIG_ARM_A64_DIS + s->info.print_insn =3D print_insn_arm_a64; +# endif #elif defined(__alpha__) s->info.print_insn =3D print_insn_alpha; #elif defined(__sparc__) --=20 2.25.1 From nobody Fri May 3 11:23:16 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1600387497; cv=none; d=zohomail.com; s=zohoarc; b=nf9DukjlZZNMmBQ+6PgOiHLdoCknEzo80ZxuPfUomxAzXtz6T7DTjqqORB4VC/vq0yXvHtqxTCiieAlXMfEH9VIZRUcoJZsFnw/jxbFhEai82fomWcQLxp7Qw28ofsa6NytIcJunpn/O2S8ACjaqrzVqeSPU+QTM7xx8l4WZre8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600387497; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=kxms3FS2kG3VRY7JUUSIn+glY/IToVYjcyoEFpFah2g=; b=fGmXIdm+OKXTMwkboEQro1bV1glJwE79lSHNNCXVUmWLERriqHPx+t0ugOfcncpvrUjAvynD78rpiEv84ryUycNDSJcpObcVED/ciuemjxwCcEaNXt40OzL+8UITsH1ZV0mQJNVXWimLw29rZJOdWpIKkMqAmzSJ10aDL+FceO4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1600387497387215.02050401568283; Thu, 17 Sep 2020 17:04:57 -0700 (PDT) Received: from localhost ([::1]:51646 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kJ3tX-0003aK-WB for importer@patchew.org; Thu, 17 Sep 2020 20:04:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36340) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJ3mU-00043V-Rh for qemu-devel@nongnu.org; Thu, 17 Sep 2020 19:57:38 -0400 Received: from mail-pl1-x644.google.com ([2607:f8b0:4864:20::644]:45133) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kJ3mQ-0006fZ-3r for qemu-devel@nongnu.org; Thu, 17 Sep 2020 19:57:38 -0400 Received: by mail-pl1-x644.google.com with SMTP id q12so1982064plr.12 for ; Thu, 17 Sep 2020 16:57:33 -0700 (PDT) Received: from localhost.localdomain ([71.212.141.89]) by smtp.gmail.com with ESMTPSA id m13sm772699pfk.103.2020.09.17.16.57.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Sep 2020 16:57:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=kxms3FS2kG3VRY7JUUSIn+glY/IToVYjcyoEFpFah2g=; b=O6QV+zb/y53SRC4TFEzwK9dUcydWiEW53l+OR1r/9kD6SCXaJ3eCZZe7UPr2Cj2Zas Dz3lwlHRWnwBxhJc17hpEIcF2elj9ouaY7jVg1CUa6f/Z3Qj/5KDh3hUYVo/mzY6Qiqj tM4tNsuxWsUOdTqNe49NI6Gc4Ltw+/AVLtbRbIRtNditK2b0gjO74IgE97CHvGOJYtim 0eVDGh2uQu03Llrtkypl5oRY5EBkOD7setJn+IGFSqkaCg0eS9/DYXE7FbL8tWlZ0KK0 5enJ0NghF1BM5Kr6IOyAk3Ez8MRpd44C+wI9MksV5C7xHuzaARBNpl0sZNBrEoe9u2/3 dYpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kxms3FS2kG3VRY7JUUSIn+glY/IToVYjcyoEFpFah2g=; b=bUACco9TzwJlYbz+p9Q6rbmY65XSJV62rdQgyT9FU9clsF8M13hfdYcTu8d5k2a9eM PFIYAxDQlCEonRU/NKg8d6BWfECNBhMP59gfNuuBuDBA8zqqkiyXytad3PkSLOae4E6h RsWtoq73XdnpF9FO2ItHymqmhIdwarN3T+YpzXs5KYHeQhiROpIiR+ryILQgoRUlrLh4 fFz8cb12kH7BmAXKleC0SDqQjAif21m0yfeu93ftgqxQ269J6N2f1CTAASx10tWw8pwD efDsJLmw4yZhoFYA+g7onLUO+rRCLmaQRfeYzrMHoIPoL7p+XOCvs2qtaecWS/8ugy76 mWjA== X-Gm-Message-State: AOAM531Xp6z9jQVTVbPfJhtEKmvK5Lgby8gnYWGmu+WmcF1i5v0n9c8A zWfBglKld+VZ4fnCYxSaKJfilTW0LLRWiQ== X-Google-Smtp-Source: ABdhPJxQwn6/fJwkEddjUihdiWpzYU1DmU0zX2cFAFN6eyCiaXkiyeHaOCHuWzW+ril+/UcOyi2ksQ== X-Received: by 2002:a17:902:b086:b029:d1:e5e7:bddb with SMTP id p6-20020a170902b086b02900d1e5e7bddbmr12621604plr.59.1600387051902; Thu, 17 Sep 2020 16:57:31 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 08/10] disas: Split out capstone code to disas/capstone.c Date: Thu, 17 Sep 2020 16:57:18 -0700 Message-Id: <20200917235720.2685978-9-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200917235720.2685978-1-richard.henderson@linaro.org> References: <20200917235720.2685978-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::644; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x644.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" There is nothing target-specific about this code, so it can be added to common_ss. This also requires that the base capstone dependency be added to common_ss, so that we get the correct include paths added to CFLAGS. Signed-off-by: Richard Henderson --- include/disas/dis-asm.h | 12 ++ disas.c | 275 -------------------------------------- disas/capstone.c | 286 ++++++++++++++++++++++++++++++++++++++++ disas/meson.build | 1 + meson.build | 1 + 5 files changed, 300 insertions(+), 275 deletions(-) create mode 100644 disas/capstone.c diff --git a/include/disas/dis-asm.h b/include/disas/dis-asm.h index 6b45aa9898..2164762b46 100644 --- a/include/disas/dis-asm.h +++ b/include/disas/dis-asm.h @@ -460,6 +460,18 @@ int print_insn_riscv32 (bfd_vma, disassemble_= info*); int print_insn_riscv64 (bfd_vma, disassemble_info*); int print_insn_rx(bfd_vma, disassemble_info *); =20 +#ifdef CONFIG_CAPSTONE +bool cap_disas_target(disassemble_info *info, uint64_t pc, size_t size); +bool cap_disas_host(disassemble_info *info, void *code, size_t size); +bool cap_disas_monitor(disassemble_info *info, uint64_t pc, int count); +bool cap_disas_plugin(disassemble_info *info, uint64_t pc, size_t size); +#else +# define cap_disas_target(i, p, s) false +# define cap_disas_host(i, p, s) false +# define cap_disas_monitor(i, p, c) false +# define cap_disas_plugin(i, p, c) false +#endif /* CONFIG_CAPSTONE */ + #ifndef ATTRIBUTE_UNUSED #define ATTRIBUTE_UNUSED __attribute__((unused)) #endif diff --git a/disas.c b/disas.c index 01c8bc6c9e..e27dea2c19 100644 --- a/disas.c +++ b/disas.c @@ -107,255 +107,6 @@ static int print_insn_od_target(bfd_vma pc, disassemb= le_info *info) return print_insn_objdump(pc, info, "OBJD-T"); } =20 -#ifdef CONFIG_CAPSTONE -/* Temporary storage for the capstone library. This will be alloced via - malloc with a size private to the library; thus there's no reason not - to share this across calls and across host vs target disassembly. */ -static __thread cs_insn *cap_insn; - -/* Initialize the Capstone library. */ -/* ??? It would be nice to cache this. We would need one handle for the - host and one for the target. For most targets we can reset specific - parameters via cs_option(CS_OPT_MODE, new_mode), but we cannot change - CS_ARCH_* in this way. Thus we would need to be able to close and - re-open the target handle with a different arch for the target in order - to handle AArch64 vs AArch32 mode switching. */ -static cs_err cap_disas_start(disassemble_info *info, csh *handle) -{ - cs_mode cap_mode =3D info->cap_mode; - cs_err err; - - cap_mode +=3D (info->endian =3D=3D BFD_ENDIAN_BIG ? CS_MODE_BIG_ENDIAN - : CS_MODE_LITTLE_ENDIAN); - - err =3D cs_open(info->cap_arch, cap_mode, handle); - if (err !=3D CS_ERR_OK) { - return err; - } - - /* ??? There probably ought to be a better place to put this. */ - if (info->cap_arch =3D=3D CS_ARCH_X86) { - /* We don't care about errors (if for some reason the library - is compiled without AT&T syntax); the user will just have - to deal with the Intel syntax. */ - cs_option(*handle, CS_OPT_SYNTAX, CS_OPT_SYNTAX_ATT); - } - - /* "Disassemble" unknown insns as ".byte W,X,Y,Z". */ - cs_option(*handle, CS_OPT_SKIPDATA, CS_OPT_ON); - - /* Allocate temp space for cs_disasm_iter. */ - if (cap_insn =3D=3D NULL) { - cap_insn =3D cs_malloc(*handle); - if (cap_insn =3D=3D NULL) { - cs_close(handle); - return CS_ERR_MEM; - } - } - return CS_ERR_OK; -} - -static void cap_dump_insn_units(disassemble_info *info, cs_insn *insn, - int i, int n) -{ - fprintf_function print =3D info->fprintf_func; - FILE *stream =3D info->stream; - - switch (info->cap_insn_unit) { - case 4: - if (info->endian =3D=3D BFD_ENDIAN_BIG) { - for (; i < n; i +=3D 4) { - print(stream, " %08x", ldl_be_p(insn->bytes + i)); - - } - } else { - for (; i < n; i +=3D 4) { - print(stream, " %08x", ldl_le_p(insn->bytes + i)); - } - } - break; - - case 2: - if (info->endian =3D=3D BFD_ENDIAN_BIG) { - for (; i < n; i +=3D 2) { - print(stream, " %04x", lduw_be_p(insn->bytes + i)); - } - } else { - for (; i < n; i +=3D 2) { - print(stream, " %04x", lduw_le_p(insn->bytes + i)); - } - } - break; - - default: - for (; i < n; i++) { - print(stream, " %02x", insn->bytes[i]); - } - break; - } -} - -static void cap_dump_insn(disassemble_info *info, cs_insn *insn) -{ - fprintf_function print =3D info->fprintf_func; - int i, n, split; - - print(info->stream, "0x%08" PRIx64 ": ", insn->address); - - n =3D insn->size; - split =3D info->cap_insn_split; - - /* Dump the first SPLIT bytes of the instruction. */ - cap_dump_insn_units(info, insn, 0, MIN(n, split)); - - /* Add padding up to SPLIT so that mnemonics line up. */ - if (n < split) { - int width =3D (split - n) / info->cap_insn_unit; - width *=3D (2 * info->cap_insn_unit + 1); - print(info->stream, "%*s", width, ""); - } - - /* Print the actual instruction. */ - print(info->stream, " %-8s %s\n", insn->mnemonic, insn->op_str); - - /* Dump any remaining part of the insn on subsequent lines. */ - for (i =3D split; i < n; i +=3D split) { - print(info->stream, "0x%08" PRIx64 ": ", insn->address + i); - cap_dump_insn_units(info, insn, i, MIN(n, i + split)); - print(info->stream, "\n"); - } -} - -/* Disassemble SIZE bytes at PC for the target. */ -static bool cap_disas_target(disassemble_info *info, uint64_t pc, size_t s= ize) -{ - uint8_t cap_buf[1024]; - csh handle; - cs_insn *insn; - size_t csize =3D 0; - - if (cap_disas_start(info, &handle) !=3D CS_ERR_OK) { - return false; - } - insn =3D cap_insn; - - while (1) { - size_t tsize =3D MIN(sizeof(cap_buf) - csize, size); - const uint8_t *cbuf =3D cap_buf; - - target_read_memory(pc + csize, cap_buf + csize, tsize, info); - csize +=3D tsize; - size -=3D tsize; - - while (cs_disasm_iter(handle, &cbuf, &csize, &pc, insn)) { - cap_dump_insn(info, insn); - } - - /* If the target memory is not consumed, go back for more... */ - if (size !=3D 0) { - /* ... taking care to move any remaining fractional insn - to the beginning of the buffer. */ - if (csize !=3D 0) { - memmove(cap_buf, cbuf, csize); - } - continue; - } - - /* Since the target memory is consumed, we should not have - a remaining fractional insn. */ - if (csize !=3D 0) { - (*info->fprintf_func)(info->stream, - "Disassembler disagrees with translator " - "over instruction decoding\n" - "Please report this to qemu-devel@nongnu.org\n"); - } - break; - } - - cs_close(&handle); - return true; -} - -/* Disassemble SIZE bytes at CODE for the host. */ -static bool cap_disas_host(disassemble_info *info, void *code, size_t size) -{ - csh handle; - const uint8_t *cbuf; - cs_insn *insn; - uint64_t pc; - - if (cap_disas_start(info, &handle) !=3D CS_ERR_OK) { - return false; - } - insn =3D cap_insn; - - cbuf =3D code; - pc =3D (uintptr_t)code; - - while (cs_disasm_iter(handle, &cbuf, &size, &pc, insn)) { - cap_dump_insn(info, insn); - } - if (size !=3D 0) { - (*info->fprintf_func)(info->stream, - "Disassembler disagrees with TCG over instruction encoding\n" - "Please report this to qemu-devel@nongnu.org\n"); - } - - cs_close(&handle); - return true; -} - -#if !defined(CONFIG_USER_ONLY) -/* Disassemble COUNT insns at PC for the target. */ -static bool cap_disas_monitor(disassemble_info *info, uint64_t pc, int cou= nt) -{ - uint8_t cap_buf[32]; - csh handle; - cs_insn *insn; - size_t csize =3D 0; - - if (cap_disas_start(info, &handle) !=3D CS_ERR_OK) { - return false; - } - insn =3D cap_insn; - - while (1) { - /* We want to read memory for one insn, but generically we do not - know how much memory that is. We have a small buffer which is - known to be sufficient for all supported targets. Try to not - read beyond the page, Just In Case. For even more simplicity, - ignore the actual target page size and use a 1k boundary. If - that turns out to be insufficient, we'll come back around the - loop and read more. */ - uint64_t epc =3D QEMU_ALIGN_UP(pc + csize + 1, 1024); - size_t tsize =3D MIN(sizeof(cap_buf) - csize, epc - pc); - const uint8_t *cbuf =3D cap_buf; - - /* Make certain that we can make progress. */ - assert(tsize !=3D 0); - info->read_memory_func(pc, cap_buf + csize, tsize, info); - csize +=3D tsize; - - if (cs_disasm_iter(handle, &cbuf, &csize, &pc, insn)) { - cap_dump_insn(info, insn); - if (--count <=3D 0) { - break; - } - } - memmove(cap_buf, cbuf, csize); - } - - cs_close(&handle); - return true; -} -#endif /* !CONFIG_USER_ONLY */ -#else -# define cap_disas_target(i, p, s) false -# define cap_disas_host(i, p, s) false -# define cap_disas_monitor(i, p, c) false -# define cap_disas_plugin(i, p, c) false -#endif /* CONFIG_CAPSTONE */ - static void initialize_debug(CPUDebug *s) { memset(s, 0, sizeof(*s)); @@ -513,32 +264,6 @@ static void plugin_print_address(bfd_vma addr, struct = disassemble_info *info) } =20 =20 -#ifdef CONFIG_CAPSTONE -/* Disassemble a single instruction directly into plugin output */ -static -bool cap_disas_plugin(disassemble_info *info, uint64_t pc, size_t size) -{ - uint8_t cap_buf[64]; - const uint8_t *cbuf =3D cap_buf; - csh handle; - - if (cap_disas_start(info, &handle) !=3D CS_ERR_OK) { - return false; - } - - assert(size < sizeof(cap_buf)); - target_read_memory(pc, cap_buf, size, info); - - if (cs_disasm_iter(handle, &cbuf, &size, &pc, cap_insn)) { - GString *s =3D (GString *)info->stream; - g_string_printf(s, "%s %s", cap_insn->mnemonic, cap_insn->op_str); - } - - cs_close(&handle); - return true; -} -#endif - /* * We should only be dissembling one instruction at a time here. If * there is left over it usually indicates the front end has read more diff --git a/disas/capstone.c b/disas/capstone.c new file mode 100644 index 0000000000..b48f83958d --- /dev/null +++ b/disas/capstone.c @@ -0,0 +1,286 @@ +/* + * Interface to the capstone disassembler. + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "qemu/bswap.h" +#include "disas/dis-asm.h" +#include "disas/capstone.h" + + +/* + * Temporary storage for the capstone library. This will be alloced via + * malloc with a size private to the library; thus there's no reason not + * to share this across calls and across host vs target disassembly. + */ +static __thread cs_insn *cap_insn; + +/* + * Initialize the Capstone library. + * + * ??? It would be nice to cache this. We would need one handle for the + * host and one for the target. For most targets we can reset specific + * parameters via cs_option(CS_OPT_MODE, new_mode), but we cannot change + * CS_ARCH_* in this way. Thus we would need to be able to close and + * re-open the target handle with a different arch for the target in order + * to handle AArch64 vs AArch32 mode switching. + */ +static cs_err cap_disas_start(disassemble_info *info, csh *handle) +{ + cs_mode cap_mode =3D info->cap_mode; + cs_err err; + + cap_mode +=3D (info->endian =3D=3D BFD_ENDIAN_BIG ? CS_MODE_BIG_ENDIAN + : CS_MODE_LITTLE_ENDIAN); + + err =3D cs_open(info->cap_arch, cap_mode, handle); + if (err !=3D CS_ERR_OK) { + return err; + } + + /* "Disassemble" unknown insns as ".byte W,X,Y,Z". */ + cs_option(*handle, CS_OPT_SKIPDATA, CS_OPT_ON); + + if (info->cap_arch =3D=3D CS_ARCH_X86) { + /* + * We don't care about errors (if for some reason the library + * is compiled without AT&T syntax); the user will just have + * to deal with the Intel syntax. + */ + cs_option(*handle, CS_OPT_SYNTAX, CS_OPT_SYNTAX_ATT); + } + + /* Allocate temp space for cs_disasm_iter. */ + if (cap_insn =3D=3D NULL) { + cap_insn =3D cs_malloc(*handle); + if (cap_insn =3D=3D NULL) { + cs_close(handle); + return CS_ERR_MEM; + } + } + return CS_ERR_OK; +} + +static void cap_dump_insn_units(disassemble_info *info, cs_insn *insn, + int i, int n) +{ + fprintf_function print =3D info->fprintf_func; + FILE *stream =3D info->stream; + + switch (info->cap_insn_unit) { + case 4: + if (info->endian =3D=3D BFD_ENDIAN_BIG) { + for (; i < n; i +=3D 4) { + print(stream, " %08x", ldl_be_p(insn->bytes + i)); + + } + } else { + for (; i < n; i +=3D 4) { + print(stream, " %08x", ldl_le_p(insn->bytes + i)); + } + } + break; + + case 2: + if (info->endian =3D=3D BFD_ENDIAN_BIG) { + for (; i < n; i +=3D 2) { + print(stream, " %04x", lduw_be_p(insn->bytes + i)); + } + } else { + for (; i < n; i +=3D 2) { + print(stream, " %04x", lduw_le_p(insn->bytes + i)); + } + } + break; + + default: + for (; i < n; i++) { + print(stream, " %02x", insn->bytes[i]); + } + break; + } +} + +static void cap_dump_insn(disassemble_info *info, cs_insn *insn) +{ + fprintf_function print =3D info->fprintf_func; + FILE *stream =3D info->stream; + int i, n, split; + + print(stream, "0x%08" PRIx64 ": ", insn->address); + + n =3D insn->size; + split =3D info->cap_insn_split; + + /* Dump the first SPLIT bytes of the instruction. */ + cap_dump_insn_units(info, insn, 0, MIN(n, split)); + + /* Add padding up to SPLIT so that mnemonics line up. */ + if (n < split) { + int width =3D (split - n) / info->cap_insn_unit; + width *=3D (2 * info->cap_insn_unit + 1); + print(stream, "%*s", width, ""); + } + + /* Print the actual instruction. */ + print(stream, " %-8s %s\n", insn->mnemonic, insn->op_str); + + /* Dump any remaining part of the insn on subsequent lines. */ + for (i =3D split; i < n; i +=3D split) { + print(stream, "0x%08" PRIx64 ": ", insn->address + i); + cap_dump_insn_units(info, insn, i, MIN(n, i + split)); + print(stream, "\n"); + } +} + +/* Disassemble SIZE bytes at PC for the target. */ +bool cap_disas_target(disassemble_info *info, uint64_t pc, size_t size) +{ + uint8_t cap_buf[1024]; + csh handle; + cs_insn *insn; + size_t csize =3D 0; + + if (cap_disas_start(info, &handle) !=3D CS_ERR_OK) { + return false; + } + insn =3D cap_insn; + + while (1) { + size_t tsize =3D MIN(sizeof(cap_buf) - csize, size); + const uint8_t *cbuf =3D cap_buf; + + info->read_memory_func(pc + csize, cap_buf + csize, tsize, info); + csize +=3D tsize; + size -=3D tsize; + + while (cs_disasm_iter(handle, &cbuf, &csize, &pc, insn)) { + cap_dump_insn(info, insn); + } + + /* If the target memory is not consumed, go back for more... */ + if (size !=3D 0) { + /* + * ... taking care to move any remaining fractional insn + * to the beginning of the buffer. + */ + if (csize !=3D 0) { + memmove(cap_buf, cbuf, csize); + } + continue; + } + + /* + * Since the target memory is consumed, we should not have + * a remaining fractional insn. + */ + if (csize !=3D 0) { + info->fprintf_func(info->stream, + "Disassembler disagrees with translator " + "over instruction decoding\n" + "Please report this to qemu-devel@nongnu.org\n"); + } + break; + } + + cs_close(&handle); + return true; +} + +/* Disassemble SIZE bytes at CODE for the host. */ +bool cap_disas_host(disassemble_info *info, void *code, size_t size) +{ + csh handle; + const uint8_t *cbuf; + cs_insn *insn; + uint64_t pc; + + if (cap_disas_start(info, &handle) !=3D CS_ERR_OK) { + return false; + } + insn =3D cap_insn; + + cbuf =3D code; + pc =3D (uintptr_t)code; + + while (cs_disasm_iter(handle, &cbuf, &size, &pc, insn)) { + cap_dump_insn(info, insn); + } + if (size !=3D 0) { + info->fprintf_func(info->stream, + "Disassembler disagrees with TCG over instruction encoding\n" + "Please report this to qemu-devel@nongnu.org\n"); + } + + cs_close(&handle); + return true; +} + +/* Disassemble COUNT insns at PC for the target. */ +bool cap_disas_monitor(disassemble_info *info, uint64_t pc, int count) +{ + uint8_t cap_buf[32]; + csh handle; + cs_insn *insn; + size_t csize =3D 0; + + if (cap_disas_start(info, &handle) !=3D CS_ERR_OK) { + return false; + } + insn =3D cap_insn; + + while (1) { + /* + * We want to read memory for one insn, but generically we do not + * know how much memory that is. We have a small buffer which is + * known to be sufficient for all supported targets. Try to not + * read beyond the page, Just In Case. For even more simplicity, + * ignore the actual target page size and use a 1k boundary. If + * that turns out to be insufficient, we'll come back around the + * loop and read more. + */ + uint64_t epc =3D QEMU_ALIGN_UP(pc + csize + 1, 1024); + size_t tsize =3D MIN(sizeof(cap_buf) - csize, epc - pc); + const uint8_t *cbuf =3D cap_buf; + + /* Make certain that we can make progress. */ + assert(tsize !=3D 0); + info->read_memory_func(pc, cap_buf + csize, tsize, info); + csize +=3D tsize; + + if (cs_disasm_iter(handle, &cbuf, &csize, &pc, insn)) { + cap_dump_insn(info, insn); + if (--count <=3D 0) { + break; + } + } + memmove(cap_buf, cbuf, csize); + } + + cs_close(&handle); + return true; +} + +/* Disassemble a single instruction directly into plugin output */ +bool cap_disas_plugin(disassemble_info *info, uint64_t pc, size_t size) +{ + uint8_t cap_buf[32]; + const uint8_t *cbuf =3D cap_buf; + csh handle; + + if (cap_disas_start(info, &handle) !=3D CS_ERR_OK) { + return false; + } + + assert(size < sizeof(cap_buf)); + info->read_memory_func(pc, cap_buf, size, info); + + if (cs_disasm_iter(handle, &cbuf, &size, &pc, cap_insn)) { + info->fprintf_func(info->stream, "%s %s", + cap_insn->mnemonic, cap_insn->op_str); + } + + cs_close(&handle); + return true; +} diff --git a/disas/meson.build b/disas/meson.build index bde8280c73..09a852742e 100644 --- a/disas/meson.build +++ b/disas/meson.build @@ -21,5 +21,6 @@ common_ss.add(when: 'CONFIG_S390_DIS', if_true: files('s3= 90.c')) common_ss.add(when: 'CONFIG_SH4_DIS', if_true: files('sh4.c')) common_ss.add(when: 'CONFIG_SPARC_DIS', if_true: files('sparc.c')) common_ss.add(when: 'CONFIG_XTENSA_DIS', if_true: files('xtensa.c')) +common_ss.add(when: capstone, if_true: files('capstone.c')) =20 specific_ss.add(when: 'CONFIG_TCG_INTERPRETER', if_true: files('tci.c')) diff --git a/meson.build b/meson.build index 4c92b43fe5..e16a2b051d 100644 --- a/meson.build +++ b/meson.build @@ -965,6 +965,7 @@ common_ss.add(files('cpus-common.c')) =20 subdir('softmmu') =20 +common_ss.add(capstone) specific_ss.add(files('disas.c', 'exec.c', 'gdbstub.c'), capstone, libpmem= , libdaxctl) specific_ss.add(files('exec-vary.c')) specific_ss.add(when: 'CONFIG_TCG', if_true: files( --=20 2.25.1 From nobody Fri May 3 11:23:16 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1600387306; cv=none; d=zohomail.com; s=zohoarc; b=bhLdEIPLL/TRgJmQf50VOuwEJY2rswdtKwj65YfFzI9ni65ZiSJmIxyxust1jZ8yqpMERfRRTIJyEciZSvCy3hKRGnEyvztsA+7vZQZgmuOep1H9t4F4ILTDKYyxtcglK8NMHVVYlH01Y78Fmycf2ZjS/WS6w7XGGBa1L1iWr4A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600387306; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=SKvqAs5Pc8xJl/wXmoS7uW6crsC2A5uj0Z02CZTb6j4=; b=EtXszEe1L+J1yiFGauXaFDCJX5azpZoo+dE9llGlpBHshzKXjminQDpGGprcJZolzeiLW2CxEm3U6EL2pFkCd7Mio3t3HN4MeBTeU0DYttPWIaBe7rU7PTnCqAqVF7O/7P2QGooSBSYhBZtJjW7FrIQTwg9YgQQMRtSAo/28ddY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1600387306861681.1118339732133; Thu, 17 Sep 2020 17:01:46 -0700 (PDT) Received: from localhost ([::1]:43506 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kJ3qT-0000GD-Pj for importer@patchew.org; Thu, 17 Sep 2020 20:01:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36318) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJ3mS-0003xC-Md for qemu-devel@nongnu.org; Thu, 17 Sep 2020 19:57:36 -0400 Received: from mail-pj1-x1041.google.com ([2607:f8b0:4864:20::1041]:54849) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kJ3mQ-0006fk-Ri for qemu-devel@nongnu.org; Thu, 17 Sep 2020 19:57:36 -0400 Received: by mail-pj1-x1041.google.com with SMTP id mm21so2151651pjb.4 for ; Thu, 17 Sep 2020 16:57:34 -0700 (PDT) Received: from localhost.localdomain ([71.212.141.89]) by smtp.gmail.com with ESMTPSA id m13sm772699pfk.103.2020.09.17.16.57.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Sep 2020 16:57:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SKvqAs5Pc8xJl/wXmoS7uW6crsC2A5uj0Z02CZTb6j4=; b=lew08UDBi/ZTnefrK49cbOEQ9tgyvmsJ5HL4LWy9qf7kjKTXb4+j7psOmaXpNTOm5M FNZJyK/2Zshr8OutpwXmtuhTATBoyNdlg4ukZ08Wk6kxOvEIN0/qw+Kvu1BP0gFJe/5V vWoQaFIEkTM7dmCB3e3ORzcpKYkKbtgbMT7UGrKCZOax8JIaGOxQCyuOf/+v4HacnnsC BsuW/SNK3zzdYDvGMJHycDl58x8z+JSkFNbJpdelsw1ALkkF94AIoENvN3Sr0g/4+SII liGddFg0z+/KiVtHFM41c5X/YC2os+udspAJdAeOdVXnlq0I40oyXqdaARLV8zJcsyql iT3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SKvqAs5Pc8xJl/wXmoS7uW6crsC2A5uj0Z02CZTb6j4=; b=anH0BxZDgsBgyOxoVi7B1C1nl6M5c33stWHexC2qzZkAFfyrHLxgeYq/2Con4PR1Ls xhrFWiODQAdvKbM0CMokrXncKk54wlUEXi5vZyPhfLX8JLGVS/qt7f0uE9a7EF5Hsa73 sWHpc1KUXRlDwj3UQyxtP2sgix5JAX2Ae1bYzTlKsa4n4HYRnPv7jModYjlyBY6sy51Q Sxf6uMKVvNmMNAPLb2bjM/2rRVv/X6tQP47vxSzhgLQh3oAe/zn2sIwOyy2K2Re4Twg2 5x2BtibAbqM7G11rseSycpSwcY+PKXJQZtJUKmBjZWykrBH6llzzhCBYx0M3DsLLN03T /8Lw== X-Gm-Message-State: AOAM531KWgPCJQjNXzTPcrZ2ZT0xBB9gDNs42zWp9rRs7YkJHHZlrmD2 CLuiQRw+myT9T3ez/gMSrLkIc8ryCGxQjw== X-Google-Smtp-Source: ABdhPJzLDYmfhr8Amz3zEtMFPgLisPRuyEiM/qFlg4eyvwj5XZEpN6Azg6E82bUIabPUwidFEuezhA== X-Received: by 2002:a17:902:b216:b029:d1:e5e7:be05 with SMTP id t22-20020a170902b216b02900d1e5e7be05mr13092874plr.56.1600387053072; Thu, 17 Sep 2020 16:57:33 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 09/10] disas: Enable capstone disassembly for s390x Date: Thu, 17 Sep 2020 16:57:19 -0700 Message-Id: <20200917235720.2685978-10-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200917235720.2685978-1-richard.henderson@linaro.org> References: <20200917235720.2685978-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::1041; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1041.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" Enable s390x, aka SYSZ, in the git submodule build. Set the capstone parameters for both s390x host and guest. Acked-by: Thomas Huth Signed-off-by: Richard Henderson --- disas.c | 3 +++ target/s390x/cpu.c | 4 ++++ meson.build | 11 +++++++++++ 3 files changed, 18 insertions(+) diff --git a/disas.c b/disas.c index e27dea2c19..c4cd305190 100644 --- a/disas.c +++ b/disas.c @@ -201,6 +201,9 @@ static void initialize_debug_host(CPUDebug *s) s->info.print_insn =3D print_insn_m68k; #elif defined(__s390__) s->info.print_insn =3D print_insn_s390; + s->info.cap_arch =3D CS_ARCH_SYSZ; + s->info.cap_insn_unit =3D 2; + s->info.cap_insn_split =3D 6; #elif defined(__hppa__) s->info.print_insn =3D print_insn_hppa; #endif diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c index 749cd548f0..2a96692691 100644 --- a/target/s390x/cpu.c +++ b/target/s390x/cpu.c @@ -44,6 +44,7 @@ #include "sysemu/tcg.h" #endif #include "fpu/softfloat-helpers.h" +#include "disas/capstone.h" =20 #define CR0_RESET 0xE0UL #define CR14_RESET 0xC2000000UL; @@ -182,6 +183,9 @@ static void s390_cpu_disas_set_info(CPUState *cpu, disa= ssemble_info *info) { info->mach =3D bfd_mach_s390_64; info->print_insn =3D print_insn_s390; + info->cap_arch =3D CS_ARCH_SYSZ; + info->cap_insn_unit =3D 2; + info->cap_insn_split =3D 6; } =20 static void s390_cpu_realizefn(DeviceState *dev, Error **errp) diff --git a/meson.build b/meson.build index e16a2b051d..a2bff9d4ae 100644 --- a/meson.build +++ b/meson.build @@ -670,6 +670,17 @@ if capstone_opt =3D=3D 'internal' ) endif =20 + if 'CONFIG_S390_DIS' in config_all_disas + capstone_data.set('CAPSTONE_HAS_SYSZ', '1') + capstone_files +=3D files( + 'capstone/arch/SystemZ/SystemZDisassembler.c', + 'capstone/arch/SystemZ/SystemZInstPrinter.c', + 'capstone/arch/SystemZ/SystemZMapping.c', + 'capstone/arch/SystemZ/SystemZModule.c', + 'capstone/arch/SystemZ/SystemZMCTargetDesc.c' + ) + endif + if 'CONFIG_I386_DIS' in config_all_disas capstone_data.set('CAPSTONE_HAS_X86', 1) capstone_files +=3D files( --=20 2.25.1 From nobody Fri May 3 11:23:16 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1600387585; cv=none; d=zohomail.com; s=zohoarc; b=hMlofvTOmAK0rDCAutyDP7mcThMpE/LFwDWBsvbojhtIOaYNxvrg44iLt13q28sjGX1M3S7nktlhCSb0J9I0ONmrvoaFE76nnZtZDaa4hQIkTRkps6nRCWAiLrACSvcE+cp3q3E69T7Tj1OVFdZ2mTDkxL8RndH51dpUbOpDiSE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600387585; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=wjvg2SPI3pDSrleHGUZpH6t3zzxOiZw90GPESZPEUKw=; b=dUB5XnlYHJQ5LA02gaNHHXwJTMFcdxZDgUs+7Xo/xvqfocq7aTay2Nx0JEF6XzYRwMm6Ow2chBVT/UJ0yMYTOz8vZD/ImW/1XNC4lxcafK1N4sbMbEtc5Uz2X2u2CMHqONXo8y4EBZnnv2ppZ7+U+IaalLD5y+EJkEiLFTKoF4g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1600387585656377.6448570863662; Thu, 17 Sep 2020 17:06:25 -0700 (PDT) Received: from localhost ([::1]:54406 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kJ3uy-0004qH-MW for importer@patchew.org; Thu, 17 Sep 2020 20:06:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36344) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJ3mV-00044n-Co for qemu-devel@nongnu.org; Thu, 17 Sep 2020 19:57:39 -0400 Received: from mail-pj1-x1043.google.com ([2607:f8b0:4864:20::1043]:33663) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kJ3mS-0006fy-05 for qemu-devel@nongnu.org; Thu, 17 Sep 2020 19:57:39 -0400 Received: by mail-pj1-x1043.google.com with SMTP id md22so3469653pjb.0 for ; Thu, 17 Sep 2020 16:57:35 -0700 (PDT) Received: from localhost.localdomain ([71.212.141.89]) by smtp.gmail.com with ESMTPSA id m13sm772699pfk.103.2020.09.17.16.57.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Sep 2020 16:57:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wjvg2SPI3pDSrleHGUZpH6t3zzxOiZw90GPESZPEUKw=; b=A2v3OJW5miBkSu4Cj8Dsdolat5v9+DoDIoaQcRXEkq80SDP+GHvMxVJi49PHt4qUWn sXobC9chgcp9SEj9H0obUWOP1z3Ndm0uWpRG3W7+1McMDu7zNIEN7EKP1bLXWsjWAd/4 BypOi3h8m9fIJcUO3RxDkUlNT0sHSTp/EvI2sAUHnNdGIzmaKXFv6h6znT3uGvwz/F9O U/Lee6rR2dyePqPHL13FXJdRtFsWW5ZEWDn49OCLXYjTMPjegzvRvrNWJZZvjNds9Xi3 30wNZgsYTXDVWy48DFyOP29xPUimxyuN44HRLkp5diQndcZEtf9ZiuLRfVBqkdi7sSxm D97w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wjvg2SPI3pDSrleHGUZpH6t3zzxOiZw90GPESZPEUKw=; b=c7M+VeTgTCsAuPblU5F/8pFgNjcQK0xAQ/o03UGJkFgKYNHPvTT/cWqzZpc2O9nJAb BK4A38obelN2DrX6J237PMKFh3Q08vgMMIvhsji9C9TnojiAItmz+h9CSuNyXU4WHSLx 7RTFQz5IynIcXPJE66ke8onYV926N8Y3oaGRLD4MZzbR2e1VzF45ONVCB/4opZ29hupJ pNErfFG/NdbFAE2WXMbpjWD8hX1c/Ocv9Wu78RkJl+cur6GuzUYfGZlRPrf2DVzb7ARn 08cXQ+GhUUJCpVvLtDC3eN3Ki8Z56tGT/X7bdwAwRa1BVnYydygLM/ls0pAigbHb/vVh j9/A== X-Gm-Message-State: AOAM531hTgNTkq6X3RFbyCmDrTWr15mdayuGk+g3NIPFRxplST/GJmYS EdcIHMcBhOhrqFxHVUMRTlFxx0BEEjxyQg== X-Google-Smtp-Source: ABdhPJygwh4H1AkxBKEtzFUYsC4WZfl1SyBNlOYx8TA7M1UtCskZBPSo7S0gTVItwLC1uHXDWPNjXg== X-Received: by 2002:a17:902:525:b029:d1:920c:c200 with SMTP id 34-20020a1709020525b02900d1920cc200mr30959400plf.25.1600387054278; Thu, 17 Sep 2020 16:57:34 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 10/10] disas/capstone: Add skipdata hook for s390x Date: Thu, 17 Sep 2020 16:57:20 -0700 Message-Id: <20200917235720.2685978-11-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200917235720.2685978-1-richard.henderson@linaro.org> References: <20200917235720.2685978-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::1043; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1043.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) It is always possible to tell the length of an insn, even if the actual insn is unknown. Skip the correct number of bytes, so that we stay in sync with the instruction stream. Acked-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson --- disas/capstone.c | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/disas/capstone.c b/disas/capstone.c index b48f83958d..0a9ef9c892 100644 --- a/disas/capstone.c +++ b/disas/capstone.c @@ -16,6 +16,39 @@ */ static __thread cs_insn *cap_insn; =20 +/* + * The capstone library always skips 2 bytes for S390X. + * This is less than ideal, since we can tell from the first two bits + * the size of the insn and thus stay in sync with the insn stream. + */ +static size_t CAPSTONE_API +cap_skipdata_s390x_cb(const uint8_t *code, size_t code_size, + size_t offset, void *user_data) +{ + size_t ilen; + + /* See get_ilen() in target/s390x/internal.h. */ + switch (code[offset] >> 6) { + case 0: + ilen =3D 2; + break; + case 1: + case 2: + ilen =3D 4; + break; + default: + ilen =3D 6; + break; + } + + return ilen; +} + +static const cs_opt_skipdata cap_skipdata_s390x =3D { + .mnemonic =3D ".byte", + .callback =3D cap_skipdata_s390x_cb +}; + /* * Initialize the Capstone library. * @@ -42,13 +75,20 @@ static cs_err cap_disas_start(disassemble_info *info, c= sh *handle) /* "Disassemble" unknown insns as ".byte W,X,Y,Z". */ cs_option(*handle, CS_OPT_SKIPDATA, CS_OPT_ON); =20 - if (info->cap_arch =3D=3D CS_ARCH_X86) { + switch (info->cap_arch) { + case CS_ARCH_SYSZ: + cs_option(*handle, CS_OPT_SKIPDATA_SETUP, + (uintptr_t)&cap_skipdata_s390x); + break; + + case CS_ARCH_X86: /* * We don't care about errors (if for some reason the library * is compiled without AT&T syntax); the user will just have * to deal with the Intel syntax. */ cs_option(*handle, CS_OPT_SYNTAX, CS_OPT_SYNTAX_ATT); + break; } =20 /* Allocate temp space for cs_disasm_iter. */ --=20 2.25.1