From patchwork Sun Sep 19 01:57:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 514275 Delivered-To: patch@linaro.org Received: by 2002:a02:c816:0:0:0:0:0 with SMTP id p22csp892760jao; Sat, 18 Sep 2021 19:11:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxObCHOnK0Q5YOx3Z0XeNnebqJPyDWvczDdS73txEsNsNPtvid0aynULwsYwN112CCsQIOQ X-Received: by 2002:a05:622a:254:: with SMTP id c20mr17338600qtx.213.1632017480967; Sat, 18 Sep 2021 19:11:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632017480; cv=none; d=google.com; s=arc-20160816; b=1C8kHpqHWJlnyJVu2V4MiGXgUqswe9wmFnL1Q/j0QjEvW2bLhfnRLSRSmM/orZSybi XSpyvox10CjKx0HjZGTcDunkgFg7ZAM5XWLd9Kqd9ZCexr7wm3yGfEh6JBT4dl6iPstX IzGolarXvhnYiPrY20iET8kwImVO6XwJTbjtxM0Ba0/2qKxMl7Ks5UhXQaSx+Bx6x6iM efM7Tr1EYl/rl9f3Ids/jvpowI3Q6t4vc1hC4b2/TwQ2yaRelDGLInedLdTSCLq1L7n1 wAB4P6RVpl6Ms/3PXhptewVbFi0WXfGt18ZgzYnCC1JV3Nvj23LMUZ+3nL2gTSPJ2W6+ VZUg== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=O9vg5roFylqoQkGnKileOtFvxG1CN8IesL9g9MIkxpY=; b=uurgzIeyQQ0xpC9WBxzzR9PYNENYKLL7/NrRQFk14cQJntREg6GVbRR8YtaFg253BC io5mDotqX2vdY88vobjK29qg+Orl457eGuTzXXEo8DnI7a5s+C4RVAJIXgV7rKb1CtJ4 +zgM3frrHMgO/kyntt2nxhHOrmxL3R7DEpf9ZiecH5S6iEEH8Xk18+BBNNThFDel2ebM RH38SapgMBpeixjzkXrJ6357KA+/TczqySAnDhY6ndxN79mYUND1f+sSvyMfz13AmTV1 4lxPTW2smoX0naIYcjv66fKYNUL+lspXeDo754kwMi9TCfhb/bDSimN5Wa7JPlzm8UL4 aUdA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=qfEADOXF; 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=pass (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 z9si5538247qts.104.2021.09.18.19.11.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 18 Sep 2021 19:11:20 -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=pass header.i=@linaro.org header.s=google header.b=qfEADOXF; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:38148 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mRmIa-00011T-FO for patch@linaro.org; Sat, 18 Sep 2021 22:11:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41744) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mRm5J-0003yT-3I for qemu-devel@nongnu.org; Sat, 18 Sep 2021 21:57:37 -0400 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]:39736) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mRm5H-0005Cw-BP for qemu-devel@nongnu.org; Sat, 18 Sep 2021 21:57:36 -0400 Received: by mail-pl1-x636.google.com with SMTP id c4so8751054pls.6 for ; Sat, 18 Sep 2021 18:57:34 -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 :mime-version:content-transfer-encoding; bh=O9vg5roFylqoQkGnKileOtFvxG1CN8IesL9g9MIkxpY=; b=qfEADOXFNDKRC7tt8/YQJ3HwpaiVtr/o13VpiYVlzTevZ/LtgCftxq2pHp64sOh6QR ctWCHVnIeJuRQAaKBGPscX4SRYPEXTaVuNXNsTKaMdARHX0Bf34s/bpJgucaQJxkSETh YPStFLHsPHoi0dWT82gtwdkJ90rtC567kEE7cUj3yccbG0I1f3yjlXUG6yoS26mvU5Qw Ue3vf1lTAoGjtRa/fIMGCBdmniRK/fLYoBx3GwipQZg0c9CFFKrnkjRQj+zjBBkjue20 McXIDnO777nH2t/0uDYiSe7dlZPkkeWxeLZWoLtSnsD9CXQ2sV49HNyIKw2Fe9OhppFH O15g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=O9vg5roFylqoQkGnKileOtFvxG1CN8IesL9g9MIkxpY=; b=pR1Hdti+d3g+cPObZdXWJXLop7k/MXR8qL1WYuX3stv/heNiOGaCOpxX3IDKL9qmls stcfrfvwSW4eVedWvCvj2SjkD79fev/gZrqV0kRWr+mIbg7lVtE0pJeGKZY73ruQbGSs p48AmntUZHiUWb6QLc2LYqbHoZJNmdFUoDrz2Ca7B0R4Oi424nFXCqgJa0HpoM9G9UhP dC3xBPGoc1zxovFD9qMvBQnsyMWeiUJ1swSbdF1WhK6ooqpYTcnDqHdttkuCCMNq5ftL HEBY4zz7wP6K/0hy3BTDmzgVNCTZvANAxQeodf3KjxBEM+ET5/GK4m8RoIgAzbHhyVka kxaQ== X-Gm-Message-State: AOAM532eKG2F7dqING3+Tz311NkiAIzSLrpX9gav2bKtNIx08tT37Vut D1Ei8jiyUFy1iu8IG2rdr6TKOyb9oNa+zQ== X-Received: by 2002:a17:90a:1d6:: with SMTP id 22mr21348103pjd.214.1632016653934; Sat, 18 Sep 2021 18:57:33 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id k14sm6747899pgg.92.2021.09.18.18.57.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Sep 2021 18:57:33 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 17/25] target/mips: Extract break code into env->error_code Date: Sat, 18 Sep 2021 18:57:10 -0700 Message-Id: <20210919015718.466207-18-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210919015718.466207-1-richard.henderson@linaro.org> References: <20210919015718.466207-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::636; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x636.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: laurent@vivier.eu Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Simplify cpu_loop by doing all of the decode in translate. This fixes a bug in that cpu_loop was not handling the different layout of the R6 version of break16. This fixes a bug in that cpu_loop extracted the wrong bits for the mips16e break16 instruction. Signed-off-by: Richard Henderson --- target/mips/tcg/translate.h | 1 + linux-user/mips/cpu_loop.c | 73 +++-------------------- target/mips/tcg/translate.c | 12 +++- target/mips/tcg/micromips_translate.c.inc | 6 +- target/mips/tcg/mips16e_translate.c.inc | 2 +- 5 files changed, 25 insertions(+), 69 deletions(-) -- 2.25.1 diff --git a/target/mips/tcg/translate.h b/target/mips/tcg/translate.h index 6111493651..ae01515efe 100644 --- a/target/mips/tcg/translate.h +++ b/target/mips/tcg/translate.h @@ -129,6 +129,7 @@ enum { void generate_exception(DisasContext *ctx, int excp); void generate_exception_err(DisasContext *ctx, int excp, int err); void generate_exception_end(DisasContext *ctx, int excp); +void generate_exception_break(DisasContext *ctx, int code); void gen_reserved_instruction(DisasContext *ctx); void check_insn(DisasContext *ctx, uint64_t flags); diff --git a/linux-user/mips/cpu_loop.c b/linux-user/mips/cpu_loop.c index e9d9208e83..c105b00eac 100644 --- a/linux-user/mips/cpu_loop.c +++ b/linux-user/mips/cpu_loop.c @@ -64,6 +64,7 @@ void cpu_loop(CPUMIPSState *env) { CPUState *cs = env_cpu(env); int trapnr, si_code; + unsigned int code; abi_long ret; # ifdef TARGET_ABI_MIPSO32 unsigned int syscall_num; @@ -184,71 +185,15 @@ done_syscall: * handling code in arch/mips/kernel/traps.c. */ case EXCP_BREAK: - { - abi_ulong trap_instr; - unsigned int code; - - /* - * FIXME: It would be better to decode the trap number - * during translate, and store it in error_code while - * raising the exception. We should not be re-reading - * the opcode here. - */ - - if (env->hflags & MIPS_HFLAG_M16) { - if (env->insn_flags & ASE_MICROMIPS) { - /* microMIPS mode */ - ret = get_user_u16(trap_instr, env->active_tc.PC); - if (ret != 0) { - goto error; - } - - if ((trap_instr >> 10) == 0x11) { - /* 16-bit instruction */ - code = trap_instr & 0xf; - } else { - /* 32-bit instruction */ - abi_ulong instr_lo; - - ret = get_user_u16(instr_lo, - env->active_tc.PC + 2); - if (ret != 0) { - goto error; - } - trap_instr = (trap_instr << 16) | instr_lo; - code = ((trap_instr >> 6) & ((1 << 20) - 1)); - /* Unfortunately, microMIPS also suffers from - the old assembler bug... */ - if (code >= (1 << 10)) { - code >>= 10; - } - } - } else { - /* MIPS16e mode */ - ret = get_user_u16(trap_instr, env->active_tc.PC); - if (ret != 0) { - goto error; - } - code = (trap_instr >> 6) & 0x3f; - } - } else { - ret = get_user_u32(trap_instr, env->active_tc.PC); - if (ret != 0) { - goto error; - } - - /* As described in the original Linux kernel code, the - * below checks on 'code' are to work around an old - * assembly bug. - */ - code = ((trap_instr >> 6) & ((1 << 20) - 1)); - if (code >= (1 << 10)) { - code >>= 10; - } - } - - do_tr_or_bp(env, code, false); + /* + * As described in the original Linux kernel code, the below + * checks on 'code' are to work around an old assembly bug. + */ + code = env->error_code; + if (code >= (1 << 10)) { + code >>= 10; } + do_tr_or_bp(env, code, false); break; case EXCP_TRAP: { diff --git a/target/mips/tcg/translate.c b/target/mips/tcg/translate.c index 148afec9dc..e17bcd24db 100644 --- a/target/mips/tcg/translate.c +++ b/target/mips/tcg/translate.c @@ -1367,6 +1367,16 @@ void generate_exception_end(DisasContext *ctx, int excp) generate_exception_err(ctx, excp, 0); } +void generate_exception_break(DisasContext *ctx, int code) +{ +#ifdef CONFIG_USER_ONLY + /* Pass the break code along to cpu_loop. */ + tcg_gen_st_i32(tcg_constant_i32(code), cpu_env, + offsetof(CPUMIPSState, error_code)); +#endif + generate_exception_end(ctx, EXCP_BREAK); +} + void gen_reserved_instruction(DisasContext *ctx) { generate_exception_end(ctx, EXCP_RI); @@ -14176,7 +14186,7 @@ static void decode_opc_special(CPUMIPSState *env, DisasContext *ctx) generate_exception_end(ctx, EXCP_SYSCALL); break; case OPC_BREAK: - generate_exception_end(ctx, EXCP_BREAK); + generate_exception_break(ctx, extract32(ctx->opcode, 6, 20)); break; case OPC_SYNC: check_insn(ctx, ISA_MIPS2); diff --git a/target/mips/tcg/micromips_translate.c.inc b/target/mips/tcg/micromips_translate.c.inc index 0da4c802a3..f91f7a96cd 100644 --- a/target/mips/tcg/micromips_translate.c.inc +++ b/target/mips/tcg/micromips_translate.c.inc @@ -822,7 +822,7 @@ static void gen_pool16c_insn(DisasContext *ctx) gen_HILO(ctx, OPC_MFLO, 0, uMIPS_RS5(ctx->opcode)); break; case BREAK16: - generate_exception_end(ctx, EXCP_BREAK); + generate_exception_break(ctx, extract32(ctx->opcode, 0, 4)); break; case SDBBP16: if (is_uhi(extract32(ctx->opcode, 0, 4))) { @@ -937,7 +937,7 @@ static void gen_pool16c_r6_insn(DisasContext *ctx) break; case R6_BREAK16: /* BREAK16 */ - generate_exception(ctx, EXCP_BREAK); + generate_exception_break(ctx, extract32(ctx->opcode, 6, 4)); break; case R6_SDBBP16: /* SDBBP16 */ @@ -1812,7 +1812,7 @@ static void decode_micromips32_opc(CPUMIPSState *env, DisasContext *ctx) gen_pool32axf(env, ctx, rt, rs); break; case BREAK32: - generate_exception_end(ctx, EXCP_BREAK); + generate_exception_break(ctx, extract32(ctx->opcode, 6, 20)); break; case SIGRIE: check_insn(ctx, ISA_MIPS_R6); diff --git a/target/mips/tcg/mips16e_translate.c.inc b/target/mips/tcg/mips16e_translate.c.inc index 84d816603a..f57e0a5f2a 100644 --- a/target/mips/tcg/mips16e_translate.c.inc +++ b/target/mips/tcg/mips16e_translate.c.inc @@ -969,7 +969,7 @@ static int decode_ase_mips16e(CPUMIPSState *env, DisasContext *ctx) gen_slt(ctx, OPC_SLTU, 24, rx, ry); break; case RR_BREAK: - generate_exception_end(ctx, EXCP_BREAK); + generate_exception_break(ctx, extract32(ctx->opcode, 5, 6)); break; case RR_SLLV: gen_shift(ctx, OPC_SLLV, ry, rx, ry);