| Message ID | 20200922174741.475876-1-richard.henderson@linaro.org |
|---|---|
| Headers | show |
| Series | capstone + disassembler patch queue | expand |
On 22/09/20 19:47, Richard Henderson wrote: > The following changes since commit 834b9273d5cdab68180dc8c84d641aaa4344b057: > > Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-for-5.2-pull-request' into staging (2020-09-22 15:42:23 +0100) > > are available in the Git repository at: > > https://github.com/rth7680/qemu.git tags/pull-cap-20200922 > > for you to fetch changes up to fcfea6ced053045beb1dc8d22bdeaacc9c03d0b9: > > disas/capstone: Add skipdata hook for s390x (2020-09-22 08:59:28 -0700) > > ---------------------------------------------------------------- > Update capstone submodule from v3.0.5 to v5 ("next"). > Convert submodule build to meson. > Enable capstone disassembly for s390x. > Code cleanups in disas.c > > ---------------------------------------------------------------- > Richard Henderson (11): > capstone: Convert Makefile bits to meson bits > capstone: Update to upstream "next" branch > capstone: Require version 4.0 from a system library > disas: Move host asm annotations to tb_gen_code > disas: Clean up CPUDebug initialization > disas: Use qemu/bswap.h for bfd endian loads > disas: Cleanup plugin_disas > disas: Configure capstone for aarch64 host without libvixl > disas: Split out capstone code to disas/capstone.c > disas: Enable capstone disassembly for s390x > disas/capstone: Add skipdata hook for s390x > > configure | 64 +---- > Makefile | 16 -- > meson.build | 124 +++++++- > include/disas/dis-asm.h | 104 +++---- > include/disas/disas.h | 2 +- > include/exec/log.h | 4 +- > accel/tcg/translate-all.c | 24 +- > disas.c | 707 +++++++++++----------------------------------- > disas/capstone.c | 326 +++++++++++++++++++++ > target/s390x/cpu.c | 4 + > tcg/tcg.c | 4 +- > capstone | 2 +- > disas/meson.build | 1 + > meson_options.txt | 4 + > 14 files changed, 681 insertions(+), 705 deletions(-) > create mode 100644 disas/capstone.c > I will pull this as well into my branch (as a kind of topic branch) to avoid further conflicts. Paolo
On Tue, 22 Sep 2020 at 18:47, Richard Henderson <richard.henderson@linaro.org> wrote: > > The following changes since commit 834b9273d5cdab68180dc8c84d641aaa4344b057: > > Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-for-5.2-pull-request' into staging (2020-09-22 15:42:23 +0100) > > are available in the Git repository at: > > https://github.com/rth7680/qemu.git tags/pull-cap-20200922 > > for you to fetch changes up to fcfea6ced053045beb1dc8d22bdeaacc9c03d0b9: > > disas/capstone: Add skipdata hook for s390x (2020-09-22 08:59:28 -0700) > > ---------------------------------------------------------------- > Update capstone submodule from v3.0.5 to v5 ("next"). > Convert submodule build to meson. > Enable capstone disassembly for s390x. > Code cleanups in disas.c Fails to build: Linux qemu01 4.15.0-72-generic s390x From https://git-us.linaro.org/people/pmaydell/qemu-arm 8c1c07929f..a53ea1e6f9 staging -> pmaydell/staging Fetching submodule capstone From https://git.qemu.org/git/capstone fc236325..4457d451 master -> origin/master 02af5976..2f38802e next -> origin/next d57e7af3..7ca653c7 v4 -> origin/v4 * [new tag] 4.0.2 -> 4.0.2 make: Entering directory '/home/ubuntu/qemu/build/all' config-host.mak is out-of-date, running configure make: *** No rule to make target 'capstone/all', needed by 'Makefile'. Stop. make: *** Waiting for unfinished jobs.... GIT ui/keycodemapdb tests/fp/berkeley-testfloat-3 tests/fp/berkeley-softfloat-3 meson dtc capstone slirp roms/SLOF cross containers no NOTE: guest cross-compilers enabled: cc cc make: Leaving directory '/home/ubuntu/qemu/build/all' thanks -- PMM
On 25/09/20 12:03, Peter Maydell wrote: > > Linux qemu01 4.15.0-72-generic s390x > From https://git-us.linaro.org/people/pmaydell/qemu-arm > 8c1c07929f..a53ea1e6f9 staging -> pmaydell/staging > Fetching submodule capstone > From https://git.qemu.org/git/capstone > fc236325..4457d451 master -> origin/master > 02af5976..2f38802e next -> origin/next > d57e7af3..7ca653c7 v4 -> origin/v4 > * [new tag] 4.0.2 -> 4.0.2 > make: Entering directory '/home/ubuntu/qemu/build/all' > config-host.mak is out-of-date, running configure > make: *** No rule to make target 'capstone/all', needed by 'Makefile'. Stop. > make: *** Waiting for unfinished jobs.... > GIT ui/keycodemapdb tests/fp/berkeley-testfloat-3 > tests/fp/berkeley-softfloat-3 meson dtc capstone slirp roms/SLOF > cross containers no I think this is just temporary and running "make" again would fix it. It can be worked around too, though. Paolo
On 9/25/20 3:03 AM, Peter Maydell wrote: > make: Entering directory '/home/ubuntu/qemu/build/all' > config-host.mak is out-of-date, running configure > make: *** No rule to make target 'capstone/all', needed by 'Makefile'. Stop. > make: *** Waiting for unfinished jobs.... Incremental build fails the first time, yes. Running make a second time succeeds. r~
The following changes since commit 834b9273d5cdab68180dc8c84d641aaa4344b057: Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-for-5.2-pull-request' into staging (2020-09-22 15:42:23 +0100) are available in the Git repository at: https://github.com/rth7680/qemu.git tags/pull-cap-20200922 for you to fetch changes up to fcfea6ced053045beb1dc8d22bdeaacc9c03d0b9: disas/capstone: Add skipdata hook for s390x (2020-09-22 08:59:28 -0700) ---------------------------------------------------------------- Update capstone submodule from v3.0.5 to v5 ("next"). Convert submodule build to meson. Enable capstone disassembly for s390x. Code cleanups in disas.c ---------------------------------------------------------------- Richard Henderson (11): capstone: Convert Makefile bits to meson bits capstone: Update to upstream "next" branch capstone: Require version 4.0 from a system library disas: Move host asm annotations to tb_gen_code disas: Clean up CPUDebug initialization disas: Use qemu/bswap.h for bfd endian loads disas: Cleanup plugin_disas disas: Configure capstone for aarch64 host without libvixl disas: Split out capstone code to disas/capstone.c disas: Enable capstone disassembly for s390x disas/capstone: Add skipdata hook for s390x configure | 64 +---- Makefile | 16 -- meson.build | 124 +++++++- include/disas/dis-asm.h | 104 +++---- include/disas/disas.h | 2 +- include/exec/log.h | 4 +- accel/tcg/translate-all.c | 24 +- disas.c | 707 +++++++++++----------------------------------- disas/capstone.c | 326 +++++++++++++++++++++ target/s390x/cpu.c | 4 + tcg/tcg.c | 4 +- capstone | 2 +- disas/meson.build | 1 + meson_options.txt | 4 + 14 files changed, 681 insertions(+), 705 deletions(-) create mode 100644 disas/capstone.c