aboutsummaryrefslogtreecommitdiff
path: root/tcg
diff options
context:
space:
mode:
authorRichard Henderson <richard.henderson@linaro.org>2025-01-02 10:16:01 -0800
committerRichard Henderson <richard.henderson@linaro.org>2025-01-16 20:57:17 -0800
commitee97eef290cde22c39b8715802bb3b0ca4555be3 (patch)
treeba0098e933de5c90df4bab6330df386188ef1f63 /tcg
parent2c4815590f9ea399bc87f727dd1c883b0d701bb8 (diff)
downloadqemu-ee97eef290cde22c39b8715802bb3b0ca4555be3.zip
qemu-ee97eef290cde22c39b8715802bb3b0ca4555be3.tar.gz
qemu-ee97eef290cde22c39b8715802bb3b0ca4555be3.tar.bz2
tcg/riscv: Use BEXTI for single-bit extractions
Acked-by: Alistair Francis <alistair.francis@wdc.com> Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Message-ID: <20250102181601.1421059-3-richard.henderson@linaro.org>
Diffstat (limited to 'tcg')
-rw-r--r--tcg/riscv/tcg-target-has.h8
-rw-r--r--tcg/riscv/tcg-target.c.inc11
2 files changed, 16 insertions, 3 deletions
diff --git a/tcg/riscv/tcg-target-has.h b/tcg/riscv/tcg-target-has.h
index 0f9cc04..f35f9b3 100644
--- a/tcg/riscv/tcg-target-has.h
+++ b/tcg/riscv/tcg-target-has.h
@@ -110,7 +110,13 @@ tcg_target_extract_valid(TCGType type, unsigned ofs, unsigned len)
/* ofs > 0 uses SRLIW; ofs == 0 uses add.uw. */
return ofs || (cpuinfo & CPUINFO_ZBA);
}
- return (cpuinfo & CPUINFO_ZBB) && ofs == 0 && len == 16;
+ switch (len) {
+ case 1:
+ return (cpuinfo & CPUINFO_ZBS) && ofs != 0;
+ case 16:
+ return (cpuinfo & CPUINFO_ZBB) && ofs == 0;
+ }
+ return false;
}
#define TCG_TARGET_extract_valid tcg_target_extract_valid
diff --git a/tcg/riscv/tcg-target.c.inc b/tcg/riscv/tcg-target.c.inc
index 4f6e18f..61dc310 100644
--- a/tcg/riscv/tcg-target.c.inc
+++ b/tcg/riscv/tcg-target.c.inc
@@ -163,6 +163,7 @@ typedef enum {
OPC_ANDI = 0x7013,
OPC_AUIPC = 0x17,
OPC_BEQ = 0x63,
+ OPC_BEXTI = 0x48005013,
OPC_BGE = 0x5063,
OPC_BGEU = 0x7063,
OPC_BLT = 0x4063,
@@ -2354,9 +2355,15 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, TCGType type,
}
/* FALLTHRU */
case INDEX_op_extract_i32:
- if (a2 == 0 && args[3] == 16) {
+ switch (args[3]) {
+ case 1:
+ tcg_out_opc_imm(s, OPC_BEXTI, a0, a1, a2);
+ break;
+ case 16:
+ tcg_debug_assert(a2 == 0);
tcg_out_ext16u(s, a0, a1);
- } else {
+ break;
+ default:
g_assert_not_reached();
}
break;