Skip to contentSkip to conversation

Allow Capstone 3.0.5 again and remove the submodule

RFC PATCH In review Thomas Huth 3 participants 20 messages May 16, 2022 – Jun 3, 2022 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

cover Allow Capstone 3.0.5 again and remove the submodule

Compiling with Capstone 3.0.5 seems still to work fine, so if we allow this again, all our supported build environments should provide this library nowadays. That means that we could get rid of the integrated submodule now.

Thomas Huth (3):
tests/vm: Add capstone to the NetBSD and OpenBSD VMs
capstone: Allow version 3.0.5 again
capstone: Remove the capstone submodule

 configure                     |  21 -------
 meson.build                   | 115 ++--------------------------------
 .gitlab-ci.d/buildtest.yml    |   3 +-
 .gitlab-ci.d/windows.yml      |   5 +-
 .gitmodules                   |   3 -
 capstone                      |   1 -
 meson_options.txt             |   3 +-
 scripts/meson-buildoptions.sh |   5 +-
 tests/vm/netbsd               |   3 +-
 tests/vm/openbsd              |   3 +-
 10 files changed, 16 insertions(+), 146 deletions(-)
 delete mode 160000 capstone
Signature · 1 line
2.27.0
#1 lore raw

PATCH 1/3 tests/vm: Add capstone to the NetBSD and OpenBSD VMs

The Capstone library that is shipped with NetBSD and OpenBSD works fine when compiling QEMU, so let's enable this in our build-test VMs to get a little bit more build-test coverage.

---
 tests/vm/netbsd  | 3 ++-
 tests/vm/openbsd | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
tests/vm/netbsd +2 -1
index 4cc58df130..45aa9a7fda 100755
@@ -46,7 +46,8 @@ class NetBSDVM(basevm.BaseVM):
         "jpeg",
         "png",
 
-	# libs: ui
+        # libs: ui
+        "capstone",
         "SDL2",
         "gtk3+",
         "libxkbcommon",
tests/vm/openbsd +2 -1
index dc34b2718b..13c8254214 100755
@@ -48,7 +48,8 @@ class OpenBSDVM(basevm.BaseVM):
         "jpeg",
         "png",
 
-	# libs: ui
+        # libs: ui
+        "capstone",
         "sdl2",
         "gtk+3",
         "libxkbcommon",
Signature · 1 line
2.27.0
#3 lore raw

PATCH 2/3 capstone: Allow version 3.0.5 again

In reply to Thomas Huth

According to

https://lore.kernel.org/qemu-devel/[email protected]/

there was an issue with Capstone 3 from Ubuntu 18. Now that we removed support for Ubuntu 18.04, that issue should hopefully not bite us anymore. Compiling with version 3.0.5 seems to work fine on other systems, so let's allow that version again.

---
 meson.build                | 2 +-
 .gitlab-ci.d/buildtest.yml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
meson.build +1 -1
index 9b20dcd143..63ea585702 100644
@@ -2513,7 +2513,7 @@ capstone = not_found
 capstone_opt = get_option('capstone')
 if capstone_opt in ['enabled', 'auto', 'system']
   have_internal = fs.exists(meson.current_source_dir() / 'capstone/Makefile')
