From patchwork Mon Jun 10 02:01:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 166244 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp455876ilk; Sun, 9 Jun 2019 19:02:46 -0700 (PDT) X-Google-Smtp-Source: APXvYqx1w7PMXNE6BgmcngYNXlu5lt7xfDGGTMDXZ8W87D3R8aToZjxKmzRbfkNrSbtg96gJ2zrR X-Received: by 2002:ac8:4601:: with SMTP id p1mr57615767qtn.181.1560132166333; Sun, 09 Jun 2019 19:02:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560132166; cv=none; d=google.com; s=arc-20160816; b=nY2WmJaSHbkmtuHLhmcoLBZgoCQG8hP6/agqAmCKLC8OuYWUlJa0BB5uKK0SKjJmlK BXJBWIvloeOZmEMylz4u4QUF7G0mce4WcXUeHH7SHGq7uzVT3pzy41GgzYNMYWm/870t 9lE+ntzfU7UbgHFYFJDWeyfuKLCQHi8HuN68BMgFP+Tm8+WL3wlf4R9QuDcqsn66Zk3Y Tv0zpaX9J0pma4qXrvvViuKdUu5eHHEVUVGHD4I7fvpSGC5l5hFMhLRI2Aji4cyNfOc1 m/+BZiQtBTM92U8ohuzYP0NUZn77E748yAduDq3K5ml4UlsjaVmiXmjspVIoK1XmeduY VWVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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=JtIsT/WNCOCMI/Szmht2zv6NaV5uAlYWJB8sxOFHfs4=; b=yRAL5K5t9xv+IPFKGDPAj4FfVXFTrDsmF11eQDEW0Vbs58k1PZAAt2UoDeAtyVNf1t eSd641sngLf5NKQQdIGicRgg//jladF9grEexfvLa5OSsw5lcbARRt64D9/IgcNStLs4 xuXqyWs7aZHoUhuFdwIqKPZ/lc3U2eUul2n1YMID/vVOG0fk+KuefkOwklNChU6ClkVi Y3lm9XueXJOOaoOUxuHVJl+g2W2qgv/WfT/Blon72Y9Gwdbw0QQhpwBcJFpD+4HrC5xW KQqKTA8UYTnIUo3sAmuchKTeHt/QPUq2L6eTmBkwA8OhQxFE6KiGAfW/Emw/5Gz0ZIw2 /NYA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=gXHzoNgc; 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 v39si1458610qvc.173.2019.06.09.19.02.46 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 09 Jun 2019 19:02:46 -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=gXHzoNgc; 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 ([::1]:39604 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1ha9e1-0005mN-SJ for patch@linaro.org; Sun, 09 Jun 2019 22:02:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52871) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1ha9dm-0005gJ-Ny for qemu-devel@nongnu.org; Sun, 09 Jun 2019 22:02:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ha9dk-0001br-UA for qemu-devel@nongnu.org; Sun, 09 Jun 2019 22:02:30 -0400 Received: from mail-pf1-x42d.google.com ([2607:f8b0:4864:20::42d]:36328) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ha9dk-0001bR-LY for qemu-devel@nongnu.org; Sun, 09 Jun 2019 22:02:28 -0400 Received: by mail-pf1-x42d.google.com with SMTP id u22so4324655pfm.3 for ; Sun, 09 Jun 2019 19:02:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=JtIsT/WNCOCMI/Szmht2zv6NaV5uAlYWJB8sxOFHfs4=; b=gXHzoNgcamc74E6Qtp16+P10ucXSP6v+BojdOQG4dmppBAEP8bU514rnQOLIhSZ/GR t+PbpG7O0ZE1QTmq5HOTvexrzhGQEVQ18u+BvcPL//WkkT31Ab4LCZ5YhsxbdHaCu3VU o1+FjuN9Ugi6PTEk+FixJUsSGE/I/9/6tpc1gzBj5NdLL6dVfnDiO9h8BvgfgFHeAGJI 2+731Y7a8PxV0p5lyNthsvuHTla9b8Fhmj0e5yWc1dTMRjHFrjIwxSiJ564lidvokU0/ SZd3eGJQz0tlM+zosAe06xDsa5ZulS8e7gwaQG/A8vhzmCjtepJqQ9kOFs+7rtWnOIrq Y2+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=JtIsT/WNCOCMI/Szmht2zv6NaV5uAlYWJB8sxOFHfs4=; b=loHVGe18xieRApO2aecPr1dGH3l8Qq30+D8+mFwsft1ejqun15cfUPBZK5RTtOXo0U jzjIIpfKtDsXh9CQdEubzER6MJpW0XNTKFGWJTvGHiuhPe9QtHaQpYdhdEm1vf1JCX3i J5R9kUWNROAvsXDF0TJhdckP1/O+JR3Mh0efV/BBN8NrxhpoiJijCWPfh2w2SPHSe0iG dfK6FMjsMvrl1k/ihrRj1wIA8Oh9MOt7ImPE/DJJkBCRaujqNVpmXnKGWcBIXqQ5NwxC ZB+ek1w2wjtYggm8OaLqnn8NueqZsOhR2avxT5lOZEyp4tP2+ITkwpn9KQffGNaEHP6c 66zw== X-Gm-Message-State: APjAAAXivQtLw7Ks7+u7q4UMhE98ETFr3T5xwrKQ5QQ2dmIt6CbacqD4 BIDK2zF21+SFvvNnw9Rxq4Uo1yYyk4o= X-Received: by 2002:a65:4209:: with SMTP id c9mr13977256pgq.111.1560132147031; Sun, 09 Jun 2019 19:02:27 -0700 (PDT) Received: from localhost.localdomain (97-113-13-231.tukw.qwest.net. [97.113.13.231]) by smtp.gmail.com with ESMTPSA id l63sm9749013pfl.181.2019.06.09.19.02.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 09 Jun 2019 19:02:26 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sun, 9 Jun 2019 19:01:44 -0700 Message-Id: <20190610020218.9228-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190610020218.9228-1-richard.henderson@linaro.org> References: <20190610020218.9228-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::42d Subject: [Qemu-devel] [PULL 05/39] cpu: Define ArchCPU X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org 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. Reviewed-by: Peter Maydell 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 diff --git a/target/alpha/cpu.h b/target/alpha/cpu.h index 9ec92bf09d..5af0b6c542 100644 --- a/target/alpha/cpu.h +++ b/target/alpha/cpu.h @@ -305,6 +305,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 ccf581a84c..4ebb6349f1 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -3126,6 +3126,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 2ee5417ead..e978eb9539 100644 --- a/target/cris/cpu.h +++ b/target/cris/cpu.h @@ -285,6 +285,7 @@ bool cris_cpu_tlb_fill(CPUState *cs, vaddr address, int size, #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 7fd755a753..6eef107370 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 81931fc510..65f8f4d16c 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -1753,6 +1753,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 86f6c7b0af..08c360bd16 100644 --- a/target/lm32/cpu.h +++ b/target/lm32/cpu.h @@ -257,6 +257,7 @@ bool lm32_cpu_tlb_fill(CPUState *cs, vaddr address, int size, bool probe, uintptr_t retaddr); typedef CPULM32State CPUArchState; +typedef LM32CPU ArchCPU; #include "exec/cpu-all.h" diff --git a/target/m68k/cpu.h b/target/m68k/cpu.h index 4465a66145..1d30b73bdf 100644 --- a/target/m68k/cpu.h +++ b/target/m68k/cpu.h @@ -537,6 +537,7 @@ void m68k_cpu_transaction_failed(CPUState *cs, hwaddr physaddr, vaddr addr, MemTxResult response, uintptr_t retaddr); typedef CPUM68KState CPUArchState; +typedef M68kCPU ArchCPU; #include "exec/cpu-all.h" diff --git a/target/microblaze/cpu.h b/target/microblaze/cpu.h index 6170fd452f..5a7fe3cbf8 100644 --- a/target/microblaze/cpu.h +++ b/target/microblaze/cpu.h @@ -366,6 +366,7 @@ bool mb_cpu_tlb_fill(CPUState *cs, vaddr address, int size, bool probe, uintptr_t retaddr); typedef CPUMBState CPUArchState; +typedef MicroBlazeCPU ArchCPU; #include "exec/cpu-all.h" diff --git a/target/mips/cpu.h b/target/mips/cpu.h index 6f65822bb1..12527ca104 100644 --- a/target/mips/cpu.h +++ b/target/mips/cpu.h @@ -1113,6 +1113,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 1de0515848..b27b0eabae 100644 --- a/target/moxie/cpu.h +++ b/target/moxie/cpu.h @@ -118,6 +118,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 cc8e0ab771..5e51f1ae3f 100644 --- a/target/nios2/cpu.h +++ b/target/nios2/cpu.h @@ -247,6 +247,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 98361cb041..496895693e 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 6478fe7c91..17e7213be9 100644 --- a/target/ppc/cpu.h +++ b/target/ppc/cpu.h @@ -1376,6 +1376,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 509aae0613..8ee5051119 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -335,6 +335,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 6614c05f30..a8c3d702d3 100644 --- a/target/s390x/cpu.h +++ b/target/s390x/cpu.h @@ -795,6 +795,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 d7a8723d39..1bdc997290 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 fc392c6e87..ba5904e05a 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 5d3072f2db..8d660df34a 100644 --- a/target/tricore/cpu.h +++ b/target/tricore/cpu.h @@ -379,6 +379,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 48562949b1..5c9c4d98c0 100644 --- a/target/unicore32/cpu.h +++ b/target/unicore32/cpu.h @@ -152,6 +152,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 e164e18f18..6e6fb1d893 100644 --- a/target/xtensa/cpu.h +++ b/target/xtensa/cpu.h @@ -800,6 +800,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"