From patchwork Wed May 10 15:52:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 680527 Delivered-To: patch@linaro.org Received: by 2002:a5d:4a41:0:0:0:0:0 with SMTP id v1csp2922137wrs; Wed, 10 May 2023 08:53:58 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7v8wU5Rd6DbRZPykz7ubqeTSD6DPg+KOsF7D42NZkRvKrwPUSnVb4/7Vx3rZWPyKDHScy+ X-Received: by 2002:a05:622a:34b:b0:3f3:9ace:84e1 with SMTP id r11-20020a05622a034b00b003f39ace84e1mr10390519qtw.56.1683734038521; Wed, 10 May 2023 08:53:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683734038; cv=none; d=google.com; s=arc-20160816; b=y3nrY9X2hpQM5sNWzLri8qb0ySkDVYBEzsueCcNEfntsB5nMKzbIeubbI43EiXM7G4 wkdvpyAuWJqDjwu2vtRao4z/9r+uAPJAK9fnm6hlogYs5BKg0DyDf0S7jJ9HE/HWlemE UgETDophXKCunI5n/Fb1B1c4kz2cWsBYdymhW311Ak901WosOefNjG9FFsbaViM2jJsM N8SHILsm/mV1s0r8KGGCumfdGuoWXDdM+tpvOpzxHsPYLujWj5yM9CfGmGK8K0azZEXY GyWZe0fKrYSIAmnYDwV9N3hWedVVysrwYdT/1K7JI2oXmEg6T2vrSQDxcwOU1cuQmM/Q NKvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=GuI9OnpIiD+w0k07S0dmYYpQrmGPfKuDmKUIYtzB2PA=; b=jQo0L0cN8RoIEregrnrhWy1Hv0eth4aTU3e5avTKzgroBBlYQ6w3yoBRfQyRjBHUtt d7NdKS/qzrnl8rNNWPvB5YjtmRKxTOWxEcnTqa558rWftWWDT5ul3xL+4RMDGi13niO3 dDSsqKNmEiDNQWwBflEpQqtoA9KyONURYp1BXH+qVcLatb6ZPfBvXEEoFNeQEU+f+UlG ua8H2Nbkbvj/971vLfdeq1mJfcZppAOFJdGg2P0ssXAWuko+GgoX+ftb8E23Pt94i1c0 ElXWtGjvy0TXr/wkBeB/A1t48bsV0cfXOHod0k8KzuJq5c5ySAgVpL7Qx72gSd6q/+kn ItMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=RPP39WSg; 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=pass (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 d7-20020ac85d87000000b003f3875db680si1626496qtx.610.2023.05.10.08.53.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 10 May 2023 08:53:58 -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=pass header.i=@linaro.org header.s=google header.b=RPP39WSg; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pwm7H-00030m-TB; Wed, 10 May 2023 11:52:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pwm7F-0002zS-UK for qemu-devel@nongnu.org; Wed, 10 May 2023 11:52:33 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pwm7B-0004T2-Nm for qemu-devel@nongnu.org; Wed, 10 May 2023 11:52:31 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-3f42ba32e24so15465605e9.3 for ; Wed, 10 May 2023 08:52:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1683733948; x=1686325948; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GuI9OnpIiD+w0k07S0dmYYpQrmGPfKuDmKUIYtzB2PA=; b=RPP39WSgX4rdWd1fca6h28WNNGUtyFNtMh9KJwGWiS3ejp9McbhhX4J4j7p1KU8NfM yWBRp0kRf9lHiCPPNqDFa4yKtnu6KJL8act1mO9mew20M1Zga3ObVGG3fOxj68l/2V/0 6uBefTUt8+QJ/k9KMwAR1RB2G5COfghk+uwF4DeESHj6G9TZK/tDIbwZ3+3RZ1710Rcn OBknzqJOO1BGzJLZQxcWJ7IUAwXTXgFyY3Tvej7udZdyrwNajahoiux0Pp5Qxk9Cujjy TgrSBiIma+Li+FHp1ejdw5ePKTqOgPhcgeb2Qdaqv8p841xr3orfuiB5UM0PNZEkGdRX EVfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683733948; x=1686325948; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GuI9OnpIiD+w0k07S0dmYYpQrmGPfKuDmKUIYtzB2PA=; b=Chx42VW8s8zmEAoHkP2vF/VbuF2rOjNl/y8G3D/1dMNx4TFHn8VuXHseUnxNTKqBGM US/WZmp8rwyDT0GH1QcwT8/2/2MoyNy1tpoCgfd/slnJGZiOPgawgQCMMSevjF3/72G2 xYKI3swvbL7PpcKxFhVvjLoOplq4MiFnxPAeO4miyyd4/uHVUn9WmLYNWV6HfPxV0UTi QBSC11PjMhCGUy9jISVSRWe8PSTtDFGtLmYbumaW0C+xBDvyNOTZ3BTKQ4/jq0h1ASbU FKvMBo6cg6s78rzYCd3AST9NDy8dHeAHU0/krnNO+aVMx7IVnhA1vDekC1+F8dn0sooT 4c0Q== X-Gm-Message-State: AC+VfDx5bTqGBEGm3qioYeae9msbqsgzwgCib581EaINyxi6O5OKHKjV DvZKt6nyHS/FGkWM47wCFBl+YtiyYuNe9JJDs40B1g== X-Received: by 2002:a05:600c:2059:b0:3f4:2492:a91f with SMTP id p25-20020a05600c205900b003f42492a91fmr8116849wmg.27.1683733947820; Wed, 10 May 2023 08:52:27 -0700 (PDT) Received: from stoup.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id n23-20020a7bc5d7000000b003ee74c25f12sm23157946wmk.35.2023.05.10.08.52.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 May 2023 08:52:27 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: philmd@linaro.org, Thomas Huth Subject: [PATCH v3 1/5] disas: Move disas.c to disas/ Date: Wed, 10 May 2023 16:52:22 +0100 Message-Id: <20230510155226.647756-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230510155226.647756-1-richard.henderson@linaro.org> References: <20230510155226.647756-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=richard.henderson@linaro.org; helo=mail-wm1-x330.google.com 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_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Reviewed-by: Thomas Huth Signed-off-by: Richard Henderson Message-Id: <20230503072331.1747057-80-richard.henderson@linaro.org> --- meson.build | 3 --- disas.c => disas/disas.c | 0 disas/meson.build | 4 +++- 3 files changed, 3 insertions(+), 4 deletions(-) rename disas.c => disas/disas.c (100%) diff --git a/meson.build b/meson.build index 0149bd634f..7c7799c9ee 100644 --- a/meson.build +++ b/meson.build @@ -3152,9 +3152,6 @@ specific_ss.add(files('cpu.c')) subdir('softmmu') -common_ss.add(capstone) -specific_ss.add(files('disas.c'), capstone) - # Work around a gcc bug/misfeature wherein constant propagation looks # through an alias: # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=99696 diff --git a/disas.c b/disas/disas.c similarity index 100% rename from disas.c rename to disas/disas.c diff --git a/disas/meson.build b/disas/meson.build index c865bdd882..cbf6315f25 100644 --- a/disas/meson.build +++ b/disas/meson.build @@ -10,4 +10,6 @@ common_ss.add(when: 'CONFIG_RISCV_DIS', if_true: files('riscv.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')) +common_ss.add(when: capstone, if_true: [files('capstone.c'), capstone]) + +specific_ss.add(files('disas.c'), capstone) From patchwork Wed May 10 15:52:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 680528 Delivered-To: patch@linaro.org Received: by 2002:a5d:4a41:0:0:0:0:0 with SMTP id v1csp2922241wrs; Wed, 10 May 2023 08:54:10 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7+OidLzWmBQTwlqdVA1wX6RrBeGoCXLZ5s4UxxhypyGraPEfVqN1daXGJ29Zs34lKJbKxA X-Received: by 2002:a05:6214:c82:b0:5f1:6aa8:cd2d with SMTP id r2-20020a0562140c8200b005f16aa8cd2dmr22333138qvr.22.1683734050137; Wed, 10 May 2023 08:54:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683734050; cv=none; d=google.com; s=arc-20160816; b=M77/pHKWBTNXK7YzVPvdqxGw9oGk4+cSCf0uz6j3lRfiMGiahAxnbG94W9JYtaL/K4 fwAtymNWvj8OLANBLXuSWcknTYsKTsD+u6WWNSMVfy8Jcn9HZnFvPfdx52jl1tCTrQWC RiZjV1MbvMbFClZoWE3+wEgvkcNdyp1WsRtfSwy1UH3xGHlOPrRSG8B/+PKxubqYctSA iDPxLmpqVYGBw833s3dBdsBJNTx87pxuTQ4F5ymfowj9rsfLwcu0XkSd6tRplZNHE5ar 86pMzXFqzf2rG14ygJERrPVRMwSh5L/q0Cp0V5CySRR8Z5wKSiRBUueZ+NJ0ekxU66eM tYOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=zWigtf17KjwZZZIDJgIm8WolKEqh/Em8HBWg1HHvtUY=; b=miMv82l+3KyI8ORxRUoDuIkWzm8hA82CyQJBzInCVAFXyZR7LDbX/OvwrUNw67ecJ9 jdCS+lTkNrclLvC5jC5VBxQmcQjx+5JCygAO+yeNfLs0lXszEZirfeZ5p7qk3wzL3gYH zJFsMSssiq9m1kbd0MBLLTNJERC22zXuFDkuMsEH0YYvCy8Oqso5qMy4C1EeUv9qnR7I hVJkJA+Il7n1FZ9/11IhLW3kraLuzG/T6ZRKzcrz9OWx+ijuct5CS6VJdfRYIHd2lJhO 6rQb/i2ll/GiRTvHaVSlR3qOhmXpefZ5YScTsoROX1BFYSgOjskjG77zkBERGIB3OoOB Gu6A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="Ke/51h/x"; 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=pass (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 u12-20020a0562141c0c00b0061b5bff03a8si2259347qvc.476.2023.05.10.08.54.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 10 May 2023 08:54:10 -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=pass header.i=@linaro.org header.s=google header.b="Ke/51h/x"; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pwm7I-000310-3T; Wed, 10 May 2023 11:52:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pwm7F-0002zT-Ub for qemu-devel@nongnu.org; Wed, 10 May 2023 11:52:33 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pwm7B-0004UR-TC for qemu-devel@nongnu.org; Wed, 10 May 2023 11:52:31 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-3f41d087b24so33500865e9.1 for ; Wed, 10 May 2023 08:52:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1683733948; x=1686325948; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=zWigtf17KjwZZZIDJgIm8WolKEqh/Em8HBWg1HHvtUY=; b=Ke/51h/x0piipQ0SAV1UjL8R4SoMXAg5WLXaBs37i04OM2RUBxN+2HAu7GMjO3h5YP EokTTAun+4CCg/UnhOuF3P2UK4IRMKr6tlgQ5uYm+tWbq9pUNJP3gb1BHVDBcSaGgP6X q71abwvGUN7rxNBH9PwNrXko0UiVH8rxf5/QujIfziwx6SAr0JObBFmeu5DqHEWBZAf/ tC0UC8iDqz+eA0xkwcFpe956JfExwuyzd/PPMG9FR3AUE5zoSi4kFAd6YBjXA0/xLwTC d20A/JCBZXqwIr6V2OKt8j8h/HWX9TDL9gE15rTcoDZdK8NZAl6+wA3cLRmqpCLyVVut +wBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683733948; x=1686325948; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zWigtf17KjwZZZIDJgIm8WolKEqh/Em8HBWg1HHvtUY=; b=W5/hIj3FhOwZA5yIyaaQrVCTekvBnQiA/H/MR4sHgzGGadr7CBxyut1hi7WDZAG+4f DUItTSGL/W9pmEpb+buvjIVuMyRqcy3mFTE3EhnFiFzuQ9oulpx1IsitJeOEpFTfdys7 u+h8xAKOdquYMwX2Wign7cDaX8QDhAo9gSmgKaoJzoeI1OQ2OKKc9vHHnhqBcenaV4mx dC8Gl+K0pBAjkqzLhJufKVjq5bPB/chhkLHhbWWBZy6/ivS7hZSsVFyQC1TvlQYACw2C DmrvzeBKlDyVvIBsfApCBIw7xqktJ6xA/dP8YYO0Fds+ekfw934r1BKnOkn2TAK+0Dlw g0BA== X-Gm-Message-State: AC+VfDxuZUsW8v9IeUXEtgd/uVPAUUXqnXd9lJafBYW47TmnmHgH8iTe 9zK3mPWTnhQrfVg+a88gR9TJDZTYpzn9gt9QXx9JNQ== X-Received: by 2002:a05:6000:1c4:b0:2f5:ace2:8737 with SMTP id t4-20020a05600001c400b002f5ace28737mr11431643wrx.32.1683733948514; Wed, 10 May 2023 08:52:28 -0700 (PDT) Received: from stoup.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id n23-20020a7bc5d7000000b003ee74c25f12sm23157946wmk.35.2023.05.10.08.52.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 May 2023 08:52:28 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: philmd@linaro.org, Thomas Huth Subject: [PATCH v3 2/5] disas: Remove target_ulong from the interface Date: Wed, 10 May 2023 16:52:23 +0100 Message-Id: <20230510155226.647756-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230510155226.647756-1-richard.henderson@linaro.org> References: <20230510155226.647756-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=richard.henderson@linaro.org; helo=mail-wm1-x332.google.com 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_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Use uint64_t for the pc, and size_t for the size. Reviewed-by: Thomas Huth Signed-off-by: Richard Henderson Message-Id: <20230503072331.1747057-81-richard.henderson@linaro.org> --- include/disas/disas.h | 17 ++++++----------- bsd-user/elfload.c | 5 +++-- disas/disas.c | 19 +++++++++---------- linux-user/elfload.c | 5 +++-- 4 files changed, 21 insertions(+), 25 deletions(-) diff --git a/include/disas/disas.h b/include/disas/disas.h index d363e95ede..6c394e0b09 100644 --- a/include/disas/disas.h +++ b/include/disas/disas.h @@ -7,28 +7,23 @@ #include "cpu.h" /* Disassemble this for me please... (debugging). */ -void disas(FILE *out, const void *code, unsigned long size); -void target_disas(FILE *out, CPUState *cpu, target_ulong code, - target_ulong size); +void disas(FILE *out, const void *code, size_t size); +void target_disas(FILE *out, CPUState *cpu, uint64_t code, size_t size); -void monitor_disas(Monitor *mon, CPUState *cpu, - target_ulong pc, int nb_insn, int is_physical); +void monitor_disas(Monitor *mon, CPUState *cpu, uint64_t pc, + int nb_insn, bool is_physical); char *plugin_disas(CPUState *cpu, uint64_t addr, size_t size); /* Look up symbol for debugging purpose. Returns "" if unknown. */ -const char *lookup_symbol(target_ulong orig_addr); +const char *lookup_symbol(uint64_t orig_addr); #endif struct syminfo; struct elf32_sym; struct elf64_sym; -#if defined(CONFIG_USER_ONLY) -typedef const char *(*lookup_symbol_t)(struct syminfo *s, target_ulong orig_addr); -#else -typedef const char *(*lookup_symbol_t)(struct syminfo *s, hwaddr orig_addr); -#endif +typedef const char *(*lookup_symbol_t)(struct syminfo *s, uint64_t orig_addr); struct syminfo { lookup_symbol_t lookup_symbol; diff --git a/bsd-user/elfload.c b/bsd-user/elfload.c index fbcdc94b96..2e76f0d3b5 100644 --- a/bsd-user/elfload.c +++ b/bsd-user/elfload.c @@ -352,9 +352,10 @@ static abi_ulong load_elf_interp(struct elfhdr *interp_elf_ex, static int symfind(const void *s0, const void *s1) { - target_ulong addr = *(target_ulong *)s0; + __typeof(sym->st_value) addr = *(uint64_t *)s0; struct elf_sym *sym = (struct elf_sym *)s1; int result = 0; + if (addr < sym->st_value) { result = -1; } else if (addr >= sym->st_value + sym->st_size) { @@ -363,7 +364,7 @@ static int symfind(const void *s0, const void *s1) return result; } -static const char *lookup_symbolxx(struct syminfo *s, target_ulong orig_addr) +static const char *lookup_symbolxx(struct syminfo *s, uint64_t orig_addr) { #if ELF_CLASS == ELFCLASS32 struct elf_sym *syms = s->disas_symtab.elf32; diff --git a/disas/disas.c b/disas/disas.c index b087c12c47..f5e95043cf 100644 --- a/disas/disas.c +++ b/disas/disas.c @@ -204,10 +204,9 @@ static void initialize_debug_host(CPUDebug *s) } /* Disassemble this for me please... (debugging). */ -void target_disas(FILE *out, CPUState *cpu, target_ulong code, - target_ulong size) +void target_disas(FILE *out, CPUState *cpu, uint64_t code, size_t size) { - target_ulong pc; + uint64_t pc; int count; CPUDebug s; @@ -226,7 +225,7 @@ void target_disas(FILE *out, CPUState *cpu, target_ulong code, } for (pc = code; size > 0; pc += count, size -= count) { - fprintf(out, "0x" TARGET_FMT_lx ": ", pc); + fprintf(out, "0x%08" PRIx64 ": ", pc); count = s.info.print_insn(pc, &s.info); fprintf(out, "\n"); if (count < 0) @@ -292,7 +291,7 @@ char *plugin_disas(CPUState *cpu, uint64_t addr, size_t size) } /* Disassemble this for me please... (debugging). */ -void disas(FILE *out, const void *code, unsigned long size) +void disas(FILE *out, const void *code, size_t size) { uintptr_t pc; int count; @@ -324,7 +323,7 @@ void disas(FILE *out, const void *code, unsigned long size) } /* Look up symbol for debugging purpose. Returns "" if unknown. */ -const char *lookup_symbol(target_ulong orig_addr) +const char *lookup_symbol(uint64_t orig_addr) { const char *symbol = ""; struct syminfo *s; @@ -356,8 +355,8 @@ physical_read_memory(bfd_vma memaddr, bfd_byte *myaddr, int length, } /* Disassembler for the monitor. */ -void monitor_disas(Monitor *mon, CPUState *cpu, - target_ulong pc, int nb_insn, int is_physical) +void monitor_disas(Monitor *mon, CPUState *cpu, uint64_t pc, + int nb_insn, bool is_physical) { int count, i; CPUDebug s; @@ -378,13 +377,13 @@ void monitor_disas(Monitor *mon, CPUState *cpu, } if (!s.info.print_insn) { - monitor_printf(mon, "0x" TARGET_FMT_lx + monitor_printf(mon, "0x%08" PRIx64 ": Asm output not supported on this arch\n", pc); return; } for (i = 0; i < nb_insn; i++) { - g_string_append_printf(ds, "0x" TARGET_FMT_lx ": ", pc); + g_string_append_printf(ds, "0x%08" PRIx64 ": ", pc); count = s.info.print_insn(pc, &s.info); g_string_append_c(ds, '\n'); if (count < 0) { diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 703f7434a0..80085b8a30 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -3327,9 +3327,10 @@ static void load_elf_interp(const char *filename, struct image_info *info, static int symfind(const void *s0, const void *s1) { - target_ulong addr = *(target_ulong *)s0; struct elf_sym *sym = (struct elf_sym *)s1; + __typeof(sym->st_value) addr = *(uint64_t *)s0; int result = 0; + if (addr < sym->st_value) { result = -1; } else if (addr >= sym->st_value + sym->st_size) { @@ -3338,7 +3339,7 @@ static int symfind(const void *s0, const void *s1) return result; } -static const char *lookup_symbolxx(struct syminfo *s, target_ulong orig_addr) +static const char *lookup_symbolxx(struct syminfo *s, uint64_t orig_addr) { #if ELF_CLASS == ELFCLASS32 struct elf_sym *syms = s->disas_symtab.elf32; From patchwork Wed May 10 15:52:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 680524 Delivered-To: patch@linaro.org Received: by 2002:a5d:4a41:0:0:0:0:0 with SMTP id v1csp2921952wrs; Wed, 10 May 2023 08:53:34 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ59k8YHDt0N6Lc8VMOrgE28QVkHhPNqmqT+ud/wJapsw+P7tNKaSXfUblIXvNRbBmEOQWNL X-Received: by 2002:ad4:5cce:0:b0:5ee:e4f8:c7e5 with SMTP id iu14-20020ad45cce000000b005eee4f8c7e5mr26243869qvb.41.1683734013589; Wed, 10 May 2023 08:53:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683734013; cv=none; d=google.com; s=arc-20160816; b=JCUvPCXo7ayE5N/wQs4C9JSjZ9oDbWhTrvZRjWo73jcAAVRB+HB0xi+RoVAEN7p+QD ELZJVZN2cmCU3fVDMyL9vuQ/4rMYDTF8ky/Vn7T3juy2pofy4Jqde6d8a99VUJN0EQI7 vcyllXmWbB997F61ho0TbXNSKaNCxt5f5FF6pwejFSy/B5q7UDD4yma8/JXE3N5FWQ+M wCNdHA90u8QEitZgaSQa8ksTLcXrgR8N4WQdBg101EWobdjXwHX6GqgspfZs2Saa6+if fnFjclWvMzz7QpAJtSXxZ9COAUtjbJNqk4TK95JJfzy8846TvVxGYEdzQLiL6UQDxTCT k2sw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=Cpop6LoNqSh03hm8vCAMJ2YCthnibtXTEV61F8HsXUQ=; b=ghMauRo8GPj7cxHGY0rqbOYMQbWuqOwdPXZhsd0pBhfsDhcq0YzILdAI09VnMcZBrh uqZHcEEvXXPtW8FCYXl14Y+yZnHPBRck/MGnDsbZ+dsOCq3o2PgRxx2GFbGhQ7WhAxtH KtzfF3fa7f3MI//1oqa1nW9jtqEkuyZI26iZePWqbkGfbG/vvacHWEjmVHz0vLwyohMw sJUt2kzSFzZOCxzehVhF5/socH7mjS9gyf748LnRNWEWTIhLOr4r2yy0l210DZPIgHiS gryLf4ihHKW2uLtYRK/p46wWljAchZOue61rUNHwJ5gvqHWYaRfUoqnFKsOcj++r6Ylu Brqg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=h3bisDW9; 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=pass (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 x5-20020ae9e905000000b0075533d216c1si2252000qkf.57.2023.05.10.08.53.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 10 May 2023 08:53:33 -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=pass header.i=@linaro.org header.s=google header.b=h3bisDW9; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pwm7H-00030R-LN; Wed, 10 May 2023 11:52:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pwm7F-0002zU-Ud for qemu-devel@nongnu.org; Wed, 10 May 2023 11:52:33 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pwm7C-0004UV-C9 for qemu-devel@nongnu.org; Wed, 10 May 2023 11:52:31 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-3f423ac6e2dso28743145e9.2 for ; Wed, 10 May 2023 08:52:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1683733949; x=1686325949; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Cpop6LoNqSh03hm8vCAMJ2YCthnibtXTEV61F8HsXUQ=; b=h3bisDW9bIxtAUAucN+PvcNVVKcrQjZ4LyVdRRsuYdJ75a4o0g4aQFOrJj/bOKOOBV UamU+ZMS5L15+9TeYmL0PpD2vSPFMU5DCQW0lhxwKRMCW50n13Th9Ytd5iquyCN6CeOQ wnrTDHxQ+qrLSAlXedMOu7xkDJtpaO74IsfNgoV1PwUA+Mn6NeC5tr2csLKAfaX4g9Yv UAbQcfGNSpvLS7lbHuIAmkTJY3XstUq79iHo5WzhcsrwRup0CZvNmuNDnzGTTEy6Lnd0 tAYE/A8vvbOzA2/cG1vvjj5BPsyU39wUdEdw2OL7M+KQ5a4bXt1zh4NMxkbTKX7Jw3Hx BcBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683733949; x=1686325949; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Cpop6LoNqSh03hm8vCAMJ2YCthnibtXTEV61F8HsXUQ=; b=QmJF3C3PH/1ir1xv9tE5cGraILS6cvIQWkyOLVzXR9KnQQ8g3kMcqnRMk9abbyTuBd th5k198EExwmXGAFQIPx0tdPfu+rFpSrp3fhNpaj/YD25PiXjixcVqKohQakX3f1m5yY sfcenut8Pj9jt+gxWCbRiRFMlPowgGbZc58eguVLz2h3NVicQ9xkfKOIsHbIgwpOh2vP 0TOhhEuGAdvemqreuPJuf806z79+uh3bKyAF37vAc/CzW8GTmlvt/HeK2CV1uO8u2r2p vmrrJEqTAf7yGgSavyQkz+/fq0jfEpJ028IuxlgyPzJmeOlP5IsJAMrdN68d8591K7kh WHNg== X-Gm-Message-State: AC+VfDzICKOdCkT1qKPzzUvFcQ9qCsXaAmSaqtJ+cJAqb0un9HejXQ6G BXLRQrXVwmVNou3Sit9+cIzLV5Fu+hltgLiMUKzLlQ== X-Received: by 2002:a1c:f402:0:b0:3f3:3a81:32b with SMTP id z2-20020a1cf402000000b003f33a81032bmr12547239wma.15.1683733949040; Wed, 10 May 2023 08:52:29 -0700 (PDT) Received: from stoup.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id n23-20020a7bc5d7000000b003ee74c25f12sm23157946wmk.35.2023.05.10.08.52.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 May 2023 08:52:28 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: philmd@linaro.org, Thomas Huth Subject: [PATCH v3 3/5] disas: Remove target-specific headers Date: Wed, 10 May 2023 16:52:24 +0100 Message-Id: <20230510155226.647756-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230510155226.647756-1-richard.henderson@linaro.org> References: <20230510155226.647756-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=richard.henderson@linaro.org; helo=mail-wm1-x330.google.com 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_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Reviewed-by: Thomas Huth Signed-off-by: Richard Henderson Message-Id: <20230503072331.1747057-83-richard.henderson@linaro.org> --- include/disas/disas.h | 6 ------ disas/disas.c | 3 ++- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/include/disas/disas.h b/include/disas/disas.h index 6c394e0b09..176775eff7 100644 --- a/include/disas/disas.h +++ b/include/disas/disas.h @@ -1,11 +1,6 @@ #ifndef QEMU_DISAS_H #define QEMU_DISAS_H -#include "exec/hwaddr.h" - -#ifdef NEED_CPU_H -#include "cpu.h" - /* Disassemble this for me please... (debugging). */ void disas(FILE *out, const void *code, size_t size); void target_disas(FILE *out, CPUState *cpu, uint64_t code, size_t size); @@ -17,7 +12,6 @@ char *plugin_disas(CPUState *cpu, uint64_t addr, size_t size); /* Look up symbol for debugging purpose. Returns "" if unknown. */ const char *lookup_symbol(uint64_t orig_addr); -#endif struct syminfo; struct elf32_sym; diff --git a/disas/disas.c b/disas/disas.c index f5e95043cf..a709831e8d 100644 --- a/disas/disas.c +++ b/disas/disas.c @@ -3,9 +3,10 @@ #include "disas/dis-asm.h" #include "elf.h" #include "qemu/qemu-print.h" - #include "disas/disas.h" #include "disas/capstone.h" +#include "hw/core/cpu.h" +#include "exec/memory.h" typedef struct CPUDebug { struct disassemble_info info; From patchwork Wed May 10 15:52:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 680523 Delivered-To: patch@linaro.org Received: by 2002:a5d:4a41:0:0:0:0:0 with SMTP id v1csp2921934wrs; Wed, 10 May 2023 08:53:32 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4gll+7OeZYVXkZ8Z4d+JH9ecTwb6Ug6ArvnhvOE2m2SRJS3S3mKwhADkOAnIym1NLCCUXM X-Received: by 2002:a05:6214:c46:b0:621:53d1:3c69 with SMTP id r6-20020a0562140c4600b0062153d13c69mr2779223qvj.20.1683734012367; Wed, 10 May 2023 08:53:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683734012; cv=none; d=google.com; s=arc-20160816; b=yUyebd0F3W8PYlbLwWDHMT4ef1S6ke2picFsBNSGvzUnziwU/aAdMrU85TG5iDVouK BntvjIvQ1SFwLtmOiRwxd82WkpyEnNG8Bv/RrC1M0PXk9JWSsJoU46HEvVuwJ0pTWl7c krP8Ne5BjzJjvziMWNpQgCjFz5n/GGzE9qw+f2bUtPdmw1PMSF1hwHOCIU0YIj3txCAA PARg5zKe3ge/QF8VsdiXVO9+1n8YDJCdNiTw5Qp1HqDih/Sn9PyiV7Gq4mhHsQ78+wlv EZKPzkI/EB60caWwb9zgceALoBnQ8lbqxJN/hcgg/99Wr5vr/oxUxyxuLm26vi7tBb8e wQug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=afgvvt2mEnbYffaRVT+ikKLu+J5+NN7Q7LWy/8ocp6g=; b=OJgQ1QCTUIji/hCWFOWnf8+CqmbPML89bfLpRc6aZq2vGG2SRuxU4oK5KIC+4dVFhU 7IbshpXwvWbuFiVsxXMk7k9A62sLjuPbVYWGFa+emNTXQxdp1t16C7MenXjSX6jcS84l djvRunRAwCSqx+8LkWC1839CDKjP8BPjUs+h4G7LRr8V1Vm2u+4wewWbt/+M3AsUNRTB 2jZADrZEu7fC8aWoLBDTEhiYEgOIEFAnZe/3UDSN4dOu2nOQXwXxFuVf1a0e+7jJVfUc 5Z7QQGPmBBYCxDycygFHotbCpwmcALAuGSi+Ocftlqn+OVIoaARVrjbCloBhsMRa9N7l 4FKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=TetpG3zo; 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=pass (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 t4-20020ad45bc4000000b006165793d228si2309072qvt.329.2023.05.10.08.53.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 10 May 2023 08:53:32 -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=pass header.i=@linaro.org header.s=google header.b=TetpG3zo; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pwm7J-00031r-5C; Wed, 10 May 2023 11:52:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pwm7H-00030S-Kq for qemu-devel@nongnu.org; Wed, 10 May 2023 11:52:35 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pwm7F-0004Ua-NA for qemu-devel@nongnu.org; Wed, 10 May 2023 11:52:35 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-3f420618d5bso30918025e9.1 for ; Wed, 10 May 2023 08:52:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1683733949; x=1686325949; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=afgvvt2mEnbYffaRVT+ikKLu+J5+NN7Q7LWy/8ocp6g=; b=TetpG3zoFcKBxPNamTMDnC/Yua72RrxSdWn354Q2mwkoB0usAgN179vl/pWpW40lMH TubxYwB7JV5t+pt7l1eQpZQWJFliy2FI6Lxp9Vsknv2OUlr5qSr4H7R9kybxgottti6e X2CViOe2u0UQpSDaCjbxlTJI4KLuFrLUiBWdpA1jwsFGYObwoPBOUawF8+J9tIxG8D9Z j5m8YC1Bws/JpBC7EPiqPfVHCu7BXY0hkwy8IfR4Xx69RGkJEJR+C2DD2+8qnnEjkkc3 X/6cv1W/RhZD6EH3gCnpb0gtiJ3CUSgSR/Lh4F0uqGBahTXabrvi+w8DHhhRNrxPrYSh mvHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683733949; x=1686325949; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=afgvvt2mEnbYffaRVT+ikKLu+J5+NN7Q7LWy/8ocp6g=; b=aY715mrw+8rxYnkJXVioj8NWvC5MzPhpz8Frp+JGROnSuahb2Y46ZIqGHmhLtsATud 3cT1MwqVynaF1xgWvsHH9tYU66HM6OLRSEm7paGJWl/EUJkFgdCjm0rsO5oxKlvIpyF1 I/unZbgXnJR1R5AuNS/F8QwjXPxbPo+W5YthvQlrMpBBqPm0O8RkqqV4IrmZM93+uiID GBMVj86fX8PFEALpKgrMnQXdb1Z4NrtCXEIkUrucxbrHZ0kAQhV53cDN7FH8lN8x/+Lp 20sCQQLG4NhxnZrWDVRXRW96SHspWPoScBOpYqbodmgUEe9Ppj1OL3UvCFZm/x2EM6I8 xqpQ== X-Gm-Message-State: AC+VfDyVkAWMPVu0IRpcDOPliTP+FOA6rRGKAoFpBJLauRevWVeIABNX apQs2DsIebH6opx4D/u9eAGz2V2jz781r5T+ps2Rjg== X-Received: by 2002:a1c:f418:0:b0:3f1:6f52:74d with SMTP id z24-20020a1cf418000000b003f16f52074dmr11996589wma.39.1683733949622; Wed, 10 May 2023 08:52:29 -0700 (PDT) Received: from stoup.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id n23-20020a7bc5d7000000b003ee74c25f12sm23157946wmk.35.2023.05.10.08.52.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 May 2023 08:52:29 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: philmd@linaro.org, Thomas Huth Subject: [PATCH v3 4/5] disas: Move softmmu specific code to separate file Date: Wed, 10 May 2023 16:52:25 +0100 Message-Id: <20230510155226.647756-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230510155226.647756-1-richard.henderson@linaro.org> References: <20230510155226.647756-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=richard.henderson@linaro.org; helo=mail-wm1-x335.google.com 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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Thomas Huth We'd like to move disas.c into the common code source set, where CONFIG_USER_ONLY is not available anymore. So we have to move the related code into a separate file instead. Signed-off-by: Thomas Huth Message-Id: <20230508133745.109463-2-thuth@redhat.com> [rth: Type change done in a separate patch] Signed-off-by: Richard Henderson --- disas/disas-internal.h | 21 ++++++++++++ disas/disas-mon.c | 65 ++++++++++++++++++++++++++++++++++++ disas/disas.c | 76 ++++-------------------------------------- disas/meson.build | 1 + 4 files changed, 93 insertions(+), 70 deletions(-) create mode 100644 disas/disas-internal.h create mode 100644 disas/disas-mon.c diff --git a/disas/disas-internal.h b/disas/disas-internal.h new file mode 100644 index 0000000000..84a01f126f --- /dev/null +++ b/disas/disas-internal.h @@ -0,0 +1,21 @@ +/* + * Definitions used internally in the disassembly code + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#ifndef DISAS_INTERNAL_H +#define DISAS_INTERNAL_H + +#include "disas/dis-asm.h" + +typedef struct CPUDebug { + struct disassemble_info info; + CPUState *cpu; +} CPUDebug; + +void disas_initialize_debug_target(CPUDebug *s, CPUState *cpu); +int disas_gstring_printf(FILE *stream, const char *fmt, ...) + G_GNUC_PRINTF(2, 3); + +#endif diff --git a/disas/disas-mon.c b/disas/disas-mon.c new file mode 100644 index 0000000000..48ac492c6c --- /dev/null +++ b/disas/disas-mon.c @@ -0,0 +1,65 @@ +/* + * Functions related to disassembly from the monitor + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "disas-internal.h" +#include "disas/disas.h" +#include "exec/memory.h" +#include "hw/core/cpu.h" +#include "monitor/monitor.h" + +static int +physical_read_memory(bfd_vma memaddr, bfd_byte *myaddr, int length, + struct disassemble_info *info) +{ + CPUDebug *s = container_of(info, CPUDebug, info); + MemTxResult res; + + res = address_space_read(s->cpu->as, memaddr, MEMTXATTRS_UNSPECIFIED, + myaddr, length); + return res == MEMTX_OK ? 0 : EIO; +} + +/* Disassembler for the monitor. */ +void monitor_disas(Monitor *mon, CPUState *cpu, uint64_t pc, + int nb_insn, bool is_physical) +{ + int count, i; + CPUDebug s; + g_autoptr(GString) ds = g_string_new(""); + + disas_initialize_debug_target(&s, cpu); + s.info.fprintf_func = disas_gstring_printf; + s.info.stream = (FILE *)ds; /* abuse this slot */ + + if (is_physical) { + s.info.read_memory_func = physical_read_memory; + } + s.info.buffer_vma = pc; + + if (s.info.cap_arch >= 0 && cap_disas_monitor(&s.info, pc, nb_insn)) { + monitor_puts(mon, ds->str); + return; + } + + if (!s.info.print_insn) { + monitor_printf(mon, "0x%08" PRIx64 + ": Asm output not supported on this arch\n", pc); + return; + } + + for (i = 0; i < nb_insn; i++) { + g_string_append_printf(ds, "0x%08" PRIx64 ": ", pc); + count = s.info.print_insn(pc, &s.info); + g_string_append_c(ds, '\n'); + if (count < 0) { + break; + } + pc += count; + } + + monitor_puts(mon, ds->str); +} diff --git a/disas/disas.c b/disas/disas.c index a709831e8d..5e7401bb6f 100644 --- a/disas/disas.c +++ b/disas/disas.c @@ -1,6 +1,6 @@ /* General "disassemble this chunk" code. Used for debugging. */ #include "qemu/osdep.h" -#include "disas/dis-asm.h" +#include "disas/disas-internal.h" #include "elf.h" #include "qemu/qemu-print.h" #include "disas/disas.h" @@ -8,11 +8,6 @@ #include "hw/core/cpu.h" #include "exec/memory.h" -typedef struct CPUDebug { - struct disassemble_info info; - CPUState *cpu; -} CPUDebug; - /* Filled in by elfload.c. Simplistic, but will do for now. */ struct syminfo *syminfos = NULL; @@ -120,7 +115,7 @@ static void initialize_debug(CPUDebug *s) s->info.symbol_at_address_func = symbol_at_address; } -static void initialize_debug_target(CPUDebug *s, CPUState *cpu) +void disas_initialize_debug_target(CPUDebug *s, CPUState *cpu) { initialize_debug(s); @@ -211,7 +206,7 @@ void target_disas(FILE *out, CPUState *cpu, uint64_t code, size_t size) int count; CPUDebug s; - initialize_debug_target(&s, cpu); + disas_initialize_debug_target(&s, cpu); s.info.fprintf_func = fprintf; s.info.stream = out; s.info.buffer_vma = code; @@ -241,8 +236,7 @@ void target_disas(FILE *out, CPUState *cpu, uint64_t code, size_t size) } } -static int G_GNUC_PRINTF(2, 3) -gstring_printf(FILE *stream, const char *fmt, ...) +int disas_gstring_printf(FILE *stream, const char *fmt, ...) { /* We abuse the FILE parameter to pass a GString. */ GString *s = (GString *)stream; @@ -272,8 +266,8 @@ char *plugin_disas(CPUState *cpu, uint64_t addr, size_t size) CPUDebug s; GString *ds = g_string_new(NULL); - initialize_debug_target(&s, cpu); - s.info.fprintf_func = gstring_printf; + disas_initialize_debug_target(&s, cpu); + s.info.fprintf_func = disas_gstring_printf; s.info.stream = (FILE *)ds; /* abuse this slot */ s.info.buffer_vma = addr; s.info.buffer_length = size; @@ -338,61 +332,3 @@ const char *lookup_symbol(uint64_t orig_addr) return symbol; } - -#if !defined(CONFIG_USER_ONLY) - -#include "monitor/monitor.h" - -static int -physical_read_memory(bfd_vma memaddr, bfd_byte *myaddr, int length, - struct disassemble_info *info) -{ - CPUDebug *s = container_of(info, CPUDebug, info); - MemTxResult res; - - res = address_space_read(s->cpu->as, memaddr, MEMTXATTRS_UNSPECIFIED, - myaddr, length); - return res == MEMTX_OK ? 0 : EIO; -} - -/* Disassembler for the monitor. */ -void monitor_disas(Monitor *mon, CPUState *cpu, uint64_t pc, - int nb_insn, bool is_physical) -{ - int count, i; - CPUDebug s; - g_autoptr(GString) ds = g_string_new(""); - - initialize_debug_target(&s, cpu); - s.info.fprintf_func = gstring_printf; - s.info.stream = (FILE *)ds; /* abuse this slot */ - - if (is_physical) { - s.info.read_memory_func = physical_read_memory; - } - s.info.buffer_vma = pc; - - if (s.info.cap_arch >= 0 && cap_disas_monitor(&s.info, pc, nb_insn)) { - monitor_puts(mon, ds->str); - return; - } - - if (!s.info.print_insn) { - monitor_printf(mon, "0x%08" PRIx64 - ": Asm output not supported on this arch\n", pc); - return; - } - - for (i = 0; i < nb_insn; i++) { - g_string_append_printf(ds, "0x%08" PRIx64 ": ", pc); - count = s.info.print_insn(pc, &s.info); - g_string_append_c(ds, '\n'); - if (count < 0) { - break; - } - pc += count; - } - - monitor_puts(mon, ds->str); -} -#endif diff --git a/disas/meson.build b/disas/meson.build index cbf6315f25..f40230c58f 100644 --- a/disas/meson.build +++ b/disas/meson.build @@ -12,4 +12,5 @@ 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'), capstone]) +softmmu_ss.add(files('disas-mon.c')) specific_ss.add(files('disas.c'), capstone) From patchwork Wed May 10 15:52:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 680526 Delivered-To: patch@linaro.org Received: by 2002:a5d:4a41:0:0:0:0:0 with SMTP id v1csp2922095wrs; Wed, 10 May 2023 08:53:53 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6JQQTvO/ogDxpa2vKIfY3TXnh6AL4iS4DBNzA2Eh6+vkbGIj1+m03gGezvz88j6D7MgPuo X-Received: by 2002:ac8:598a:0:b0:3e6:457f:9ec7 with SMTP id e10-20020ac8598a000000b003e6457f9ec7mr29234017qte.19.1683734033067; Wed, 10 May 2023 08:53:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683734033; cv=none; d=google.com; s=arc-20160816; b=Lw4EDRCxClfzUDbL3z3d1zTBbzn/AUc04tPklmK4y03TlaLzOEFMJs0a1rd2u50e9L OTy1vaXuttYCylxEvk5uzhI0eeWFJCxz7LOmccssQI8wrdKjHh8Gb00ImLTWBn/NHguC ApHhcBAdj7yxmRj5JxMe0cw9fN/JuAtEnkMPQwrRFfDUxahYaqDS6KuRTxvRze1xdy/a fCwRLkDoO4RfZxapQxYQTkKmuFnrP3oPF207GOG2xWpp2EXKU0BYT8eyD9rys8Rhl2cu EH1ytTfd5RctUqJbHi03rj+m46BbIXalFgUxwkLTsG26BLWN7P3XrVGGddcXo3xi17q4 32DQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=s3KN+seF7jjUQ0aZUOoQd455lccivu+NPR8pleIjoaE=; b=fkcb5fh9AbhNsipv5+PBiDN3+Eekh1YZsrWmess1PygqsuDZnDo4A/YZbKgJOjIbxV xmuE5BCO32RfI7+snZH+oy/4JvON0iIgBQJKtM3FgN9WyvTSfAbxi4qgpZeRYG5CrYAy aFS1HiHA2k4ZSiRsZK5lTGvLMoNNLYa7mgzhLpy/p7ok7vvWWq4zvytfT/2cmt0fWlTr xe6ny0tGVIZYaITIfrX8hIhphT7IkmkRiunVSltcJzKZ01Pd3jTGwYTQ/LcHI30IsSDB qGozkbhdE3guBRzi57fhHWwySpffwa/zFd1JiNQ0Cv6h7rCp+6z/6eGprVY+VH37gO1q Igvw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=RH3M9dg3; 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=pass (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 x7-20020a05622a000700b003f396cc51bfsi1907673qtw.780.2023.05.10.08.53.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 10 May 2023 08:53:53 -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=pass header.i=@linaro.org header.s=google header.b=RH3M9dg3; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pwm7I-00031g-IN; Wed, 10 May 2023 11:52:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pwm7H-000303-AT for qemu-devel@nongnu.org; Wed, 10 May 2023 11:52:35 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pwm7F-0004Um-Ne for qemu-devel@nongnu.org; Wed, 10 May 2023 11:52:35 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-3f42711865eso24839265e9.0 for ; Wed, 10 May 2023 08:52:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1683733950; x=1686325950; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=s3KN+seF7jjUQ0aZUOoQd455lccivu+NPR8pleIjoaE=; b=RH3M9dg3HECxPDlQVK0HjX64IZREphg4UkGZZxBb+40mav5c+YNDlUDn/RNehXNp1b rwaRI3Uch+B4QRol22wzqpVe6Pv1KTmlaXSHCOLN8BEPGP6Rz75oWbEDzIvN8zAdpUB8 eJM1hQY26E31KZUjvtR73rCJlRaHPF8dW0olnxwB8r/8OuNUZjQSWYI4bT4dAZ8hUt9J 2ncBaN0O6vkA3sERG9tex9VEVqAL2+A6i63pFHGWmQwH3LfO3fRLzbf2hbIYVY3oexZb yop+T8mSzQ3bBkQ0QEWsgXEpKgh/foIZLPbM+AoWaCkU4Pxr1uNnrDzDqMNtEoHI+Duv D3tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683733950; x=1686325950; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=s3KN+seF7jjUQ0aZUOoQd455lccivu+NPR8pleIjoaE=; b=lKaxOb1bUbl/A9J1LEjuKLBHXhhdhFbavhYUae44oSO+oSzAv8ZCjmJ7KpzkTjL2RY GeD2+d8NIcQf354XB7LwRDLAb8qzjfb+nOpvetpMVUn+bykIHG1yA6LjTwoa2sAHFz1q bsxwdIkiG3Zk42ZGyC/yySIesaIfYVEEtoMO/VWTsUApEvbC56O3cvlA915YFTF5/o+D T5aMS+Z4pIVNO5vih12A1eY9yuObs6b5pYfKx6aWpVVmNq9Kq2MDYiv+twJNiLnZQ/2C iXQnvnuSVy3tpyCwArss1OQ6/z1pL2c1agafxwj8o33XFwp3Qq+xAqpMHYwrzt3ssXb7 gTOA== X-Gm-Message-State: AC+VfDzh4yjcI7lDBluWGzBFA2AiovWcZdi8Tnf2epSpG/IEyKBi4shJ vFXk2VDHojpm/b1vDC1PJrj055w0uXqRTJf+qkbzhQ== X-Received: by 2002:a05:600c:b4b:b0:3f4:2897:4eb7 with SMTP id k11-20020a05600c0b4b00b003f428974eb7mr6060581wmr.38.1683733950113; Wed, 10 May 2023 08:52:30 -0700 (PDT) Received: from stoup.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id n23-20020a7bc5d7000000b003ee74c25f12sm23157946wmk.35.2023.05.10.08.52.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 May 2023 08:52:29 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: philmd@linaro.org, Thomas Huth Subject: [PATCH v3 5/5] disas: Move disas.c into the target-independent source set Date: Wed, 10 May 2023 16:52:26 +0100 Message-Id: <20230510155226.647756-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230510155226.647756-1-richard.henderson@linaro.org> References: <20230510155226.647756-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=richard.henderson@linaro.org; helo=mail-wm1-x331.google.com 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_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Thomas Huth By using target_words_bigendian() instead of an ifdef, we can build this code once. Signed-off-by: Thomas Huth Message-Id: <20230508133745.109463-3-thuth@redhat.com> [rth: Type change done in a separate patch] Signed-off-by: Richard Henderson --- disas/disas.c | 10 +++++----- disas/meson.build | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/disas/disas.c b/disas/disas.c index 5e7401bb6f..954b385a82 100644 --- a/disas/disas.c +++ b/disas/disas.c @@ -122,11 +122,11 @@ void disas_initialize_debug_target(CPUDebug *s, CPUState *cpu) s->cpu = cpu; s->info.read_memory_func = target_read_memory; s->info.print_address_func = print_address; -#if TARGET_BIG_ENDIAN - s->info.endian = BFD_ENDIAN_BIG; -#else - s->info.endian = BFD_ENDIAN_LITTLE; -#endif + if (target_words_bigendian()) { + s->info.endian = BFD_ENDIAN_BIG; + } else { + s->info.endian = BFD_ENDIAN_LITTLE; + } CPUClass *cc = CPU_GET_CLASS(cpu); if (cc->disas_set_info) { diff --git a/disas/meson.build b/disas/meson.build index f40230c58f..832727e4b3 100644 --- a/disas/meson.build +++ b/disas/meson.build @@ -11,6 +11,7 @@ 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'), capstone]) +common_ss.add(files('disas.c')) softmmu_ss.add(files('disas-mon.c')) -specific_ss.add(files('disas.c'), capstone) +specific_ss.add(capstone)