-  capstone = dependency('capstone', version: '>=4.0',
+  capstone = dependency('capstone', version: '>=3.0.5',
                         kwargs: static_kwargs, method: 'pkg-config',
                         required: capstone_opt == 'system' or
                                   capstone_opt == 'enabled' and not have_internal)
.gitlab-ci.d/buildtest.yml +1 -0
index 0aea7ab84c..a4d43d743b 100644
@@ -42,6 +42,7 @@ build-system-ubuntu:
   variables:
     IMAGE: ubuntu2004
     CONFIGURE_ARGS: --enable-docs --enable-fdt=system --enable-slirp=system
+        --enable-capstone=system
     TARGETS: aarch64-softmmu alpha-softmmu cris-softmmu hppa-softmmu
       microblazeel-softmmu mips64el-softmmu
     MAKE_CHECK_ARGS: check-build
Signature · 1 line
2.27.0
#4 lore raw

Re: [PATCH 2/3] capstone: Allow version 3.0.5 again

Quoted 9 lines · Thomas Huth

According to

https://lore.kernel.org/qemu-devel/[email protected]/

there was an issue with Capstone 3 from Ubuntu 18. Now that we removed support for Ubuntu 18.04, that issue should hopefully not bite us anymore. Compiling with version 3.0.5 seems to work fine on other systems, so let's allow that version again.

Commit bcf368626cb33c4d says the reason for requiring capstone

Quoted 1 line

=4.0 was "We're about to use a portion of the 4.0 API", not

"Ubuntu's specific capstone 3 is broken"...

-- PMM

#5 lore raw

Re: [PATCH 2/3] capstone: Allow version 3.0.5 again

Quoted 6 lines · Peter Maydell
Quoted 5 lines · Thomas Huth

According to

https://lore.kernel.org/qemu-devel/[email protected]/

Quoted 8 lines
Quoted 4 lines

there was an issue with Capstone 3 from Ubuntu 18. Now that we removed support for Ubuntu 18.04, that issue should hopefully not bite us anymore. Compiling with version 3.0.5 seems to work fine on other systems, so let's allow that version again.

Commit bcf368626cb33c4d says the reason for requiring capstone

Quoted 1 line

=4.0 was "We're about to use a portion of the 4.0 API", not

"Ubuntu's specific capstone 3 is broken"...

Looks like the patch to which this referred was never merged -- CS_ARCH_RISCV.

I still have a branch with riscv support sitting in it, from Sep 2020. Sadly, I never posted that patch, nor said why I withheld it in the end. Perhaps the actual riscv support in capstone was poor at the time.

The 4.0 requirement patch itself was kept for Ubuntu 18's issue:

https://lists.gnu.org/archive/html/qemu-devel/2020-09/msg07542.html

# Changes for v4:
# * Require v4.0 from the system library.
# Fixes an issue AJB found from v3.0.5 from ubuntu 18.

r~

#6 lore raw

Re: [PATCH 2/3] capstone: Allow version 3.0.5 again

Quoted 19 lines · Richard Henderson
Quoted 6 lines · Peter Maydell
Quoted 5 lines · Thomas Huth

According to

https://lore.kernel.org/qemu-devel/[email protected]/

Quoted 8 lines
Quoted 4 lines

there was an issue with Capstone 3 from Ubuntu 18. Now that we removed support for Ubuntu 18.04, that issue should hopefully not bite us anymore. Compiling with version 3.0.5 seems to work fine on other systems, so let's allow that version again.

Commit bcf368626cb33c4d says the reason for requiring capstone

Quoted 1 line

=4.0 was "We're about to use a portion of the 4.0 API", not

"Ubuntu's specific capstone 3 is broken"...

Looks like the patch to which this referred was never merged -- CS_ARCH_RISCV.

Quoted 7 lines

I still have a branch with riscv support sitting in it, from Sep 2020. Sadly, I never posted that patch, nor said why I withheld it in the end. Perhaps the actual riscv support in capstone was poor at the time.

The 4.0 requirement patch itself was kept for Ubuntu 18's issue:

https://lists.gnu.org/archive/html/qemu-devel/2020-09/msg07542.html

Is that this one?
https://lore.kernel.org/qemu-devel/[email protected]/

Did we find out why Ubuntu's capstone in particular fell over ?

thanks
-- PMM

#7 lore raw

Re: [PATCH 2/3] capstone: Allow version 3.0.5 again

Quoted 4 lines · Peter Maydell
Quoted 1 line

https://lists.gnu.org/archive/html/qemu-devel/2020-09/msg07542.html

Is that this one?
https://lore.kernel.org/qemu-devel/[email protected]/

Could well be.

Quoted 2 lines

Did we find out why Ubuntu's capstone in particular fell over ?

I vaguely recall that it was a snapshot of a capstone prior to the 4.0 release. The error message you quote above is because CAPSTONE_API is not defined to something reasonable. I don't have an ubuntu 18 system to quickly look at.

r~

#8 lore raw

Re: [PATCH 2/3] capstone: Allow version 3.0.5 again

Quoted 6 lines · Richard Henderson
Quoted 4 lines · Peter Maydell
Quoted 1 line

https://lists.gnu.org/archive/html/qemu-devel/2020-09/msg07542.html

Is that this one?
https://lore.kernel.org/qemu-devel/[email protected]/

Quoted 6 lines

Could well be.

Quoted 2 lines

Did we find out why Ubuntu's capstone in particular fell over ?

I vaguely recall that it was a snapshot of a capstone prior to the 4.0 release.  The error message you quote above is because CAPSTONE_API is not defined to something reasonable.  I don't have an ubuntu 18 system to quickly look at.

I just had a try with our Ubuntu 18.04 docker container (as it has not been removed yet) and my patches applied:

$ make docker-test-build@ubuntu1804 \
  EXTRA_CONFIGURE_OPTS=--enable-capstone
  ...
  Dependencies
    ...
    capstone                     : YES 3.0.4
    ...
[1023/3301] Compiling C object libcommon.fa.p/disas_capstone.c.o
FAILED: libcommon.fa.p/disas_capstone.c.o
cc -m64 -mcx16 -Ilibcommon.fa.p -I../src/common-user/host/x86_64 -I../src/dtc/libfdt -I../src/slirp -I../src/slirp/src -I/usr/include/capstone -I/usr/include/pixman-1 -I/usr/include/libpng16 -I/usr/include/spice-server -I/usr/include/spice-1 -I/usr/include/p11-kit-1 -I/usr/include/libusb-1.0 -I/usr/include/SDL2 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/gio-unix-2.0/ -I/usr/include/alsa -I/usr/include/virgl -I/usr/include/ncursesw -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/freetype2 -I/usr/include/harfbuzz -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/at-spi-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/x86_64-linux-gnu/dbus-1.0/include -I/usr/include/vte-2.91 -fdiagnostics-color=auto -Wall -Winvalid-pch -Werror -std=gnu11 -O2 -g -isystem /tmp/qemu-test/src/linux-headers -isystem linux-headers -iquote . -iquote /tmp/qemu-test/src -iquote /tmp/qemu-test/src/include -iquote /tmp/qemu-test/src/disas/libvixl -iquote /tmp/qemu-test/src/tcg/i386 -pthread -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes -Wredundant-decls -Wundef -Wwrite-strings -Wmissing-prototypes -fno-strict-aliasing -fno-common -fwrapv -Wold-style-declaration -Wold-style-definition -Wtype-limits -Wformat-security -Wformat-y2k -Winit-self -Wignored-qualifiers -Wempty-body -Wnested-externs -Wendif-labels -Wexpansion-to-defined -Wimplicit-fallthrough=2 -Wno-missing-include-dirs -Wno-shift-negative-value -Wno-psabi -fstack-protector-strong -fPIE -D_GNU_SOURCE -D_DEFAULT_SOURCE -DNCURSES_WIDECHAR=1 -D_REENTRANT -Wno-undef -DSTRUCT_IOVEC_DEFINED -MD -MQ libcommon.fa.p/disas_capstone.c.o -MF libcommon.fa.p/disas_capstone.c.o.d -o libcommon.fa.p/disas_capstone.c.o -c ../src/disas/capstone.c
../src/disas/capstone.c:25:1: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘cap_skipdata_s390x_cb’
 cap_skipdata_s390x_cb(const uint8_t *code, size_t code_size,
 ^~~~~~~~~~~~~~~~~~~~~
../src/disas/capstone.c:49:17: error: ‘cap_skipdata_s390x_cb’ undeclared here (not in a function); did you mean ‘cap_skipdata_s390x’?
     .callback = cap_skipdata_s390x_cb
                 ^~~~~~~~~~~~~~~~~~~~~
                 cap_skipdata_s390x
ninja: build stopped: subcommand failed.
Makefile:163: recipe for target 'run-ninja' failed

So it seems like really only the capstone 3.0.4 from Ubuntu 18.04 is broken, while this compiles fine with the capstone 3.0.5 from Ubuntu 20.04.

I think my patches should be ok to apply now that we dropped support for Ubuntu 18.04.

Thomas

#9 lore raw

Re: [PATCH 2/3] capstone: Allow version 3.0.5 again

Quoted 5 lines · Thomas Huth

So it seems like really only the capstone 3.0.4 from Ubuntu 18.04 is broken, while this compiles fine with the capstone 3.0.5 from Ubuntu 20.04.

I think my patches should be ok to apply now that we dropped support for Ubuntu 18.04.

Yes, I think so. Especially with the >=3.0.5 test.

r~

Reviewed-by on v1 2/3
#10 lore raw

Re: [PATCH 2/3] capstone: Allow version 3.0.5 again

In reply to Thomas Huth
Quoted 10 lines · Thomas Huth

According to

https://lore.kernel.org/qemu-devel/[email protected]/

there was an issue with Capstone 3 from Ubuntu 18. Now that we removed support for Ubuntu 18.04, that issue should hopefully not bite us anymore. Compiling with version 3.0.5 seems to work fine on other systems, so let's allow that version again.

Please update this description with the 3.0.4 version number you found for 18.04.

Anyway,

r~

#11 lore raw

PATCH 3/3 capstone: Remove the capstone submodule

In reply to Thomas Huth

Now that we allow compiling with Capstone v3.05 again, all our supported build hosts should provide at least this version of the disassembler library, so we do not need to ship this as a submodule anymore.

---
 configure                     |  21 -------
 meson.build                   | 113 ++--------------------------------
 .gitlab-ci.d/buildtest.yml    |   4 +-
 .gitlab-ci.d/windows.yml      |   5 +-
 .gitmodules                   |   3 -
 capstone                      |   1 -
 meson_options.txt             |   3 +-
 scripts/meson-buildoptions.sh |   5 +-
 8 files changed, 11 insertions(+), 144 deletions(-)
 delete mode 160000 capstone
configure +0 -21
index c8b5b99532..cec8d58a56 100755
@@ -307,10 +307,8 @@ skip_meson=no
 
 # 1. Track which submodules are needed
 if test "$default_feature" = no ; then
-  capstone="disabled"
   slirp="disabled"
 else
-  capstone="auto"
   slirp="auto"
 fi
 fdt="auto"
@@ -869,14 +867,6 @@ for opt do
   --enable-uuid|--disable-uuid)
       echo "$0: $opt is obsolete, UUID support is always built" >&2
   ;;
-  --disable-capstone) capstone="disabled"
-  ;;
-  --enable-capstone) capstone="enabled"
-  ;;
-  --enable-capstone=git) capstone="internal"
-  ;;
-  --enable-capstone=*) capstone="$optarg"
-  ;;
   --with-git=*) git="$optarg"
   ;;
   --with-git-submodules=*)
