From patchwork Mon Sep 14 23:02:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 303957 Delivered-To: patch@linaro.org Received: by 2002:a92:5ad1:0:0:0:0:0 with SMTP id b78csp2025299ilg; Mon, 14 Sep 2020 16:06:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwfGuFi8nartpxu1HHDK4M8p4Ho/VUpLlxAk6RuhnWOkzusxS5m/yelj9GBdAaXiBbq6fUo X-Received: by 2002:a25:dca:: with SMTP id 193mr14051093ybn.239.1600124811836; Mon, 14 Sep 2020 16:06:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1600124811; cv=none; d=google.com; s=arc-20160816; b=wbYdhWG8TJlZNkXk+tWyd383rSmL0NcpLN9Q6QYF2LXAe1Bm+UjnRjGOqC9Rrj1467 kGzvHLikSYjgg8AY0e3YA6BSeCvkZIFEBXvQ0sIAD9DrMKLsVg4lHf3uiFcRmw6VyXIf fMj/PG5+SIhjrlVVLPErxWxqPeSBRRa7zueqtY7PBFiB0tzFYUILfDUcj40Rs7806MIu dj1t7eovxRFW1INyzgSZ3LORY5UWLPZ93BaEZFHNpNgZCn1PCmc99Me51WNMW/qLzlOO 0+HWT77huzrFaGZvn5T3+NMFNvV9ALg1M2WEyBs038tDscy7Wyx7ffSbo9jIV3VcHmGi 5zXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=LENG1C+gvyxicL4wDRJAGnBo4QTtONcvzqY0emfT/VU=; b=GbbVci2VGKuwMzLdVYppKooJJClwVZsw0XC0Bw/Ni18+/yF2Or4CClUtdpMbW3pP2P x24S4xJ3KGtsTeXFkpzb9q0y+tAIC1CAni9CepN000MWAapHKyqmd6o2WUDdraznkuws 1XR721WGRWCKOR72TRQnYW6iSoILISIJm5zD2aTXzMCeTtqktYRpuWl7MhOyR0nyHMxe quW5eEh4DSvz+5hAk4mC24p7I9NBZkkO/+BEOgC1bxAw5372NsGmPeYHlWjrcl5dUk4X tz6rj2xw9HM10B8Zry92gRSULVZ3b4NPK7oGIIgJX8rM7tntvLEMHaWGDGcGdTCePqoo Vlow== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=RTWQhbvf; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id s18si11147190ybm.474.2020.09.14.16.06.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Sep 2020 16:06:51 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=RTWQhbvf; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:42862 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kHxYh-0006Dk-CB for patch@linaro.org; Mon, 14 Sep 2020 19:06:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33748) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kHxUO-00014y-Uj for qemu-devel@nongnu.org; Mon, 14 Sep 2020 19:02:24 -0400 Received: from mail-pf1-x441.google.com ([2607:f8b0:4864:20::441]:37779) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kHxUN-0006bC-Aw for qemu-devel@nongnu.org; Mon, 14 Sep 2020 19:02:24 -0400 Received: by mail-pf1-x441.google.com with SMTP id w7so805477pfi.4 for ; Mon, 14 Sep 2020 16:02:22 -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=LENG1C+gvyxicL4wDRJAGnBo4QTtONcvzqY0emfT/VU=; b=RTWQhbvfsnpqqL0NmJGJdO9yBxZjqM+TjbWeoW9Xu2cL55iUYlIHdWtVou2zb8O5lk a8Pj5ulhFf1VCYKTj/NWo4pJnnOGy+q6KFLAaB15J7wjdJH25Mibf5IOhDDcK+YSvJCj H+g3tjdF9x2G7Tkc3QjGDpXbP9J3hsvPkyZu9Ku0mo0qmCwla1Z4xi8C6MCbNRdtTBg/ BQK5dPc/Z06e5HxMAaEN8A5YCxCIbrtNX7LmEHQaGqjEBtrVfW29rPis1KGDAjVj3B4s wBOCzPUJ90iFNzTRRIDjC0JClubKR8hTiMO4EklFj6KLO1Et9m00BxuZENDf1FklnhHj GTBw== 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=LENG1C+gvyxicL4wDRJAGnBo4QTtONcvzqY0emfT/VU=; b=GSwXmrqh3fSclPRAM3/b1+MAXnBWg9Tt/dbVumTLYAb5PxnVwyhF1Y0KCmlkeDxjvG UuNJhmbLKTBiVWPdZvUil9Gep/jv4gt0BwK9/WIZPMzUZkZU7kh7VyyC6tqxN34F+JlZ IxNvr+jo3cF5FcuRGo4u4U+sirwq8d8HbwusBnnK4r0wfHDh35iied42KuMhQpuzOLS1 tzGzLPcTuIeRvKLpyI9IKC4JyvMjN0CMR02VkZScbmFwWoM3pJ+evOcBVPqvxo61haBz Dx22CaKOeq+LqAkSIl3LXpNnCYlVNglq1XNDW7VZvx8kMQ009HGQuowYok62wyalKYQZ /bRQ== X-Gm-Message-State: AOAM532YkvmDp1m3tkJy750NzAdjy4jBj6ywGVEXlrfJztG8RbT6xmYy Fp/TTL20vNSRVQX+BDQojCsQHVJMBXGt/A== X-Received: by 2002:a65:5502:: with SMTP id f2mr12223968pgr.418.1600124541622; Mon, 14 Sep 2020 16:02:21 -0700 (PDT) Received: from localhost.localdomain ([71.212.141.89]) by smtp.gmail.com with ESMTPSA id l23sm9106076pgt.16.2020.09.14.16.02.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Sep 2020 16:02:20 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 07/10] disas: Configure capstone for aarch64 host without libvixl Date: Mon, 14 Sep 2020 16:02:07 -0700 Message-Id: <20200914230210.2185860-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200914230210.2185860-1-richard.henderson@linaro.org> References: <20200914230210.2185860-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::441; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x441.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: luoyonggang@gmail.com, alex.bennee@linaro.org, thuth@redhat.com Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The ifdef tangle failed to set cap_arch if libvixl itself was not configured (e.g. due to lack of c++ compiler). Signed-off-by: Richard Henderson --- disas.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -- 2.25.1 Reviewed-by: Thomas Huth 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 = print_insn_arm_a64; +#elif defined(__aarch64__) s->info.cap_arch = CS_ARCH_ARM64; +# ifdef CONFIG_ARM_A64_DIS + s->info.print_insn = print_insn_arm_a64; +# endif #elif defined(__alpha__) s->info.print_insn = print_insn_alpha; #elif defined(__sparc__)