From nobody Thu Dec 18 19:38:37 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1578456308; cv=none; d=zohomail.com; s=zohoarc; b=Leo98lmL6FtO2dtWRiLGLRf+C1NrPcxOwZEYzi+bMH6t8X9hAtidXGY0y67Ki+cov0vqJ3rR2kIV8tCcqyqUxx74pVjJO6091jS5U24DKoXPmbFzEEwdUVZ/l1OItNLZJ3Dnay+/6/VQ7pUmj3CKdZQ97Zc0ZGDg6KO84N4408g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578456308; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=W3QOqVQcKxICfZINGRR4Q5RpPfv/b9Q6JOcMtLEYvg8=; b=h1Ox8RV5BAmtgokxvn5q301Q6zMhJqRD2SM80uEELjTL5Y72h2Dng0qmnY2fr4efp2uMzPmV1A1sJwgzBUN1p/LFzaIePS2/dACHpQxNEYpm7e006MIxy7dZlFgXkHWwvB8suOxc+joW3spEYsbCPlmt7VAFr4W7JvIvK4L8vL8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578456308723674.1583831149491; Tue, 7 Jan 2020 20:05:08 -0800 (PST) Received: from localhost ([::1]:35532 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2ah-0004SV-6W for importer@patchew.org; Tue, 07 Jan 2020 23:05:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50035) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2JI-0005Fm-Vw for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:47:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ip2JH-0003zp-Ap for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:47:08 -0500 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]:43158) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ip2JH-0003yp-3J for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:47:07 -0500 Received: by mail-pl1-x62e.google.com with SMTP id p27so536471pli.10 for ; Tue, 07 Jan 2020 19:47:07 -0800 (PST) Received: from localhost.localdomain (alanje.lnk.telstra.net. [120.151.179.201]) by smtp.gmail.com with ESMTPSA id f23sm1198433pgj.76.2020.01.07.19.47.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jan 2020 19:47:05 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=W3QOqVQcKxICfZINGRR4Q5RpPfv/b9Q6JOcMtLEYvg8=; b=o0ve0wywOlN2ERZ3vmg31g7DtnywCk6pts9m/npu6li7XQyFCsx6p9IqC0NJxliPS4 bycMD/KLjfVj7TZBoTL5YnjWk1Q6aVKSjWcsvkfe5Gn7wS242fiaHtaECPesEeiSEICV Wy9gfdeW6EG6RsYoGYLtv26xLWtBj7xRK3cgxpWjSl0uxz1SOyOmtoCQuRg7PXvIOGrR 1731eyJzzNz+sFpvcHCI4uLAgtFX4xYuMlRM+MvlvJUb2Bl6e8k9UeSlPXbt0w2o1PW0 3kmQoO9odXIiU+vCZ8FKa7cSSK2k7H592B8xSzhrK6h3IvG+TS1KMaibNy1szufF5Sfm BZvw== 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:mime-version:content-transfer-encoding; bh=W3QOqVQcKxICfZINGRR4Q5RpPfv/b9Q6JOcMtLEYvg8=; b=dPg3zNix1As2K1yVOAAun/rnr0kvPLNz6ywY4PgdcU/MdJ14HBk5wfbrymSHrGnXS9 oAaBwSgtKt8hfuE44nnu8jVw0WNZTecxd2Nkc7KQJ6XkLBnCBfz/QnBuctq+HIlQ5K6H UZYjuus+Bbg+UUxkWF0+6w1Zpn20SMN5X6QfWqZbFtnA3CrLC+NzPL1DaerKoc1c7G03 2goG+W11hKMdHf0ig7pWvC68xTPk6LhpHe93rdXYRma3UayhReM0cruLJ7DPAjn/bIcq o94BHqVbsvZSi+e1s3TgSwNxp3aUxJU3TfpL8wD6rc/Ckvm0bBiipYhxVwM9vsgDoFUi +hoA== X-Gm-Message-State: APjAAAUqYMZM5lcWSnbY0hidfOyYmmKhed1QmonPWeyGzEy+gIMTUarM lV8x/uD0CeIyUMEC+DrsUjOB6QCTJKNTGg== X-Google-Smtp-Source: APXvYqyd/brezsHSTc4OOpL5u5URgyawG7tIWNGakBUZRsM29RLZKKhBdSZB2z2MP3AAr5yU07mcmA== X-Received: by 2002:a17:90a:3945:: with SMTP id n5mr2125150pjf.34.1578455225780; Tue, 07 Jan 2020 19:47:05 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 31/41] target/m68k: Use cpu_*_mmuidx_ra instead of MMU_MODE{0, 1}_SUFFIX Date: Wed, 8 Jan 2020 14:45:13 +1100 Message-Id: <20200108034523.17349-32-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200108034523.17349-1-richard.henderson@linaro.org> References: <20200108034523.17349-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::62e 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The generated *_user functions are unused. The *_kernel functions have a couple of users in op_helper.c; use *_mmuidx_ra instead, with MMU_KERNEL_IDX. Tested-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Laurent Vivier Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Richard Henderson --- v2: Use *_mmuidx_ra directly, without intermediate macros. --- target/m68k/cpu.h | 2 -- target/m68k/op_helper.c | 77 +++++++++++++++++++++++++---------------- 2 files changed, 47 insertions(+), 32 deletions(-) diff --git a/target/m68k/cpu.h b/target/m68k/cpu.h index 11c71fa962..3de8e06dfe 100644 --- a/target/m68k/cpu.h +++ b/target/m68k/cpu.h @@ -519,8 +519,6 @@ enum { #define cpu_list m68k_cpu_list =20 /* MMU modes definitions */ -#define MMU_MODE0_SUFFIX _kernel -#define MMU_MODE1_SUFFIX _user #define MMU_KERNEL_IDX 0 #define MMU_USER_IDX 1 static inline int cpu_mmu_index (CPUM68KState *env, bool ifetch) diff --git a/target/m68k/op_helper.c b/target/m68k/op_helper.c index bc4f845e3f..202498deb5 100644 --- a/target/m68k/op_helper.c +++ b/target/m68k/op_helper.c @@ -42,8 +42,8 @@ static void cf_rte(CPUM68KState *env) uint32_t fmt; =20 sp =3D env->aregs[7]; - fmt =3D cpu_ldl_kernel(env, sp); - env->pc =3D cpu_ldl_kernel(env, sp + 4); + fmt =3D cpu_ldl_mmuidx_ra(env, sp, MMU_KERNEL_IDX, 0); + env->pc =3D cpu_ldl_mmuidx_ra(env, sp + 4, MMU_KERNEL_IDX, 0); sp |=3D (fmt >> 28) & 3; env->aregs[7] =3D sp + 8; =20 @@ -58,13 +58,13 @@ static void m68k_rte(CPUM68KState *env) =20 sp =3D env->aregs[7]; throwaway: - sr =3D cpu_lduw_kernel(env, sp); + sr =3D cpu_lduw_mmuidx_ra(env, sp, MMU_KERNEL_IDX, 0); sp +=3D 2; - env->pc =3D cpu_ldl_kernel(env, sp); + env->pc =3D cpu_ldl_mmuidx_ra(env, sp, MMU_KERNEL_IDX, 0); sp +=3D 4; if (m68k_feature(env, M68K_FEATURE_QUAD_MULDIV)) { /* all except 68000 */ - fmt =3D cpu_lduw_kernel(env, sp); + fmt =3D cpu_lduw_mmuidx_ra(env, sp, MMU_KERNEL_IDX, 0); sp +=3D 2; switch (fmt >> 12) { case 0: @@ -260,12 +260,12 @@ static void cf_interrupt_all(CPUM68KState *env, int i= s_hw) /* ??? This could cause MMU faults. */ sp &=3D ~3; sp -=3D 4; - cpu_stl_kernel(env, sp, retaddr); + cpu_stl_mmuidx_ra(env, sp, retaddr, MMU_KERNEL_IDX, 0); sp -=3D 4; - cpu_stl_kernel(env, sp, fmt); + cpu_stl_mmuidx_ra(env, sp, fmt, MMU_KERNEL_IDX, 0); env->aregs[7] =3D sp; /* Jump to vector. */ - env->pc =3D cpu_ldl_kernel(env, env->vbr + vector); + env->pc =3D cpu_ldl_mmuidx_ra(env, env->vbr + vector, MMU_KERNEL_IDX, = 0); } =20 static inline void do_stack_frame(CPUM68KState *env, uint32_t *sp, @@ -278,23 +278,24 @@ static inline void do_stack_frame(CPUM68KState *env, = uint32_t *sp, switch (format) { case 4: *sp -=3D 4; - cpu_stl_kernel(env, *sp, env->pc); + cpu_stl_mmuidx_ra(env, *sp, env->pc, MMU_KERNEL_IDX, 0); *sp -=3D 4; - cpu_stl_kernel(env, *sp, addr); + cpu_stl_mmuidx_ra(env, *sp, addr, MMU_KERNEL_IDX, 0); break; case 3: case 2: *sp -=3D 4; - cpu_stl_kernel(env, *sp, addr); + cpu_stl_mmuidx_ra(env, *sp, addr, MMU_KERNEL_IDX, 0); break; } *sp -=3D 2; - cpu_stw_kernel(env, *sp, (format << 12) + (cs->exception_index << = 2)); + cpu_stw_mmuidx_ra(env, *sp, (format << 12) + (cs->exception_index = << 2), + MMU_KERNEL_IDX, 0); } *sp -=3D 4; - cpu_stl_kernel(env, *sp, retaddr); + cpu_stl_mmuidx_ra(env, *sp, retaddr, MMU_KERNEL_IDX, 0); *sp -=3D 2; - cpu_stw_kernel(env, *sp, sr); + cpu_stw_mmuidx_ra(env, *sp, sr, MMU_KERNEL_IDX, 0); } =20 static void m68k_interrupt_all(CPUM68KState *env, int is_hw) @@ -353,36 +354,52 @@ static void m68k_interrupt_all(CPUM68KState *env, int= is_hw) cpu_abort(cs, "DOUBLE MMU FAULT\n"); } env->mmu.fault =3D true; + /* push data 3 */ sp -=3D 4; - cpu_stl_kernel(env, sp, 0); /* push data 3 */ + cpu_stl_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0); + /* push data 2 */ sp -=3D 4; - cpu_stl_kernel(env, sp, 0); /* push data 2 */ + cpu_stl_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0); + /* push data 1 */ sp -=3D 4; - cpu_stl_kernel(env, sp, 0); /* push data 1 */ + cpu_stl_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0); + /* write back 1 / push data 0 */ sp -=3D 4; - cpu_stl_kernel(env, sp, 0); /* write back 1 / push data 0 */ + cpu_stl_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0); + /* write back 1 address */ sp -=3D 4; - cpu_stl_kernel(env, sp, 0); /* write back 1 address */ + cpu_stl_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0); + /* write back 2 data */ sp -=3D 4; - cpu_stl_kernel(env, sp, 0); /* write back 2 data */ + cpu_stl_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0); + /* write back 2 address */ sp -=3D 4; - cpu_stl_kernel(env, sp, 0); /* write back 2 address */ + cpu_stl_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0); + /* write back 3 data */ sp -=3D 4; - cpu_stl_kernel(env, sp, 0); /* write back 3 data */ + cpu_stl_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0); + /* write back 3 address */ sp -=3D 4; - cpu_stl_kernel(env, sp, env->mmu.ar); /* write back 3 address */ + cpu_stl_mmuidx_ra(env, sp, env->mmu.ar, MMU_KERNEL_IDX, 0); + /* fault address */ sp -=3D 4; - cpu_stl_kernel(env, sp, env->mmu.ar); /* fault address */ + cpu_stl_mmuidx_ra(env, sp, env->mmu.ar, MMU_KERNEL_IDX, 0); + /* write back 1 status */ sp -=3D 2; - cpu_stw_kernel(env, sp, 0); /* write back 1 status */ + cpu_stw_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0); + /* write back 2 status */ sp -=3D 2; - cpu_stw_kernel(env, sp, 0); /* write back 2 status */ + cpu_stw_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0); + /* write back 3 status */ sp -=3D 2; - cpu_stw_kernel(env, sp, 0); /* write back 3 status */ + cpu_stw_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0); + /* special status word */ sp -=3D 2; - cpu_stw_kernel(env, sp, env->mmu.ssw); /* special status word */ + cpu_stw_mmuidx_ra(env, sp, env->mmu.ssw, MMU_KERNEL_IDX, 0); + /* effective address */ sp -=3D 4; - cpu_stl_kernel(env, sp, env->mmu.ar); /* effective address */ + cpu_stl_mmuidx_ra(env, sp, env->mmu.ar, MMU_KERNEL_IDX, 0); + do_stack_frame(env, &sp, 7, oldsr, 0, retaddr); env->mmu.fault =3D false; if (qemu_loglevel_mask(CPU_LOG_INT)) { @@ -414,7 +431,7 @@ static void m68k_interrupt_all(CPUM68KState *env, int i= s_hw) =20 env->aregs[7] =3D sp; /* Jump to vector. */ - env->pc =3D cpu_ldl_kernel(env, env->vbr + vector); + env->pc =3D cpu_ldl_mmuidx_ra(env, env->vbr + vector, MMU_KERNEL_IDX, = 0); } =20 static void do_interrupt_all(CPUM68KState *env, int is_hw) --=20 2.20.1