From patchwork Thu Mar 28 23:03:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 161351 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp1333674jan; Thu, 28 Mar 2019 16:33:10 -0700 (PDT) X-Google-Smtp-Source: APXvYqxsXaLbNwD0O6Y8Cl5j5oR/EpP3qDhuoEDlqr7cTWPSHmSoRdQkIskXY0qVWzAFXDeJY4BF X-Received: by 2002:a24:1d0:: with SMTP id 199mr1983912itk.41.1553815990699; Thu, 28 Mar 2019 16:33:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553815990; cv=none; d=google.com; s=arc-20160816; b=Wmc1TDzVxgd/TzF4GPeQU2CGMf918J9H+awgVmc7xC8XMaH1J8rcwD58RupLu/kXsp byJgtjhL3HXSeMlor8XdQ3HRDdRbptFIllbrh6uxYuU5Ynb57ppBAIz33ES2O15WcOQH EX1owduEPT6lzaaX2MRKiD3iWxb10ZD87WKVhJXqdqr6hTpTb0kfKSBnmgikMovjqrOr //GXmMf0tfh0HBS7TDAIQTdFDz/vCaZlbTDODyZ5Q6IWOwP0Q1JLfC6ubflik4EnYdSC H8C7Qz9Lr0ifqL+WjEtuPDSZdECm5d1LGKnRJgZ+qTd69whZZo+rZ+wMRVRTyzlvio2x 9PGA== 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:subject:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=1e/h8UAoyXk8Gc1Dd2PkX0rd4s1I9rXiDi0H1BIjM2Y=; b=gr6p7bP/4OjQT8ZYMjIHHHWf2/7Hl54DmeVqy7YZOHDeKAjy7mX8KbstYxyqX6pGei 2+RpKU2cahWOlgA4Z57Y8/KnwrRjkVEci980nhknCdDHL2NOEB7nHpIWS3iun9HTHCoT PwT9bjI1TcV3NlZS7M30QEVq4nCUnD1Mk0JaV6xBkifGr00NLmDh6EI7R8uYqXlrzWI3 ++T1d5LRKQpyJjAPTh5rSDAamB7gC5oHYle1LFe+Oa0Skbaxo0XeX5pFRyI7St6HimTu 7HhQ+l62+RQKidAdmwjUAbYck67M3F05AZfFLn8wqo3pHxvn/i2gdIAifEFiJojBD59L GBFA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=w0dGx2iK; 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 t4si264617ioi.124.2019.03.28.16.33.10 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 28 Mar 2019 16:33: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=fail header.i=@linaro.org header.s=google header.b=w0dGx2iK; 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 ([127.0.0.1]:43345 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h9eWD-0004zO-VG for patch@linaro.org; Thu, 28 Mar 2019 19:33:10 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42458) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h9eKk-0001my-4M for qemu-devel@nongnu.org; Thu, 28 Mar 2019 19:21:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h9e5F-0003Lj-4M for qemu-devel@nongnu.org; Thu, 28 Mar 2019 19:05:18 -0400 Received: from mail-pf1-x443.google.com ([2607:f8b0:4864:20::443]:43674) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h9e5E-0003Cn-P0 for qemu-devel@nongnu.org; Thu, 28 Mar 2019 19:05:17 -0400 Received: by mail-pf1-x443.google.com with SMTP id c8so72624pfd.10 for ; Thu, 28 Mar 2019 16:04:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references; bh=1e/h8UAoyXk8Gc1Dd2PkX0rd4s1I9rXiDi0H1BIjM2Y=; b=w0dGx2iKOysy1fYWiQ980bUcLixh47s0az3PvjHA2M+IDZ6MZfmwItKkuXLrg+dpjP BcqGSJTbtr37P4DHxGfYepN8rLAUwMOROtVOoTf7j0LeZbXuGPBqGBZ6mA+FHTRBaAFC DzK45ryVUhKP2Z3TLINgHEUirF+gJI/II0tcGfp0iBt9FJgyqtAt1M5C9+MV2/SbisLm Wm/EUX6Tg4MWtlIUI1/RqYKviJ7ed0VRrCc0XPi4Bi4VFHxBPMR2FB1hbZWoVbNs8xuZ p4FOZysqR741wP+joVMeBFHNz+cJ9NsYR/9h3Pt90VhiPC/8+btbQAG8DmFT+6HsCNcW uuQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=1e/h8UAoyXk8Gc1Dd2PkX0rd4s1I9rXiDi0H1BIjM2Y=; b=eoGcVwWBprkZDGEqbxYC59JALodJAUqzigE2p0xdGM1yv3+Y+UlHkGyWImRtA3MZa5 PqfKwTmqQEyE7dP/jkBTxQjz6KUZyA3B2c7ExKp0n24H1rGp8YMBy/kqZVIlDsAayk7i 6LdfE0EeTwdcCua9FYm3tRt1ASI+GF/ML5YMtl3aRLHk8VH/usqk8PHSG3koMvx0HcmZ vW1N52gr9cs/PQm9A+K3KLbWra84WGRQEEb3c5F2v2lsE5G3k2yRH1ARhZbdeYxHVvwE tYHL6uU2WQuAblC1daf7Rk5K50Bh+nBpK6mKXy2231dTLz+8pIYNc4JgS53M0XxnFs4Y DcWA== X-Gm-Message-State: APjAAAU+9mBu8vMuKYnZtEMUHAuNC1f9QSME9Oci/WI14Wd3Tx3jwzOL ibMq1f5b+V5/zYrE5GY4HM25qoIsswI= X-Received: by 2002:aa7:8ac8:: with SMTP id b8mr42464217pfd.87.1553814295697; Thu, 28 Mar 2019 16:04:55 -0700 (PDT) Received: from cloudburst.ASUS (cpe-66-75-72-255.hawaii.res.rr.com. [66.75.72.255]) by smtp.gmail.com with ESMTPSA id f1sm280911pgl.35.2019.03.28.16.04.54 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Mar 2019 16:04:54 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 28 Mar 2019 13:03:57 -1000 Message-Id: <20190328230404.12909-30-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190328230404.12909-1-richard.henderson@linaro.org> References: <20190328230404.12909-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::443 Subject: [Qemu-devel] [PATCH for-4.1 v2 29/36] cpu: Move ENV_OFFSET to exec/gen-icount.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 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" Now that we have ArchCPU, we can define this generically, in the one place that needs it. Signed-off-by: Richard Henderson --- include/exec/gen-icount.h | 2 ++ target/alpha/cpu.h | 1 - target/arm/cpu.h | 2 -- target/cris/cpu.h | 1 - target/hppa/cpu.h | 1 - target/i386/cpu.h | 1 - target/lm32/cpu.h | 1 - target/m68k/cpu.h | 1 - target/microblaze/cpu.h | 1 - target/mips/cpu.h | 1 - target/moxie/cpu.h | 1 - target/nios2/cpu.h | 1 - target/openrisc/cpu.h | 1 - target/ppc/cpu.h | 1 - target/riscv/cpu.h | 2 -- target/s390x/cpu.h | 1 - target/sh4/cpu.h | 1 - target/sparc/cpu.h | 1 - target/tilegx/cpu.h | 1 - target/tricore/cpu.h | 1 - target/unicore32/cpu.h | 1 - target/xtensa/cpu.h | 2 -- 22 files changed, 2 insertions(+), 24 deletions(-) -- 2.17.1 Reviewed-by: Peter Maydell diff --git a/include/exec/gen-icount.h b/include/exec/gen-icount.h index 24f7991781..9cfa6ccce5 100644 --- a/include/exec/gen-icount.h +++ b/include/exec/gen-icount.h @@ -5,6 +5,8 @@ /* Helpers for instruction counting code generation. */ +#define ENV_OFFSET offsetof(ArchCPU, env) + static TCGOp *icount_start_insn; static inline void gen_tb_start(TranslationBlock *tb) diff --git a/target/alpha/cpu.h b/target/alpha/cpu.h index e22518871a..93919bbaa2 100644 --- a/target/alpha/cpu.h +++ b/target/alpha/cpu.h @@ -273,7 +273,6 @@ struct AlphaCPU { QEMUTimer *alarm_timer; }; -#define ENV_OFFSET offsetof(AlphaCPU, env) #ifndef CONFIG_USER_ONLY extern const struct VMStateDescription vmstate_alpha_cpu; diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 3de68c5844..df0409a703 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -907,8 +907,6 @@ void arm_cpu_post_init(Object *obj); uint64_t arm_cpu_mp_affinity(int idx, uint8_t clustersz); -#define ENV_OFFSET offsetof(ARMCPU, env) - #ifndef CONFIG_USER_ONLY extern const struct VMStateDescription vmstate_arm_cpu; #endif diff --git a/target/cris/cpu.h b/target/cris/cpu.h index 6111dbb14c..b87a559137 100644 --- a/target/cris/cpu.h +++ b/target/cris/cpu.h @@ -183,7 +183,6 @@ struct CRISCPU { CPUCRISState env; }; -#define ENV_OFFSET offsetof(CRISCPU, env) #ifndef CONFIG_USER_ONLY extern const struct VMStateDescription vmstate_cris_cpu; diff --git a/target/hppa/cpu.h b/target/hppa/cpu.h index 1387066324..65986dacbf 100644 --- a/target/hppa/cpu.h +++ b/target/hppa/cpu.h @@ -222,7 +222,6 @@ struct HPPACPU { QEMUTimer *alarm_timer; }; -#define ENV_OFFSET offsetof(HPPACPU, env) typedef CPUHPPAState CPUArchState; typedef HPPACPU ArchCPU; diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 7ff5ab77c1..c5351bea7e 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -1477,7 +1477,6 @@ struct X86CPU { int32_t hv_max_vps; }; -#define ENV_OFFSET offsetof(X86CPU, env) #ifndef CONFIG_USER_ONLY extern struct VMStateDescription vmstate_x86_cpu; diff --git a/target/lm32/cpu.h b/target/lm32/cpu.h index 69beb16972..deb83153b3 100644 --- a/target/lm32/cpu.h +++ b/target/lm32/cpu.h @@ -195,7 +195,6 @@ struct LM32CPU { uint32_t features; }; -#define ENV_OFFSET offsetof(LM32CPU, env) #ifndef CONFIG_USER_ONLY extern const struct VMStateDescription vmstate_lm32_cpu; diff --git a/target/m68k/cpu.h b/target/m68k/cpu.h index eb3048914e..2b180cf18d 100644 --- a/target/m68k/cpu.h +++ b/target/m68k/cpu.h @@ -163,7 +163,6 @@ struct M68kCPU { CPUM68KState env; }; -#define ENV_OFFSET offsetof(M68kCPU, env) void m68k_cpu_do_interrupt(CPUState *cpu); bool m68k_cpu_exec_interrupt(CPUState *cpu, int int_req); diff --git a/target/microblaze/cpu.h b/target/microblaze/cpu.h index a9748d57ad..ff3abb61af 100644 --- a/target/microblaze/cpu.h +++ b/target/microblaze/cpu.h @@ -310,7 +310,6 @@ struct MicroBlazeCPU { CPUMBState env; }; -#define ENV_OFFSET offsetof(MicroBlazeCPU, env) void mb_cpu_do_interrupt(CPUState *cs); bool mb_cpu_exec_interrupt(CPUState *cs, int int_req); diff --git a/target/mips/cpu.h b/target/mips/cpu.h index 914cc26c21..49c226b587 100644 --- a/target/mips/cpu.h +++ b/target/mips/cpu.h @@ -1051,7 +1051,6 @@ struct MIPSCPU { CPUMIPSState env; }; -#define ENV_OFFSET offsetof(MIPSCPU, env) void mips_cpu_list (FILE *f, fprintf_function cpu_fprintf); diff --git a/target/moxie/cpu.h b/target/moxie/cpu.h index 71e7cf0f08..00b1486659 100644 --- a/target/moxie/cpu.h +++ b/target/moxie/cpu.h @@ -90,7 +90,6 @@ typedef struct MoxieCPU { CPUMoxieState env; } MoxieCPU; -#define ENV_OFFSET offsetof(MoxieCPU, env) void moxie_cpu_do_interrupt(CPUState *cs); void moxie_cpu_dump_state(CPUState *cpu, FILE *f, diff --git a/target/nios2/cpu.h b/target/nios2/cpu.h index 3fc27ead81..39a2471b18 100644 --- a/target/nios2/cpu.h +++ b/target/nios2/cpu.h @@ -193,7 +193,6 @@ typedef struct Nios2CPU { uint32_t fast_tlb_miss_addr; } Nios2CPU; -#define ENV_OFFSET offsetof(Nios2CPU, env) void nios2_tcg_init(void); void nios2_cpu_do_interrupt(CPUState *cs); diff --git a/target/openrisc/cpu.h b/target/openrisc/cpu.h index 853cf633e7..ad2118b599 100644 --- a/target/openrisc/cpu.h +++ b/target/openrisc/cpu.h @@ -317,7 +317,6 @@ typedef struct OpenRISCCPU { } OpenRISCCPU; -#define ENV_OFFSET offsetof(OpenRISCCPU, env) void cpu_openrisc_list(FILE *f, fprintf_function cpu_fprintf); void openrisc_cpu_do_interrupt(CPUState *cpu); diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h index c3fe154979..038e2499ed 100644 --- a/target/ppc/cpu.h +++ b/target/ppc/cpu.h @@ -1191,7 +1191,6 @@ struct PowerPCCPU { int32_t mig_slb_nr; }; -#define ENV_OFFSET offsetof(PowerPCCPU, env) PowerPCCPUClass *ppc_cpu_class_by_pvr(uint32_t pvr); PowerPCCPUClass *ppc_cpu_class_by_pvr_mask(uint32_t pvr); diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index c18dd5eb24..9e71297ca7 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -229,8 +229,6 @@ extern const char * const riscv_fpr_regnames[]; extern const char * const riscv_excp_names[]; extern const char * const riscv_intr_names[]; -#define ENV_OFFSET offsetof(RISCVCPU, env) - void riscv_cpu_do_interrupt(CPUState *cpu); int riscv_cpu_gdb_read_register(CPUState *cpu, uint8_t *buf, int reg); int riscv_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg); diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h index 372d4c198f..3a6a5ada86 100644 --- a/target/s390x/cpu.h +++ b/target/s390x/cpu.h @@ -163,7 +163,6 @@ struct S390CPU { uint32_t irqstate_saved_size; }; -#define ENV_OFFSET offsetof(S390CPU, env) #ifndef CONFIG_USER_ONLY extern const struct VMStateDescription vmstate_s390_cpu; diff --git a/target/sh4/cpu.h b/target/sh4/cpu.h index 1f94e7bf7b..02269c09b8 100644 --- a/target/sh4/cpu.h +++ b/target/sh4/cpu.h @@ -207,7 +207,6 @@ struct SuperHCPU { CPUSH4State env; }; -#define ENV_OFFSET offsetof(SuperHCPU, env) void superh_cpu_do_interrupt(CPUState *cpu); bool superh_cpu_exec_interrupt(CPUState *cpu, int int_req); diff --git a/target/sparc/cpu.h b/target/sparc/cpu.h index bf6f63d029..02e40d381b 100644 --- a/target/sparc/cpu.h +++ b/target/sparc/cpu.h @@ -532,7 +532,6 @@ struct SPARCCPU { CPUSPARCState env; }; -#define ENV_OFFSET offsetof(SPARCCPU, env) #ifndef CONFIG_USER_ONLY extern const struct VMStateDescription vmstate_sparc_cpu; diff --git a/target/tilegx/cpu.h b/target/tilegx/cpu.h index 7f8fe7c513..643b7dbd17 100644 --- a/target/tilegx/cpu.h +++ b/target/tilegx/cpu.h @@ -138,7 +138,6 @@ typedef struct TileGXCPU { CPUTLGState env; } TileGXCPU; -#define ENV_OFFSET offsetof(TileGXCPU, env) /* TILE-Gx memory attributes */ #define MMU_USER_IDX 0 /* Current memory operation is in user mode */ diff --git a/target/tricore/cpu.h b/target/tricore/cpu.h index 9ea5060a87..9e60ef981b 100644 --- a/target/tricore/cpu.h +++ b/target/tricore/cpu.h @@ -208,7 +208,6 @@ struct TriCoreCPU { CPUTriCoreState env; }; -#define ENV_OFFSET offsetof(TriCoreCPU, env) hwaddr tricore_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr); void tricore_cpu_dump_state(CPUState *cpu, FILE *f, diff --git a/target/unicore32/cpu.h b/target/unicore32/cpu.h index 14c2d047fd..12b8268f7b 100644 --- a/target/unicore32/cpu.h +++ b/target/unicore32/cpu.h @@ -76,7 +76,6 @@ struct UniCore32CPU { CPUUniCore32State env; }; -#define ENV_OFFSET offsetof(UniCore32CPU, env) void uc32_cpu_do_interrupt(CPUState *cpu); bool uc32_cpu_exec_interrupt(CPUState *cpu, int int_req); diff --git a/target/xtensa/cpu.h b/target/xtensa/cpu.h index d5465c2853..6fddac3a2b 100644 --- a/target/xtensa/cpu.h +++ b/target/xtensa/cpu.h @@ -529,8 +529,6 @@ struct XtensaCPU { CPUXtensaState env; }; -#define ENV_OFFSET offsetof(XtensaCPU, env) - int xtensa_cpu_handle_mmu_fault(CPUState *cs, vaddr address, int rw, int size, int mmu_idx);