From patchwork Mon Sep 21 17:41:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 11790567 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 32501112E for ; Mon, 21 Sep 2020 17:51:15 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EAED72193E for ; Mon, 21 Sep 2020 17:51:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="LPhZXle6" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EAED72193E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:50060 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kKPy6-0001VL-3W for patchwork-qemu-devel@patchwork.kernel.org; Mon, 21 Sep 2020 13:51:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46188) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kKPp5-0008EL-87 for qemu-devel@nongnu.org; Mon, 21 Sep 2020 13:41:56 -0400 Received: from mail-pj1-x1043.google.com ([2607:f8b0:4864:20::1043]:51327) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kKPon-0000JB-9p for qemu-devel@nongnu.org; Mon, 21 Sep 2020 13:41:54 -0400 Received: by mail-pj1-x1043.google.com with SMTP id a9so168093pjg.1 for ; Mon, 21 Sep 2020 10:41:36 -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=LPhZXle68yO8XfsuPDJMqlafrS7AGvc3gLuSgSJRe3aGaHhIUWI29nkojgsidQV5BE u/CAkcZsfg8DnsZFD01wY35Uv1rR+Vnn6J3Crj2wLWNGo+a7oz8H0FhFPOBtxeXmSy4+ E3HzTfOdYIhD6RbRCl/Qa9jqdVXnBzY88UomEdrCuaxnbVQwEW35vKYEzltLl6SBO+8L 2e051S7iz2IBow+f09qjYIxi3ZnxupBn9D8mUV9dTNWEE2aOJK7bY1nRWlU9tDE6yCbU Ky53N70U6Vu7zKAsSZKrMvHpU4yPrqB8jmyMGQgDNRSTeo2ezln+7bjM7qWgF3KaBJJx 1UsA== 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=pPbKkiY0yBJHiRtL22mcpXj4CRM2V4CpQata5N9bppKPBh3BAsw92GAkUbkm11LFv8 eRd5OL2jw7WXfYfopyuzargrZCUHOxLXHYTANcNOxJqbDIzUAM32M1pmeZssSzzbrlct RwAo+DwC3zEK4CmjfEqfAUxV/+AmfqarEcQ41LSAw95lynwpO8xPArj27QQclLbJFJmr aLUeOmBm+hdj9TguzY8knyNxzbCdgw5AykQN2XRBxGGWMHJSGusSoivCePqeCWPz51yB d8zvtrvW03gIkFFdkF3XHeld/qNfZYzQVKzqhRwKmdMu6WHvO9ZZxCQDSUWhHLc1QUrF bs3A== X-Gm-Message-State: AOAM531qPgDlTlZ4Q5yHjDoYGcaDEgS7k7kTIE+8+jfwukEp35lRu5tt ihl5TLig2Kg+xq0fzbsZ+HhdzCDkgWiIcA== X-Google-Smtp-Source: ABdhPJzOhHVaCnMavIxFAIg3+Oge5LLc/q8MEGIvczTjBHGTkCg32ork7GC8U2btF87mjrsEL0sLsw== X-Received: by 2002:a17:90b:1212:: with SMTP id gl18mr416052pjb.138.1600710095634; Mon, 21 Sep 2020 10:41:35 -0700 (PDT) Received: from localhost.localdomain ([71.212.141.89]) by smtp.gmail.com with ESMTPSA id x4sm12585379pfm.86.2020.09.21.10.41.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Sep 2020 10:41:35 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v4 11/11] disas/capstone: Add skipdata hook for s390x Date: Mon, 21 Sep 2020 10:41:18 -0700 Message-Id: <20200921174118.39352-12-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200921174118.39352-1-richard.henderson@linaro.org> References: <20200921174118.39352-1-richard.henderson@linaro.org> MIME-Version: 1.0 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 , alex.bennee@linaro.org, =?utf-8?q?Philip?= =?utf-8?q?pe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" 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é Signed-off-by: Richard Henderson Reviewed-by: Alex Bennée --- 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; +/* + * 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 = 2; + break; + case 1: + case 2: + ilen = 4; + break; + default: + ilen = 6; + break; + } + + return ilen; +} + +static const cs_opt_skipdata cap_skipdata_s390x = { + .mnemonic = ".byte", + .callback = cap_skipdata_s390x_cb +}; + /* * Initialize the Capstone library. * @@ -42,13 +75,20 @@ static cs_err cap_disas_start(disassemble_info *info, csh *handle) /* "Disassemble" unknown insns as ".byte W,X,Y,Z". */ cs_option(*handle, CS_OPT_SKIPDATA, CS_OPT_ON); - if (info->cap_arch == 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; } /* Allocate temp space for cs_disasm_iter. */