@@ -1568,16 +1558,6 @@ case "$fdt" in
     ;;
 esac
 
-##########################################
-# capstone
-
-case "$capstone" in
-  auto | enabled | internal)
-    # Simpler to always update submodule, even if not needed.
-    git_submodules="${git_submodules} capstone"
-    ;;
-esac
-
 ##########################################
 # check and set a backend for coroutine
 
@@ -2223,7 +2203,6 @@ if test "$skip_meson" = no; then
   test "$werror" = yes && meson_option_add -Dwerror=true
 
   # QEMU options
-  test "$capstone" != auto && meson_option_add "-Dcapstone=$capstone"
   test "$cfi" != false && meson_option_add "-Dcfi=$cfi"
   test "$fdt" != auto && meson_option_add "-Dfdt=$fdt"
   test -n "${LIB_FUZZING_ENGINE+xxx}" && meson_option_add "-Dfuzzing_engine=$LIB_FUZZING_ENGINE"
meson.build +5 -108

135 lines not on this page · raw message

.gitlab-ci.d/buildtest.yml +2 -2
index a4d43d743b..e9620c3074 100644
@@ -42,7 +42,7 @@ build-system-ubuntu:
   variables:
     IMAGE: ubuntu2004
     CONFIGURE_ARGS: --enable-docs --enable-fdt=system --enable-slirp=system
