From patchwork Thu Mar 28 23:03:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 161367 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp1343832jan; Thu, 28 Mar 2019 16:46:37 -0700 (PDT) X-Google-Smtp-Source: APXvYqyK5NLeWLNY3UETCi0cNuAjCnkWd5gRf6LefkpsJm5zCS5pqNI9TRXEAtItK02A4VK7i09P X-Received: by 2002:a02:c9:: with SMTP id 192mr9520340jaa.129.1553816797388; Thu, 28 Mar 2019 16:46:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553816797; cv=none; d=google.com; s=arc-20160816; b=DEPBTL9lzGyBzU8NYDHFslRJqKhQMC0nTiOilXPXFgLOCBjupnBFJI6rEh344WMtRA /izW1jQ4aOkUeZGTARJqS591zTY/yUqM1AnlGqaPnCgAC/ouLBbaWMFctxtDJpx9ExC/ BGotURYMhOJ7JnI8c0/Guo8zLQkReZwpq34vy8IXXivDBiOooEMVgokOeRCMHaL0jOwd gdlA1OpJDLZ5fg/WytRpqBRlYx8AdTrJPjIIHgXXXN1AHEdDXgRmTYM7ZRskVAUH+zEP BcLXttnHps9wF0u2SWVQyclbxh33MgvkrbN+vdAeovmq4DIBp8dfZTtO5cQOE9WiE2W7 DWiQ== 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=4kjCM+WYwaTFQ5URGOtYTlnBJGBwP1nMPIavfvdPsWo=; b=MA48s5lbH9bxZtq5VvTXybpp6k+DaJ7IpuA9mY+B8CvRqxvQsKX1pGh1gKEUEhaMQ4 WCjVIRKZkp5gaJQ4zJgBAIsIE8/fR/JTbzHiBatPLthgSfoB52KzBOBLA49KRLCR4lnR LwIEly4XkpGonMqHnYc3dppXtxRzL/0nKyjMsfKHlkXiwa64nor3pvP6mCU5z//7ndds govEcdftqYrXfvdX3/Fc99YyXEZ7hnzKL5DH5N1QxP6JXeFzkDiD6kK6jZg9mFSyah0+ 8kZR1BL3d48QNlx0eqdB5V/ySuXDYzmfXGIAtMAN5ShDZxwaIm1w+mz5ftwzfL44dvnf GtGQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=t2ScLIdk; 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 f192si210095itc.125.2019.03.28.16.46.37 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 28 Mar 2019 16:46:37 -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=t2ScLIdk; 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]:43572 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h9ejE-0008Rk-O7 for patch@linaro.org; Thu, 28 Mar 2019 19:46:36 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42735) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h9eKv-000226-Ut for qemu-devel@nongnu.org; Thu, 28 Mar 2019 19:21:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h9e4L-0002yJ-Ds for qemu-devel@nongnu.org; Thu, 28 Mar 2019 19:04:22 -0400 Received: from mail-pf1-x429.google.com ([2607:f8b0:4864:20::429]:34402) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h9e4K-0002wo-Kk for qemu-devel@nongnu.org; Thu, 28 Mar 2019 19:04:20 -0400 Received: by mail-pf1-x429.google.com with SMTP id b3so91229pfd.1 for ; Thu, 28 Mar 2019 16:04:18 -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=4kjCM+WYwaTFQ5URGOtYTlnBJGBwP1nMPIavfvdPsWo=; b=t2ScLIdkLdz6+VjnWYjZjHIHBrwQY1SsO4O67Fd18Jv9gzMnSwsV93UCI/J9FQi1Fv Ith22XpayVgbTrNcNg30ggfwxoTQcZTUHjoKzEuharnrGtpqu+pL5FqczBBHyZ4LegJU CzXhzxWjMjNvTjiomRTGycnhpGqlhMSdPVNgIjFx7rMb3fSUIsOy+gGGTaI38WFnaza4 nEQSlbCrR8WWGs+nX0xGAiCfT+9dWAYvNPhr8pESL5UXeUhTdgBZ0nKWLm40XUudVb63 GccnfAmgP0V53F+0S+SXjhzxCoZfTEJsD2k7HcPRyrI681IQQJI3u9pgfaBLcbRuWGNu hC3A== 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=4kjCM+WYwaTFQ5URGOtYTlnBJGBwP1nMPIavfvdPsWo=; b=SroXZDgKXXkVpVZ0kUQ1ErE0QyjYreH0Bo2bTIgvP0C94sKP/E92lnj8OXVZGsp2sW zUTL7kK3Fl6Ut0Gj+MiATMzSwlzpDbuMQ9eE76fqkligi7HZqeTr0VpO4vTQ3P7iaPv7 19o6VrI8bWJLnyWfuvt+IFdVwEMCLODDcotxLsR2le3qb0po2Qgxchq1IAhNxaK6KJFX +mEx5eLYN7AvuJTZCPIMOmtvAwdNn9QQb/JBLrohgmKBZI92WyFXCyebaR6+yDjR+QC4 82skY4rMGGa6a8/0VTatu1V8ObkEQsidPsr1oHmdqw5z20oAWasXHRb9L9nKIFfBJy9W S38w== X-Gm-Message-State: APjAAAWkFhy5UlhOntCoayAsrJag0bPjcjMPjC2pNAcydl4dhXaQZ9k9 yqZSCf0iLmwyYWszu0iCPQJTV35ER9s= X-Received: by 2002:a63:c302:: with SMTP id c2mr15335957pgd.235.1553814257139; Thu, 28 Mar 2019 16:04:17 -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.15 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Mar 2019 16:04:16 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 28 Mar 2019 13:03:33 -1000 Message-Id: <20190328230404.12909-6-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::429 Subject: [Qemu-devel] [PATCH for-4.1 v2 05/36] cpu: Define ArchCPU 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" For all targets, do this just before including exec/cpu-all.h. Acked-by: Alistair Francis Signed-off-by: Richard Henderson --- target/alpha/cpu.h | 1 + target/arm/cpu.h | 1 + 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 | 1 + 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 | 1 + 21 files changed, 21 insertions(+) -- 2.17.1 Reviewed-by: Peter Maydell diff --git a/target/alpha/cpu.h b/target/alpha/cpu.h index fac622aa02..6629b869d2 100644 --- a/target/alpha/cpu.h +++ b/target/alpha/cpu.h @@ -301,6 +301,7 @@ void alpha_cpu_do_unaligned_access(CPUState *cpu, vaddr addr, #define cpu_signal_handler cpu_alpha_signal_handler typedef CPUAlphaState CPUArchState; +typedef AlphaCPU ArchCPU; #include "exec/cpu-all.h" diff --git a/target/arm/cpu.h b/target/arm/cpu.h index e043fd3f97..30776ce15f 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -3044,6 +3044,7 @@ static inline bool arm_cpu_data_is_big_endian(CPUARMState *env) } typedef CPUARMState CPUArchState; +typedef ARMCPU ArchCPU; #include "exec/cpu-all.h" diff --git a/target/cris/cpu.h b/target/cris/cpu.h index 95662c36b2..bcd17bf88b 100644 --- a/target/cris/cpu.h +++ b/target/cris/cpu.h @@ -285,6 +285,7 @@ int cris_cpu_handle_mmu_fault(CPUState *cpu, vaddr address, int size, int rw, #define SFR_RW_MM_TLB_HI env->pregs[PR_SRS]][6 typedef CPUCRISState CPUArchState; +typedef CRISCPU ArchCPU; #include "exec/cpu-all.h" diff --git a/target/hppa/cpu.h b/target/hppa/cpu.h index 7c1d1e0a0e..f90b11dd0b 100644 --- a/target/hppa/cpu.h +++ b/target/hppa/cpu.h @@ -231,6 +231,7 @@ static inline HPPACPU *hppa_env_get_cpu(CPUHPPAState *env) #define ENV_OFFSET offsetof(HPPACPU, env) typedef CPUHPPAState CPUArchState; +typedef HPPACPU ArchCPU; #include "exec/cpu-all.h" diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 84ca69ea1a..bb1464d451 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -1750,6 +1750,7 @@ static inline target_long lshift(target_long x, int n) void tcg_x86_init(void); typedef CPUX86State CPUArchState; +typedef X86CPU ArchCPU; #include "exec/cpu-all.h" #include "svm.h" diff --git a/target/lm32/cpu.h b/target/lm32/cpu.h index 5b24cfcc1f..5eef4ccfc5 100644 --- a/target/lm32/cpu.h +++ b/target/lm32/cpu.h @@ -257,6 +257,7 @@ int lm32_cpu_handle_mmu_fault(CPUState *cpu, vaddr address, int size, int rw, int mmu_idx); typedef CPULM32State CPUArchState; +typedef LM32CPU ArchCPU; #include "exec/cpu-all.h" diff --git a/target/m68k/cpu.h b/target/m68k/cpu.h index 48c051c7d2..5db18909cc 100644 --- a/target/m68k/cpu.h +++ b/target/m68k/cpu.h @@ -536,6 +536,7 @@ void m68k_cpu_unassigned_access(CPUState *cs, hwaddr addr, unsigned size); typedef CPUM68KState CPUArchState; +typedef M68kCPU ArchCPU; #include "exec/cpu-all.h" diff --git a/target/microblaze/cpu.h b/target/microblaze/cpu.h index dddd58e165..d7c1846e49 100644 --- a/target/microblaze/cpu.h +++ b/target/microblaze/cpu.h @@ -366,6 +366,7 @@ int mb_cpu_handle_mmu_fault(CPUState *cpu, vaddr address, int size, int rw, int mmu_idx); typedef CPUMBState CPUArchState; +typedef MicroBlazeCPU ArchCPU; #include "exec/cpu-all.h" diff --git a/target/mips/cpu.h b/target/mips/cpu.h index 608ae23289..8c5a40b5ad 100644 --- a/target/mips/cpu.h +++ b/target/mips/cpu.h @@ -1091,6 +1091,7 @@ static inline int cpu_mmu_index (CPUMIPSState *env, bool ifetch) } typedef CPUMIPSState CPUArchState; +typedef MIPSCPU ArchCPU; #include "exec/cpu-all.h" diff --git a/target/moxie/cpu.h b/target/moxie/cpu.h index 10ba6aa7be..4bc5e07af9 100644 --- a/target/moxie/cpu.h +++ b/target/moxie/cpu.h @@ -119,6 +119,7 @@ static inline int cpu_mmu_index(CPUMoxieState *env, bool ifetch) } typedef CPUMoxieState CPUArchState; +typedef MoxieCPU ArchCPU; #include "exec/cpu-all.h" diff --git a/target/nios2/cpu.h b/target/nios2/cpu.h index 2b4bd25d65..272ab10e67 100644 --- a/target/nios2/cpu.h +++ b/target/nios2/cpu.h @@ -244,6 +244,7 @@ static inline int cpu_interrupts_enabled(CPUNios2State *env) } typedef CPUNios2State CPUArchState; +typedef Nios2CPU ArchCPU; #include "exec/cpu-all.h" diff --git a/target/openrisc/cpu.h b/target/openrisc/cpu.h index 9bd583f13a..20ea1ca973 100644 --- a/target/openrisc/cpu.h +++ b/target/openrisc/cpu.h @@ -364,6 +364,7 @@ void cpu_openrisc_count_stop(OpenRISCCPU *cpu); #define CPU_RESOLVING_TYPE TYPE_OPENRISC_CPU typedef CPUOpenRISCState CPUArchState; +typedef OpenRISCCPU ArchCPU; #include "exec/cpu-all.h" diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h index 18825ebafc..c5ea29a949 100644 --- a/target/ppc/cpu.h +++ b/target/ppc/cpu.h @@ -1365,6 +1365,7 @@ void ppc_compat_add_property(Object *obj, const char *name, #endif /* defined(TARGET_PPC64) */ typedef CPUPPCState CPUArchState; +typedef PowerPCCPU ArchCPU; #include "exec/cpu-all.h" diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index df71872a82..1fdac0c8d5 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -324,6 +324,7 @@ void riscv_set_csr_ops(int csrno, riscv_csr_operations *ops); void riscv_cpu_register_gdb_regs_for_features(CPUState *cs); typedef CPURISCVState CPUArchState; +typedef RISCVCPU ArchCPU; #include "exec/cpu-all.h" diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h index 00b9e6d3b8..762184c62d 100644 --- a/target/s390x/cpu.h +++ b/target/s390x/cpu.h @@ -793,6 +793,7 @@ void s390_init_sigp(void); S390CPU *s390_cpu_addr2state(uint16_t cpu_addr); typedef CPUS390XState CPUArchState; +typedef S390CPU ArchCPU; #include "exec/cpu-all.h" diff --git a/target/sh4/cpu.h b/target/sh4/cpu.h index 788de6e22a..926cf63825 100644 --- a/target/sh4/cpu.h +++ b/target/sh4/cpu.h @@ -281,6 +281,7 @@ static inline int cpu_mmu_index (CPUSH4State *env, bool ifetch) } typedef CPUSH4State CPUArchState; +typedef SuperHCPU ArchCPU; #include "exec/cpu-all.h" diff --git a/target/sparc/cpu.h b/target/sparc/cpu.h index 41c39578c2..55c0004887 100644 --- a/target/sparc/cpu.h +++ b/target/sparc/cpu.h @@ -730,6 +730,7 @@ static inline int cpu_pil_allowed(CPUSPARCState *env1, int pil) } typedef CPUSPARCState CPUArchState; +typedef SPARCCPU ArchCPU; #include "exec/cpu-all.h" diff --git a/target/tilegx/cpu.h b/target/tilegx/cpu.h index 2fbf14d508..042a7a0c71 100644 --- a/target/tilegx/cpu.h +++ b/target/tilegx/cpu.h @@ -151,6 +151,7 @@ static inline TileGXCPU *tilegx_env_get_cpu(CPUTLGState *env) #define MMU_USER_IDX 0 /* Current memory operation is in user mode */ typedef CPUTLGState CPUArchState; +typedef TileGXCPU ArchCPU; #include "exec/cpu-all.h" diff --git a/target/tricore/cpu.h b/target/tricore/cpu.h index c958deedd9..dc4bcea955 100644 --- a/target/tricore/cpu.h +++ b/target/tricore/cpu.h @@ -380,6 +380,7 @@ static inline int cpu_mmu_index(CPUTriCoreState *env, bool ifetch) } typedef CPUTriCoreState CPUArchState; +typedef TriCoreCPU ArchCPU; #include "exec/cpu-all.h" diff --git a/target/unicore32/cpu.h b/target/unicore32/cpu.h index 68323b9541..968154e6fa 100644 --- a/target/unicore32/cpu.h +++ b/target/unicore32/cpu.h @@ -153,6 +153,7 @@ static inline int cpu_mmu_index(CPUUniCore32State *env, bool ifetch) } typedef CPUUniCore32State CPUArchState; +typedef UniCore32CPU ArchCPU; #include "exec/cpu-all.h" diff --git a/target/xtensa/cpu.h b/target/xtensa/cpu.h index 40e4f1f568..6f9721bc28 100644 --- a/target/xtensa/cpu.h +++ b/target/xtensa/cpu.h @@ -788,6 +788,7 @@ static inline void cpu_get_tb_cpu_state(CPUXtensaState *env, target_ulong *pc, } typedef CPUXtensaState CPUArchState; +typedef XtensaCPU ArchCPU; #include "exec/cpu-all.h"