From patchwork Thu May 11 08:04:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 680872 Delivered-To: patch@linaro.org Received: by 2002:a5d:4a41:0:0:0:0:0 with SMTP id v1csp3267729wrs; Thu, 11 May 2023 01:12:45 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6PnWTQh4RpK1fEVsB3YnBIL0EbdhevyKJwaoxDw5YsKX8ikwxyIpZ0WIlZ15hlfEodFQr4 X-Received: by 2002:a05:622a:4a:b0:3f3:96a3:c763 with SMTP id y10-20020a05622a004a00b003f396a3c763mr13891385qtw.20.1683792765233; Thu, 11 May 2023 01:12:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683792765; cv=none; d=google.com; s=arc-20160816; b=JjriiJuTIwpsL8LxJ+HOxThGhOmmzsSUXSEOI/hzM2v/XXmjPzMW5ji7OY/C6ktpbN 5GethTey99opML30wUMhutsYIb7Rgz9VamQOdgI3kIpvWLLyuH03nLVv0+KpWEs9Ws36 qfmhdzmJ/wogQn1UnA0fKRmhwdQQGAUdT6hhh1QkCak/+VXwTenTwQ6fA2f1tLjVnGqU glhIQMwYOYl9bluEiYGGhPOPOAX16j23cRL+if/WZS0vpUcCsiyK+3AJo/+3KzpClKlh FIRiFejfIQr2oU3TDX5enY0/xjUdsWjLbFYgVm2UzHHjnGqnkv0o1lT5vazAjM9qNhOr uPPQ== 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=Hh23CcAHzAZeDiuALc/R+n3TikDVtA9YTdeEDvFpi4s=; b=Mhq7Z3Suc1bHfLeySsCswwbPZjnEW5RmQtA7vul4CUBKIdWAlgCtl3e5j+yLMX5cQZ ZQXdI8IwwHAk/zu6RCRqT9o/IeftskU9eWgeVSHAyHaXBekE2ttffsE50WMeY2eRa1eQ SIAnND4xW8N+IJCXZn2W028VvaTGxyc8V5aVxY/Kh0N1yXA84i14QEH4sajmJ47SRUbe WqKZjm5XLmiZ5b2ghbIzzFh7aZHUeZlGYXedWVjgxJjhu3rMIWq9lfGZ4oBBndfreCvk px6vkv4+YncFhtq7lTKGsM6bSSGwiheqX+JPDFpqOrawzQYJc9JY/15XMW8H/8rBOQLk KYhA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vTQiQjPa; 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 r15-20020a05620a03cf00b007590cbe71c9si473907qkm.551.2023.05.11.01.12.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 11 May 2023 01:12:45 -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=vTQiQjPa; 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 1px1Ib-0006PN-S5; Thu, 11 May 2023 04:05:17 -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 1px1IN-0006JK-FP for qemu-devel@nongnu.org; Thu, 11 May 2023 04:05:05 -0400 Received: from mail-ed1-x529.google.com ([2a00:1450:4864:20::529]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1px1IJ-0000wq-DC for qemu-devel@nongnu.org; Thu, 11 May 2023 04:05:02 -0400 Received: by mail-ed1-x529.google.com with SMTP id 4fb4d7f45d1cf-50bc570b4a3so15012100a12.1 for ; Thu, 11 May 2023 01:04:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1683792296; x=1686384296; 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=Hh23CcAHzAZeDiuALc/R+n3TikDVtA9YTdeEDvFpi4s=; b=vTQiQjPa8bAWeHlq/2NR/ODtEJKOse7ozhLthoGsTlMrsiiQ/eq23npixi3X+0LfAh PyFlpQ5dlaVk+RkpvpEY4Puc+bwf2NSm0sFiS0U5mRM2oYKfWH9eCgHJOiExkVs1A2ir Gfk1yAizLqoHJo66eTbkyblFEcdWp73iTjY6RWvHab/oGz27Rj8EcKDl//xVwe6Fy73T CK5dk6ZlxriR05f+FUFlaC4Dx6CBTslgaXCU9j8o2bflJDDY8M5sXgF5zvJBhUp7oRNb RWgJ9KuXI0ljKZWiFn7w3s7OchHpq7NruFii9ixxtDMFw/Iq8l2TOTutOCB751wKkCZe uNUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683792296; x=1686384296; 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=Hh23CcAHzAZeDiuALc/R+n3TikDVtA9YTdeEDvFpi4s=; b=AMMHRVruhHqAwpUC0JMaE6K1k3pnWVTFgdkPs79F3WvdfgSM+nGBXaCzukzT7Jitt6 1o6L96IIt36ttTs3an7kl5osjYnszkGA2KJgfZYUdAQj5mxxYGSbF4A5Lhyplbt7dHqP vekzmm+KiYz5OzC4lIBhgXUgy1PSwNYEI8QwJYYpyw3l7bx4Lspzpt1BdJN9OPPZWD/H 18DGTQ/B31HhALZn47y1JJita8VXI9T+5305LY7NR+Ij8dJKXla/BpYLe2OrhTkmv8S6 2HE0qZIdwuLyfch47zrapwy/ksiit54U6Ek6dKplkT9gZAyjByJMk60BoagQm6XMGzxB 7CwQ== X-Gm-Message-State: AC+VfDz/8ASgnvBYfsKfMRC5Fj3d74SrOv0PvRZ5DTZLqbtnUFnC2q2Q mS3raKQDqo+3zr5i2ljUlEl6JGwFIieP5iS2bXpuLA== X-Received: by 2002:aa7:d1d0:0:b0:50b:d731:9fa8 with SMTP id g16-20020aa7d1d0000000b0050bd7319fa8mr15455132edp.28.1683792296600; Thu, 11 May 2023 01:04:56 -0700 (PDT) Received: from stoup.. ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id i12-20020aa7c70c000000b0050bd7267a5csm2662095edq.58.2023.05.11.01.04.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 May 2023 01:04:56 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Thomas Huth Subject: [PULL 06/53] disas: Remove target-specific headers Date: Thu, 11 May 2023 09:04:03 +0100 Message-Id: <20230511080450.860923-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230511080450.860923-1-richard.henderson@linaro.org> References: <20230511080450.860923-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::529; envelope-from=richard.henderson@linaro.org; helo=mail-ed1-x529.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 aac7cf3b03..a06954254b 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;