-        --enable-capstone=system
+        --enable-capstone
     TARGETS: aarch64-softmmu alpha-softmmu cris-softmmu hppa-softmmu
       microblazeel-softmmu mips64el-softmmu
     MAKE_CHECK_ARGS: check-build
@@ -119,7 +119,7 @@ build-system-fedora:
   variables:
     IMAGE: fedora
     CONFIGURE_ARGS: --disable-gcrypt --enable-nettle --enable-docs
-             --enable-fdt=system --enable-slirp=system --enable-capstone=system
+             --enable-fdt=system --enable-slirp=system --enable-capstone
     TARGETS: tricore-softmmu microblaze-softmmu mips-softmmu
       xtensa-softmmu m68k-softmmu riscv32-softmmu ppc-softmmu sparc64-softmmu
     MAKE_CHECK_ARGS: check-build
.gitlab-ci.d/windows.yml +2 -3
index 47f6073773..cf7724b8e5 100644
@@ -57,7 +57,7 @@ msys2-64bit:
   - $env:CHERE_INVOKING = 'yes'  # Preserve the current working directory
   - $env:MSYSTEM = 'MINGW64'     # Start a 64 bit Mingw environment
   - .\msys64\usr\bin\bash -lc './configure --target-list=x86_64-softmmu
-      --enable-capstone=system --without-default-devices'
+      --enable-capstone --without-default-devices'
   - .\msys64\usr\bin\bash -lc "sed -i '/^ROMS=/d' build/config-host.mak"
   - .\msys64\usr\bin\bash -lc 'make -j2'
   - .\msys64\usr\bin\bash -lc 'make check'
