From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 13DF0CDB47E for ; Fri, 13 Oct 2023 13:59:34 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qrIh2-00059w-1D; Fri, 13 Oct 2023 09:59:08 -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 1qrIgz-00057V-Ig for qemu-devel@nongnu.org; Fri, 13 Oct 2023 09:59:06 -0400 Received: from mail-ed1-x531.google.com ([2a00:1450:4864:20::531]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qrIgs-0001WO-Pm for qemu-devel@nongnu.org; Fri, 13 Oct 2023 09:59:05 -0400 Received: by mail-ed1-x531.google.com with SMTP id 4fb4d7f45d1cf-53e07db272cso3143945a12.3 for ; Fri, 13 Oct 2023 06:58:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1697205535; x=1697810335; darn=nongnu.org; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=mFZ8Hez1D/92l69JU6rcHrVRA5cuRUZMYxrubsP2WRo=; b=C6E4bL7ufIhA70NQXh48PqBPpvbD7Cp9pV+QpWi096Dr05yCVhxoUdH09W/ahemfN1 r+HBcXuFX2C3wfH4zirejbjnubBMHngm44VTU80d9pRh+nWKh+8wTIHq8LYjK8RdqxEf S5l+H5otzL4YhZVPAURgG8UAN2rZphWQyKvyZDZoy/gJj2/doKspUrY4kn2C84APi9kl QcknnOuPdxH+6afwRXHPdIA4GbWz+1rqLJxqtHIozT70vHzHi3iArmN4TN1FILncJy05 YxSHx7HFZ8Sbjox5k8kObgTBeLtqhu0yCEz3y26sat4tgs0rykjnPewtVSICLg3VPuqL iMOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697205535; x=1697810335; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=mFZ8Hez1D/92l69JU6rcHrVRA5cuRUZMYxrubsP2WRo=; b=rzmlQbdOuh2pJ4ypO+1kwGZR1LgG9wNctbX8u2yb0visBu+kIk0DEg5Vg0p8oGlKxx FMf+qpnW8jalF4lW9QKay7ElXEZHkjtZfuM6uXe1AqKN9KMbhcovy1U3HM89/iXltaY5 JK5SfVWZ0OOptP/hFvlWn7j5AtRw+94Osc+MEq+2aT+YMt3El1OSDY5mZmtlc5pryU+8 retCbgO6WXNNE6zZhaIXD5Yew8fNVQ1OtNTCcOS1FtHba/9HLPzQKnCZQI5J2BOX1PI4 F2BCk0MK9fWVtQm0goGlSpXR39mZ7LhFBT1XdWwGrTEx9eM6L7t5i14CBerfHwlrmLXa LZRA== X-Gm-Message-State: AOJu0YwwQ+nmgfn19A77CtG5yl2Npi5bR0swG7LujDawUHcZ35Hx/+5u eScWQGU8lYbtgsei23i/zgfeMHgDZLrMq/OuJoE= X-Google-Smtp-Source: AGHT+IEcuzKPvPOB7Pp7e5wLYdRjtM+jB+eFujYn8zlMUXQOyBpARjvdHsHtRFE9Wwl108qeUHrbtw== X-Received: by 2002:a05:6402:5207:b0:53e:332e:3e03 with SMTP id s7-20020a056402520700b0053e332e3e03mr2539277edd.4.1697205534859; Fri, 13 Oct 2023 06:58:54 -0700 (PDT) Received: from [192.168.69.115] ([176.172.118.168]) by smtp.gmail.com with ESMTPSA id t11-20020a056402240b00b0053dae8a5e1csm4005820eda.8.2023.10.13.06.58.54 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 13 Oct 2023 06:58:54 -0700 (PDT) Message-ID: Date: Fri, 13 Oct 2023 15:58:53 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.15.1 Subject: Re: [PATCH 10/18] target/riscv: Inline target specific TYPE_RISCV_CPU_BASE definition Content-Language: en-US To: Richard Henderson , qemu-devel@nongnu.org References: <20231010092901.99189-1-philmd@linaro.org> <20231010092901.99189-11-philmd@linaro.org> From: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::531; envelope-from=philmd@linaro.org; helo=mail-ed1-x531.google.com X-Spam_score_int: -53 X-Spam_score: -5.4 X-Spam_bar: ----- X-Spam_report: (-5.4 / 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, NICE_REPLY_A=-3.339, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On 13/10/23 06:13, Richard Henderson wrote: > On 10/10/23 02:28, Philippe Mathieu-Daudé wrote: >> TYPE_RISCV_CPU_BASE depends on the TARGET_RISCV32/TARGET_RISCV64 >> definitions which are target specific. Such target specific >> definition taints "cpu-qom.h". >> >> Since "cpu-qom.h" must be target agnostic, remove its target >> specific definition uses by inlining TYPE_RISCV_CPU_BASE in the >> two machines using it. >> >> "target/riscv/cpu-qom.h" is now fully target agnostic. >> >> Signed-off-by: Philippe Mathieu-Daudé >> --- >>   target/riscv/cpu-qom.h | 8 +------- >>   hw/riscv/spike.c       | 8 +++++++- >>   hw/riscv/virt.c        | 8 +++++++- >>   3 files changed, 15 insertions(+), 9 deletions(-) >> @@ -43,12 +43,6 @@ >>   #define TYPE_RISCV_CPU_VEYRON_V1 >> RISCV_CPU_TYPE_NAME("veyron-v1") >>   #define TYPE_RISCV_CPU_HOST             RISCV_CPU_TYPE_NAME("host") >> -#if defined(TARGET_RISCV32) >> -# define TYPE_RISCV_CPU_BASE            TYPE_RISCV_CPU_BASE32 >> -#elif defined(TARGET_RISCV64) >> -# define TYPE_RISCV_CPU_BASE            TYPE_RISCV_CPU_BASE64 >> -#endif > > Move to cpu.h (or elsewhere) instead of replicating in two hw/ files? Yes, better.