From patchwork Thu Mar 28 23:03:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 161350 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp1333459jan; Thu, 28 Mar 2019 16:32:57 -0700 (PDT) X-Google-Smtp-Source: APXvYqy4erOfQgjwCu0W5TOwXuJYtcbjBBvf6zxg0e82k2yfEh6jj7fTZiZ9Wr7tq63LtEiPBKZA X-Received: by 2002:a05:660c:6c3:: with SMTP id z3mr2269652itk.83.1553815977127; Thu, 28 Mar 2019 16:32:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553815977; cv=none; d=google.com; s=arc-20160816; b=VpCKFN5NT1DtpRXinXLyeIM9Htvqds4Bs2cvlEDGbF2Q9nQiSqfdvJloQxnI8YqNhH CPfBLxPORUcDdTT1PEZFFOSSJGNlzWuaaKiqXTYRAbKuczzafDglDV5CnmrcswTIKcc0 eKNXfYwJo8VNnb8XR/FUJSZHg97fPYnnJdIHkzx1tZ8agA3J88Srowg76f+X/63dT81y LT7kp+ieBTCO+g86ivhE/ta+nePdgcAlT7qS3QcMi6QZn9EWcOownCSNrivqYWicCUpk TRthkxlc6TkXYyecfruSbETtd276DyAGvhpgJMtXaz3ir8570l6+b9QnB4eGcSL6f/cT QNJA== 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=M9STtJqpi+ezQozx9D8Bkma96uE2ten3P0bvZ8Hz2xM=; b=YWAO3e9RdgB/e1MulNxME2HmUBIyATaeAtXqxz3PETRdcA3A8OlhRI2tNpYQUxJ5ki GUNskYNT8N1/FLv+uvzNGAHOY69OpFgQHpJ4lBJfWgPZYy/ST1kWP3dnMXuC8o7yaR7V fawDQ+3FxfSbaZ9TjDH6m4JGQjeascE9MaB0PhFiJnOPdkB+/RLY2gVjzKolAK6D9wm6 mjMO0QuBUigso4lrAuy6MI4XTvcGnn/Qg/oabLdyFe7mroELObx5Qpf1MXg0GWxVciuR ZWatlOg1DFg7k5tFaqnac4KvQMj/uo/HyHTzDc2m+wDlr1pWuhcypydb+l2pdlequf9O bohw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=wlAMKDNr; 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 b13si282353iok.126.2019.03.28.16.32.56 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 28 Mar 2019 16:32:57 -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=wlAMKDNr; 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]:43340 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h9eW0-0004pp-9O for patch@linaro.org; Thu, 28 Mar 2019 19:32:56 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42412) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h9eKp-0001km-A1 for qemu-devel@nongnu.org; Thu, 28 Mar 2019 19:21:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h9e4i-00037u-NE for qemu-devel@nongnu.org; Thu, 28 Mar 2019 19:04:46 -0400 Received: from mail-pg1-x543.google.com ([2607:f8b0:4864:20::543]:47023) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h9e4h-00037G-Vl for qemu-devel@nongnu.org; Thu, 28 Mar 2019 19:04:44 -0400 Received: by mail-pg1-x543.google.com with SMTP id q1so212441pgv.13 for ; Thu, 28 Mar 2019 16:04:43 -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=M9STtJqpi+ezQozx9D8Bkma96uE2ten3P0bvZ8Hz2xM=; b=wlAMKDNrTeSZfCoElzP81jRWtakUB15MIe8EbP3RsUTfqKeI9bYulBwstxYNl6Hcw/ naMOPzBlvj8hEN6tDyW/iYDjBNxlatpl1CykCDLGWE8DKn8NcVysB6GXQZGHuAJ8YyMf +R4wURgr1zHwhXXYi/+sUI/DD9cxE/sxYboVZgiZByBc9eK6LKsoWxcZ08oo9vHEZDvF +IqJrYo0MemXcdU0+5xjHNMrWR9wuw+6pBb7eum2NA4TsN786mvoKzpywjojXSF5YHFQ rJl6pjPbh+LoVb6WLuA++u4qinYfZgJMCfdWTkyElVpxBIqyE5axXA8I/Bn1JR4GZFe1 pBDw== 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=M9STtJqpi+ezQozx9D8Bkma96uE2ten3P0bvZ8Hz2xM=; b=PPtTwEWR/Xjrat+FfsBLYBvKkfth6DUKLZVwJpZ9DMF2kk139lnP5r95cYfBUKFvrt wmj4u4EwfxZXYigiJ18qhLJjTW2UIHv+//bLvEMJ5FDw2FwHFBz1uS6pY94FEmeBTrsd 8rJ3S/Tmd27jzs3jhfgxB7VXyouhDgP9ttDHGJ5bnf4RN6zdKXqiRqe6tyV8C81kHAI5 /kK1ZHNimM3C0j1JoYMdpdmUubso9pjkhxp+QcAStDPuKuyoVICOqQo0PAXWL9xE9Y9H bvpKYQXdOYHHrxvMEh9PJUewjm0YCrBayh+hnOgRE9zPSyy5sf8i1hipdzKuINsY9ynk fiTw== X-Gm-Message-State: APjAAAUVL3wsjgrEsClW4ytMDqhRP+kzkfjWu/VFZtcmtKCoAFeQnoyj 83B5ZodkJ//uNTVjg9yo9eI+5To2tkQ= X-Received: by 2002:a62:480d:: with SMTP id v13mr44499760pfa.125.1553814282557; Thu, 28 Mar 2019 16:04:42 -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.41 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Mar 2019 16:04:41 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 28 Mar 2019 13:03:49 -1000 Message-Id: <20190328230404.12909-22-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::543 Subject: [Qemu-devel] [PATCH for-4.1 v2 21/36] target/riscv: Use env_cpu, env_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" Signed-off-by: Richard Henderson --- target/riscv/cpu.h | 5 ----- linux-user/riscv/cpu_loop.c | 2 +- target/riscv/cpu_helper.c | 4 ++-- target/riscv/csr.c | 12 ++++++------ target/riscv/op_helper.c | 8 ++++---- 5 files changed, 13 insertions(+), 18 deletions(-) -- 2.17.1 Reviewed-by: Alistair Francis diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index e97f6c4889..c18dd5eb24 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -211,11 +211,6 @@ typedef struct RISCVCPU { CPURISCVState env; } RISCVCPU; -static inline RISCVCPU *riscv_env_get_cpu(CPURISCVState *env) -{ - return container_of(env, RISCVCPU, env); -} - static inline int riscv_has_ext(CPURISCVState *env, target_ulong ext) { return (env->misa & ext) != 0; diff --git a/linux-user/riscv/cpu_loop.c b/linux-user/riscv/cpu_loop.c index 31700f75d0..c1134597fd 100644 --- a/linux-user/riscv/cpu_loop.c +++ b/linux-user/riscv/cpu_loop.c @@ -25,7 +25,7 @@ void cpu_loop(CPURISCVState *env) { - CPUState *cs = CPU(riscv_env_get_cpu(env)); + CPUState *cs = env_cpu(env); int trapnr, signum, sigcode; target_ulong sigaddr; target_ulong ret; diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c index b17f169681..72f82c1ccf 100644 --- a/target/riscv/cpu_helper.c +++ b/target/riscv/cpu_helper.c @@ -191,7 +191,7 @@ static int get_physical_address(CPURISCVState *env, hwaddr *physical, } } - CPUState *cs = CPU(riscv_env_get_cpu(env)); + CPUState *cs = env_cpu(env); int va_bits = PGSHIFT + levels * ptidxbits; target_ulong mask = (1L << (TARGET_LONG_BITS - (va_bits - 1))) - 1; target_ulong masked_msbs = (addr >> (va_bits - 1)) & mask; @@ -320,7 +320,7 @@ restart: static void raise_mmu_exception(CPURISCVState *env, target_ulong address, MMUAccessType access_type) { - CPUState *cs = CPU(riscv_env_get_cpu(env)); + CPUState *cs = env_cpu(env); int page_fault_exceptions = (env->priv_ver >= PRIV_VERSION_1_10_0) && get_field(env->satp, SATP_MODE) != VM_1_10_MBARE; diff --git a/target/riscv/csr.c b/target/riscv/csr.c index e1d91b6c60..97a4e10e3e 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -296,7 +296,7 @@ static int write_mstatus(CPURISCVState *env, int csrno, target_ulong val) if (env->priv_ver <= PRIV_VERSION_1_09_1) { if ((val ^ mstatus) & (MSTATUS_MXR | MSTATUS_MPP | MSTATUS_MPRV | MSTATUS_SUM | MSTATUS_VM)) { - tlb_flush(CPU(riscv_env_get_cpu(env))); + tlb_flush(env_cpu(env)); } mask = MSTATUS_SIE | MSTATUS_SPIE | MSTATUS_MIE | MSTATUS_MPIE | MSTATUS_SPP | MSTATUS_FS | MSTATUS_MPRV | MSTATUS_SUM | @@ -307,7 +307,7 @@ static int write_mstatus(CPURISCVState *env, int csrno, target_ulong val) if (env->priv_ver >= PRIV_VERSION_1_10_0) { if ((val ^ mstatus) & (MSTATUS_MXR | MSTATUS_MPP | MSTATUS_MPRV | MSTATUS_SUM)) { - tlb_flush(CPU(riscv_env_get_cpu(env))); + tlb_flush(env_cpu(env)); } mask = MSTATUS_SIE | MSTATUS_SPIE | MSTATUS_MIE | MSTATUS_MPIE | MSTATUS_SPP | MSTATUS_FS | MSTATUS_MPRV | MSTATUS_SUM | @@ -382,7 +382,7 @@ static int write_misa(CPURISCVState *env, int csrno, target_ulong val) /* flush translation cache */ if (val != env->misa) { - tb_flush(CPU(riscv_env_get_cpu(env))); + tb_flush(env_cpu(env)); } env->misa = val; @@ -549,7 +549,7 @@ static int write_mbadaddr(CPURISCVState *env, int csrno, target_ulong val) static int rmw_mip(CPURISCVState *env, int csrno, target_ulong *ret_value, target_ulong new_value, target_ulong write_mask) { - RISCVCPU *cpu = riscv_env_get_cpu(env); + RISCVCPU *cpu = env_archcpu(env); /* Allow software control of delegable interrupts not claimed by hardware */ target_ulong mask = write_mask & delegable_ints & ~env->miclaim; uint32_t old_mip; @@ -712,7 +712,7 @@ static int write_satp(CPURISCVState *env, int csrno, target_ulong val) return 0; } if (env->priv_ver <= PRIV_VERSION_1_09_1 && (val ^ env->sptbr)) { - tlb_flush(CPU(riscv_env_get_cpu(env))); + tlb_flush(env_cpu(env)); env->sptbr = val & (((target_ulong) 1 << (TARGET_PHYS_ADDR_SPACE_BITS - PGSHIFT)) - 1); } @@ -723,7 +723,7 @@ static int write_satp(CPURISCVState *env, int csrno, target_ulong val) if (env->priv == PRV_S && get_field(env->mstatus, MSTATUS_TVM)) { return -1; } else { - tlb_flush(CPU(riscv_env_get_cpu(env))); + tlb_flush(env_cpu(env)); env->satp = val; } } diff --git a/target/riscv/op_helper.c b/target/riscv/op_helper.c index b7dc18a41e..f078bafbe6 100644 --- a/target/riscv/op_helper.c +++ b/target/riscv/op_helper.c @@ -28,7 +28,7 @@ void QEMU_NORETURN riscv_raise_exception(CPURISCVState *env, uint32_t exception, uintptr_t pc) { - CPUState *cs = CPU(riscv_env_get_cpu(env)); + CPUState *cs = env_cpu(env); qemu_log_mask(CPU_LOG_INT, "%s: %d\n", __func__, exception); cs->exception_index = exception; cpu_loop_exit_restore(cs, pc); @@ -128,7 +128,7 @@ target_ulong helper_mret(CPURISCVState *env, target_ulong cpu_pc_deb) void helper_wfi(CPURISCVState *env) { - CPUState *cs = CPU(riscv_env_get_cpu(env)); + CPUState *cs = env_cpu(env); if (env->priv == PRV_S && env->priv_ver >= PRIV_VERSION_1_10_0 && @@ -143,8 +143,8 @@ void helper_wfi(CPURISCVState *env) void helper_tlb_flush(CPURISCVState *env) { - RISCVCPU *cpu = riscv_env_get_cpu(env); - CPUState *cs = CPU(cpu); + CPUState *cs = env_cpu(env); + if (env->priv == PRV_S && env->priv_ver >= PRIV_VERSION_1_10_0 && get_field(env->mstatus, MSTATUS_TVM)) {