@@ -90,7 +90,6 @@ msys2-32bit:
   - $env:MSYSTEM = 'MINGW32'     # Start a 32-bit MinG environment
   - mkdir output
   - cd output
-  - ..\msys64\usr\bin\bash -lc "../configure --target-list=ppc64-softmmu
-      --enable-capstone=system"
+  - ..\msys64\usr\bin\bash -lc "../configure --target-list=ppc64-softmmu"
   - ..\msys64\usr\bin\bash -lc 'make -j2'
   - ..\msys64\usr\bin\bash -lc 'make check'
.gitmodules +0 -3
index f4b6a9b401..b8bff47df8 100644
@@ -31,9 +31,6 @@
 [submodule "ui/keycodemapdb"]
 	path = ui/keycodemapdb
 	url = https://gitlab.com/qemu-project/keycodemapdb.git
-[submodule "capstone"]
-	path = capstone
-	url = https://gitlab.com/qemu-project/capstone.git
 [submodule "roms/seabios-hppa"]
 	path = roms/seabios-hppa
 	url = https://gitlab.com/qemu-project/seabios-hppa.git
capstone deleted +0 -1
deleted file mode 160000
index f8b1b83301..0000000000
@@ -1 +0,0 @@
-Subproject commit f8b1b833015a4ae47110ed068e0deb7106ced66d
meson_options.txt +1 -2
index 29c6b90cec..fcdc43f7db 100644
@@ -252,8 +252,7 @@ option('virtfs', type: 'feature', value: 'auto',
 option('virtiofsd', type: 'feature', value: 'auto',
        description: 'build virtiofs daemon (virtiofsd)')
 
-option('capstone', type: 'combo', value: 'auto',
-       choices: ['disabled', 'enabled', 'auto', 'system', 'internal'],
+option('capstone', type: 'feature', value: 'auto',
        description: 'Whether and how to find the capstone library')
 option('slirp', type: 'combo', value: 'auto',
        choices: ['disabled', 'enabled', 'auto', 'system', 'internal'],
scripts/meson-buildoptions.sh +1 -4
index 5d2172bfb4..7fc56d3f4a 100644
@@ -16,9 +16,6 @@ meson_options_help() {
   printf "%s\n" '  --enable-block-drv-whitelist-in-tools'
   printf "%s\n" '                           use block whitelist also in tools instead of only'
   printf "%s\n" '                           QEMU'
-  printf "%s\n" '  --enable-capstone[=CHOICE]'
-  printf "%s\n" '                           Whether and how to find the capstone library'
-  printf "%s\n" '                           (choices: auto/disabled/enabled/internal/system)'
   printf "%s\n" '  --enable-cfi             Control-Flow Integrity (CFI)'
   printf "%s\n" '  --enable-cfi-debug       Verbose errors in case of CFI violation'
   printf "%s\n" '  --enable-debug-mutex     mutex debugging support'
@@ -77,6 +74,7 @@ meson_options_help() {
   printf "%s\n" '  brlapi          brlapi character device driver'
   printf "%s\n" '  bzip2           bzip2 support for DMG images'
   printf "%s\n" '  cap-ng          cap_ng support'
+  printf "%s\n" '  capstone        Whether and how to find the capstone library'
   printf "%s\n" '  cloop           cloop image format support'
   printf "%s\n" '  cocoa           Cocoa user interface (macOS only)'
   printf "%s\n" '  coreaudio       CoreAudio sound support'
@@ -209,7 +207,6 @@ _meson_option_parse() {
     --disable-cap-ng) printf "%s" -Dcap_ng=disabled ;;
     --enable-capstone) printf "%s" -Dcapstone=enabled ;;
     --disable-capstone) printf "%s" -Dcapstone=disabled ;;
-    --enable-capstone=*) quote_sh "-Dcapstone=$2" ;;
     --enable-cfi) printf "%s" -Dcfi=true ;;
     --disable-cfi) printf "%s" -Dcfi=false ;;
     --enable-cfi-debug) printf "%s" -Dcfi_debug=true ;;
Signature · 1 line
2.27.0
Reviewed-by on v1 3/3
#12 lore raw

Re: [PATCH 3/3] capstone: Remove the capstone submodule

Quoted 15 lines · Thomas Huth

Now that we allow compiling with Capstone v3.05 again, all our supported build hosts should provide at least this version of the disassembler library, so we do not need to ship this as a submodule anymore.

---
  configure                     |  21 -------
  meson.build                   | 113 ++--------------------------------
  .gitlab-ci.d/buildtest.yml    |   4 +-
  .gitlab-ci.d/windows.yml      |   5 +-
  .gitmodules                   |   3 -
  capstone                      |   1 -
  meson_options.txt             |   3 +-
  scripts/meson-buildoptions.sh |   5 +-
  8 files changed, 11 insertions(+), 144 deletions(-)
Quoted 1 line

delete mode 160000 capstone

r~

#13 lore raw

Re: [PATCH 3/3] capstone: Remove the capstone submodule

In reply to Thomas Huth
Quoted 4 lines · Thomas Huth

Now that we allow compiling with Capstone v3.05 again, all our supported build hosts should provide at least this version of the disassembler library, so we do not need to ship this as a submodule anymore.

When this eventually goes in, please remember to update the wiki changelog page's 'Build Information' section to let users know.

thanks
-- PMM

#14 lore raw

Re: [PATCH 3/3] capstone: Remove the capstone submodule

Quoted 9 lines · Peter Maydell
Quoted 4 lines · Thomas Huth

Now that we allow compiling with Capstone v3.05 again, all our supported build hosts should provide at least this version of the disassembler library, so we do not need to ship this as a submodule anymore.

When this eventually goes in, please remember to update the wiki changelog page's 'Build Information' section to let users know.

Done: https://wiki.qemu.org/ChangeLog/7.1#Build_Dependencies

Thomas

#15 lore raw

Re: [PATCH 3/3] capstone: Remove the capstone submodule

Quoted 7 lines · Thomas Huth
Quoted 6 lines · Peter Maydell
Quoted 4 lines · Thomas Huth

Now that we allow compiling with Capstone v3.05 again, all our supported build hosts should provide at least this version of the disassembler library, so we do not need to ship this as a submodule anymore.

Quoted 5 lines
Quoted 3 lines

When this eventually goes in, please remember to update the wiki changelog page's 'Build Information' section to let users know.

Done: https://wiki.qemu.org/ChangeLog/7.1#Build_Dependencies

Ho hum. So... the first time I try to do any actual debugging after this has gone in, and I am reminded exactly how terrible capstone 4.0.1 is for anything except x86. There was a reason I had chosen a development branch snapshot, and that's because it was usable.

Here, for instance, is how ubuntu 20.04 capstone disassembles tests/tcg/aarch64/system/boot.S:

0x00000000400027b0: 10ffc280 adr x0, #-0x7b0 (addr 0x40002000)

0x00000000400027b4: d518c000 msr (unknown), x0

0x00000000400027b8: d0000fe0 adrp x0, #+0x1fe000 (addr 0x40200000)

0x00000000400027bc: 91000000 add x0, x0, #0x0 (0)

0x00000000400027c0: d5182000 msr (unknown), x0

...
0x0000000040002850: d5381040 mrs x0, (unknown)

0x0000000040002854: b26c0400 orr x0, x0, #0x300000

0x0000000040002858: d5181040 msr (unknown), x0

And this is the extremely simple case of ARMv8.0 with no extensions.

I am very much tempted to re-instate the capstone submodule, or update disas/vixl and disable use of capstone for arm.

Would the ppc folk please have a look at how capstone is or is not handling ppc64? Because I strongly suspect that 333f944c15e7 ("disas: Remove old libopcode ppc disassembler") is also going to turn out to be a regression when combined with the removal of the capstone submodule.

r~

PS: While there are tags in upstream capstone hinting at a 5.0 release, there's no timeline for when we might see such a thing. Anyway, it wouldn't help anyone with an LTS distro for the next half decade.

#16 lore raw

Re: [PATCH 3/3] capstone: Remove the capstone submodule

Quoted 19 lines · Richard Henderson

Ho hum.  So... the first time I try to do any actual debugging after this has gone in, and I am reminded exactly how terrible capstone 4.0.1 is for anything except x86.  There was a reason I had chosen a development branch snapshot, and that's because it was usable.

Here, for instance, is how ubuntu 20.04 capstone disassembles tests/tcg/aarch64/system/boot.S:

0x00000000400027b0:  10ffc280      adr x0, #-0x7b0 (addr 0x40002000)

0x00000000400027b4:  d518c000      msr (unknown), x0

0x00000000400027b8:  d0000fe0      adrp x0, #+0x1fe000 (addr 0x40200000)

0x00000000400027bc:  91000000      add x0, x0, #0x0 (0)

0x00000000400027c0:  d5182000      msr (unknown), x0

...
0x0000000040002850:  d5381040      mrs x0, (unknown)

Quoted 8 lines

0x0000000040002854:  b26c0400      orr x0, x0, #0x300000

0x0000000040002858:  d5181040      msr (unknown), x0

And this is the extremely simple case of ARMv8.0 with no extensions.

I am very much tempted to re-instate the capstone submodule, or update disas/vixl and disable use of capstone for arm.

Double ho-hum. It would appear that this horrible disassembly *is* vixl, because I didn't double check that libcapstone was installed.

r~

#17 lore raw

Re: [PATCH 3/3] capstone: Remove the capstone submodule

Quoted 22 lines · Richard Henderson
Quoted 21 lines · Richard Henderson

Ho hum.  So... the first time I try to do any actual debugging after this has gone in, and I am reminded exactly how terrible capstone 4.0.1 is for anything except x86.  There was a reason I had chosen a development branch snapshot, and that's because it was usable.

Here, for instance, is how ubuntu 20.04 capstone disassembles tests/tcg/aarch64/system/boot.S:

0x00000000400027b0:  10ffc280      adr x0, #-0x7b0 (addr 0x40002000)

0x00000000400027b4:  d518c000      msr (unknown), x0

0x00000000400027b8:  d0000fe0      adrp x0, #+0x1fe000 (addr 0x40200000)

0x00000000400027bc:  91000000      add x0, x0, #0x0 (0)

0x00000000400027c0:  d5182000      msr (unknown), x0

...
0x0000000040002850:  d5381040      mrs x0, (unknown)

0x0000000040002854:  b26c0400      orr x0, x0, #0x300000

Quoted 8 lines
Quoted 6 lines

0x0000000040002858:  d5181040      msr (unknown), x0

And this is the extremely simple case of ARMv8.0 with no extensions.

I am very much tempted to re-instate the capstone submodule, or update disas/vixl and disable use of capstone for arm.

Double ho-hum.  It would appear that this horrible disassembly *is* vixl, because I didn't double check that libcapstone was installed.

So is capstone disassembly better now with Ubuntu 20.04 or should we still revert the submodule removal?

Also, if libvixl is so bad, why do we still have that in the repo?

Thomas

#18 lore raw

Re: [PATCH 3/3] capstone: Remove the capstone submodule

Quoted 1 line · Thomas Huth

So is capstone disassembly better now with Ubuntu 20.04 or should we still revert the submodule removal?

It's better, yes. At least it's giving me disassembly of the system registers.

Quoted 1 line

Also, if libvixl is so bad, why do we still have that in the repo?

Well, we just removed 3 other old disassemblers -- I think libvixl can be next.

r~

#19 lore raw

Re: [PATCH 3/3] capstone: Remove the capstone submodule

Quoted 8 lines · Richard Henderson
Quoted 1 line · Thomas Huth

So is capstone disassembly better now with Ubuntu 20.04 or should we still revert the submodule removal?

It's better, yes.  At least it's giving me disassembly of the system registers.

Quoted 1 line

Also, if libvixl is so bad, why do we still have that in the repo?

Well, we just removed 3 other old disassemblers -- I think libvixl can be next.

I thought there was a reason for keeping vixl around ... but seems my memory is wrong here. After searching a little bit, I only found this here:

https://lists.nongnu.org/archive/html/qemu-devel/2018-05/msg03416.html

So seems like there was already the idea of removing vixl four years ago... I'll send a patch to remove it.

Thomas