mirror of
https://github.com/yuzu-emu/unicorn.git
synced 2024-12-23 05:05:36 +00:00
target/riscv: Split RVC32 and RVC64 insns into separate files
This eliminates all functions in insn_trans/trans_rvc.inc.c, so the entire file can be removed. Backports commit 0e68e240a9bd3b44a91cd6012f0e2bf2a43b9fe2 from qemu
This commit is contained in:
Richard Henderson
Lioncash
parent
a968769d26
commit
a62b4e5def
|
|
@ -6,16 +6,19 @@ DECODETREE = $(SRC_PATH)/scripts/decodetree.py
|
|||
decode32-y = $(SRC_PATH)/target/riscv/insn32.decode
|
||||
decode32-$(TARGET_RISCV64) += $(SRC_PATH)/target/riscv/insn32-64.decode
|
||||
|
||||
decode16-y = $(SRC_PATH)/target/riscv/insn16.decode
|
||||
decode16-$(TARGET_RISCV32) += $(SRC_PATH)/target/riscv/insn16-32.decode
|
||||
decode16-$(TARGET_RISCV64) += $(SRC_PATH)/target/riscv/insn16-64.decode
|
||||
|
||||
target/riscv/decode_insn32.inc.c: $(decode32-y) $(DECODETREE)
|
||||
$(call quiet-command, \
|
||||
$(PYTHON) $(DECODETREE) -o $@ --static-decode decode_insn32 \
|
||||
$(decode32-y), "GEN", $(TARGET_DIR)$@)
|
||||
|
||||
target/riscv/decode_insn16.inc.c: \
|
||||
$(SRC_PATH)/target/riscv/insn16.decode $(DECODETREE)
|
||||
target/riscv/decode_insn16.inc.c: $(decode16-y) $(DECODETREE)
|
||||
$(call quiet-command, \
|
||||
$(PYTHON) $(DECODETREE) -o $@ --static-decode decode_insn16 \
|
||||
--insnwidth 16 $<, "GEN", $(TARGET_DIR)$@)
|
||||
--insnwidth 16 $(decode16-y), "GEN", $(TARGET_DIR)$@)
|
||||
|
||||
target/riscv/translate.o: target/riscv/decode_insn32.inc.c \
|
||||
target/riscv/decode_insn16.inc.c
|
||||
|
|
|
|||
28
qemu/target/riscv/insn16-32.decode
Normal file
28
qemu/target/riscv/insn16-32.decode
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
#
|
||||
# RISC-V translation routines for the RVXI Base Integer Instruction Set.
|
||||
#
|
||||
# Copyright (c) 2018 Peer Adelt, peer.adelt@hni.uni-paderborn.de
|
||||
# Bastian Koppelmann, kbastian@mail.uni-paderborn.de
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify it
|
||||
# under the terms and conditions of the GNU General Public License,
|
||||
# version 2 or later, as published by the Free Software Foundation.
|
||||
#
|
||||
# This program is distributed in the hope it will be useful, but WITHOUT
|
||||
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
||||
# more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License along with
|
||||
# this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
# *** RV32C Standard Extension (Quadrant 0) ***
|
||||
flw 011 ... ... .. ... 00 @cl_w
|
||||
fsw 111 ... ... .. ... 00 @cs_w
|
||||
|
||||
# *** RV32C Standard Extension (Quadrant 1) ***
|
||||
jal 001 ........... 01 @cj rd=1 # C.JAL
|
||||
|
||||
# *** RV32C Standard Extension (Quadrant 2) ***
|
||||
flw 011 . ..... ..... 10 @c_lwsp
|
||||
fsw 111 . ..... ..... 10 @c_swsp
|
||||
30
qemu/target/riscv/insn16-64.decode
Normal file
30
qemu/target/riscv/insn16-64.decode
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
#
|
||||
# RISC-V translation routines for the RVXI Base Integer Instruction Set.
|
||||
#
|
||||
# Copyright (c) 2018 Peer Adelt, peer.adelt@hni.uni-paderborn.de
|
||||
# Bastian Koppelmann, kbastian@mail.uni-paderborn.de
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify it
|
||||
# under the terms and conditions of the GNU General Public License,
|
||||
# version 2 or later, as published by the Free Software Foundation.
|
||||
#
|
||||
# This program is distributed in the hope it will be useful, but WITHOUT
|
||||
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
||||
# more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License along with
|
||||
# this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
# *** RV64C Standard Extension (Quadrant 0) ***
|
||||
ld 011 ... ... .. ... 00 @cl_d
|
||||
sd 111 ... ... .. ... 00 @cs_d
|
||||
|
||||
# *** RV64C Standard Extension (Quadrant 1) ***
|
||||
addiw 001 . ..... ..... 01 @ci
|
||||
subw 100 1 11 ... 00 ... 01 @cs_2
|
||||
addw 100 1 11 ... 01 ... 01 @cs_2
|
||||
|
||||
# *** RV64C Standard Extension (Quadrant 2) ***
|
||||
ld 011 . ..... ..... 10 @c_ldsp
|
||||
sd 111 . ..... ..... 10 @c_sdsp
|
||||
|
|
@ -50,30 +50,11 @@
|
|||
&u imm rd !extern
|
||||
&shift shamt rs1 rd !extern
|
||||
|
||||
# Argument sets:
|
||||
&cl rs1 rd
|
||||
&cl_dw uimm rs1 rd
|
||||
&ciw nzuimm rd
|
||||
&cs rs1 rs2
|
||||
&cs_dw uimm rs1 rs2
|
||||
&cb imm rs1
|
||||
&cr rd rs2
|
||||
&c_shift shamt rd
|
||||
|
||||
&c_ld uimm rd
|
||||
&c_sd uimm rs2
|
||||
|
||||
&caddi16sp_lui imm_lui imm_addi16sp rd
|
||||
&cflwsp_ldsp uimm_flwsp uimm_ldsp rd
|
||||
&cfswsp_sdsp uimm_fswsp uimm_sdsp rs2
|
||||
|
||||
# Formats 16:
|
||||
@cr .... ..... ..... .. &r rs2=%rs2_5 rs1=%rd %rd
|
||||
@ci ... . ..... ..... .. &i imm=%imm_ci rs1=%rd %rd
|
||||
@cl_d ... ... ... .. ... .. &i imm=%uimm_cl_d rs1=%rs1_3 rd=%rs2_3
|
||||
@cl_w ... ... ... .. ... .. &i imm=%uimm_cl_w rs1=%rs1_3 rd=%rs2_3
|
||||
@cl ... ... ... .. ... .. &cl rs1=%rs1_3 rd=%rs2_3
|
||||
@cs ... ... ... .. ... .. &cs rs1=%rs1_3 rs2=%rs2_3
|
||||
@cs_2 ... ... ... .. ... .. &r rs2=%rs2_3 rs1=%rs1_3 rd=%rs1_3
|
||||
@cs_d ... ... ... .. ... .. &s imm=%uimm_cl_d rs1=%rs1_3 rs2=%rs2_3
|
||||
@cs_w ... ... ... .. ... .. &s imm=%uimm_cl_w rs1=%rs1_3 rs2=%rs2_3
|
||||
|
|
@ -91,10 +72,6 @@
|
|||
|
||||
@c_addi4spn ... . ..... ..... .. &i imm=%nzuimm_ciw rs1=2 rd=%rs2_3
|
||||
@c_addi16sp ... . ..... ..... .. &i imm=%imm_addi16sp rs1=2 rd=2
|
||||
@c_flwsp_ldsp ... . ..... ..... .. &cflwsp_ldsp uimm_flwsp=%uimm_6bit_lw \
|
||||
uimm_ldsp=%uimm_6bit_ld %rd
|
||||
@c_fswsp_sdsp ... . ..... ..... .. &cfswsp_sdsp uimm_fswsp=%uimm_6bit_sw \
|
||||
uimm_sdsp=%uimm_6bit_sd rs2=%rs2_5
|
||||
|
||||
@c_shift ... . .. ... ..... .. \
|
||||
&shift rd=%rs1_3 rs1=%rs1_3 shamt=%shimm_6bit
|
||||
|
|
@ -104,7 +81,7 @@
|
|||
@c_andi ... . .. ... ..... .. &i imm=%imm_ci rs1=%rs1_3 rd=%rs1_3
|
||||
|
||||
|
||||
# *** RV64C Standard Extension (Quadrant 0) ***
|
||||
# *** RV32/64C Standard Extension (Quadrant 0) ***
|
||||
{
|
||||
# Opcode of all zeros is illegal; rd != 0, nzuimm == 0 is reserved.
|
||||
illegal 000 000 000 00 --- 00
|
||||
|
|
@ -112,14 +89,11 @@
|
|||
}
|
||||
fld 001 ... ... .. ... 00 @cl_d
|
||||
lw 010 ... ... .. ... 00 @cl_w
|
||||
c_flw_ld 011 --- ... -- ... 00 @cl #Note: Must parse uimm manually
|
||||
fsd 101 ... ... .. ... 00 @cs_d
|
||||
sw 110 ... ... .. ... 00 @cs_w
|
||||
c_fsw_sd 111 --- ... -- ... 00 @cs #Note: Must parse uimm manually
|
||||
|
||||
# *** RV64C Standard Extension (Quadrant 1) ***
|
||||
# *** RV32/64C Standard Extension (Quadrant 1) ***
|
||||
addi 000 . ..... ..... 01 @ci
|
||||
c_jal_addiw 001 . ..... ..... 01 @ci #Note: parse rd and/or imm manually
|
||||
addi 010 . ..... ..... 01 @c_li
|
||||
{
|
||||
addi 011 . 00010 ..... 01 @c_addi16sp
|
||||
|
|
@ -132,17 +106,14 @@ sub 100 0 11 ... 00 ... 01 @cs_2
|
|||
xor 100 0 11 ... 01 ... 01 @cs_2
|
||||
or 100 0 11 ... 10 ... 01 @cs_2
|
||||
and 100 0 11 ... 11 ... 01 @cs_2
|
||||
c_subw 100 1 11 ... 00 ... 01 @cs_2
|
||||
c_addw 100 1 11 ... 01 ... 01 @cs_2
|
||||
jal 101 ........... 01 @cj rd=0 # C.J
|
||||
beq 110 ... ... ..... 01 @cb_z
|
||||
bne 111 ... ... ..... 01 @cb_z
|
||||
|
||||
# *** RV64C Standard Extension (Quadrant 2) ***
|
||||
# *** RV32/64C Standard Extension (Quadrant 2) ***
|
||||
slli 000 . ..... ..... 10 @c_shift2
|
||||
fld 001 . ..... ..... 10 @c_ldsp
|
||||
lw 010 . ..... ..... 10 @c_lwsp
|
||||
c_flwsp_ldsp 011 . ..... ..... 10 @c_flwsp_ldsp #C.LDSP:RV64;C.FLWSP:RV32
|
||||
{
|
||||
jalr 100 0 ..... 00000 10 @c_jalr rd=0 # C.JR
|
||||
addi 100 0 ..... ..... 10 @c_mv
|
||||
|
|
@ -154,4 +125,3 @@ c_flwsp_ldsp 011 . ..... ..... 10 @c_flwsp_ldsp #C.LDSP:RV64;C.FLWSP:RV32
|
|||
}
|
||||
fsd 101 ...... ..... 10 @c_sdsp
|
||||
sw 110 . ..... ..... 10 @c_swsp
|
||||
c_fswsp_sdsp 111 . ..... ..... 10 @c_fswsp_sdsp #C.SDSP:RV64;C.FSWSP:RV32
|
||||
|
|
|
|||
|
|
@ -1,115 +0,0 @@
|
|||
/*
|
||||
* RISC-V translation routines for the RVC Compressed Instruction Set.
|
||||
*
|
||||
* Copyright (c) 2016-2017 Sagar Karandikar, sagark@eecs.berkeley.edu
|
||||
* Copyright (c) 2018 Peer Adelt, peer.adelt@hni.uni-paderborn.de
|
||||
* Bastian Koppelmann, kbastian@mail.uni-paderborn.de
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms and conditions of the GNU General Public License,
|
||||
* version 2 or later, as published by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
||||
* more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along with
|
||||
* this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
static bool trans_c_flw_ld(DisasContext *ctx, arg_c_flw_ld *a)
|
||||
{
|
||||
#ifdef TARGET_RISCV32
|
||||
/* C.FLW ( RV32FC-only ) */
|
||||
REQUIRE_FPU;
|
||||
REQUIRE_EXT(ctx, RVF);
|
||||
|
||||
arg_i arg;
|
||||
decode_insn16_extract_cl_w(ctx, &arg, ctx->opcode);
|
||||
return trans_flw(ctx, &arg);
|
||||
#else
|
||||
/* C.LD ( RV64C/RV128C-only ) */
|
||||
arg_i arg;
|
||||
decode_insn16_extract_cl_d(ctx, &arg, ctx->opcode);
|
||||
return trans_ld(ctx, &arg);
|
||||
#endif
|
||||
}
|
||||
|
||||
static bool trans_c_fsw_sd(DisasContext *ctx, arg_c_fsw_sd *a)
|
||||
{
|
||||
#ifdef TARGET_RISCV32
|
||||
/* C.FSW ( RV32FC-only ) */
|
||||
REQUIRE_FPU;
|
||||
REQUIRE_EXT(ctx, RVF);
|
||||
|
||||
arg_s arg;
|
||||
decode_insn16_extract_cs_w(ctx, &arg, ctx->opcode);
|
||||
return trans_fsw(ctx, &arg);
|
||||
#else
|
||||
/* C.SD ( RV64C/RV128C-only ) */
|
||||
arg_s arg;
|
||||
decode_insn16_extract_cs_d(ctx, &arg, ctx->opcode);
|
||||
return trans_sd(ctx, &arg);
|
||||
#endif
|
||||
}
|
||||
|
||||
static bool trans_c_jal_addiw(DisasContext *ctx, arg_c_jal_addiw *a)
|
||||
{
|
||||
#ifdef TARGET_RISCV32
|
||||
/* C.JAL */
|
||||
arg_j tmp;
|
||||
decode_insn16_extract_cj(ctx, &tmp, ctx->opcode);
|
||||
arg_jal arg = { .rd = 1, .imm = tmp.imm };
|
||||
return trans_jal(ctx, &arg);
|
||||
#else
|
||||
/* C.ADDIW */
|
||||
arg_addiw arg = { .rd = a->rd, .rs1 = a->rd, .imm = a->imm };
|
||||
return trans_addiw(ctx, &arg);
|
||||
#endif
|
||||
}
|
||||
|
||||
static bool trans_c_subw(DisasContext *ctx, arg_c_subw *a)
|
||||
{
|
||||
#ifdef TARGET_RISCV64
|
||||
return trans_subw(ctx, a);
|
||||
#else
|
||||
return false;
|
||||
#endif
|
||||
}
|
||||
|
||||
static bool trans_c_addw(DisasContext *ctx, arg_c_addw *a)
|
||||
{
|
||||
#ifdef TARGET_RISCV64
|
||||
return trans_addw(ctx, a);
|
||||
#else
|
||||
return false;
|
||||
#endif
|
||||
}
|
||||
|
||||
static bool trans_c_flwsp_ldsp(DisasContext *ctx, arg_c_flwsp_ldsp *a)
|
||||
{
|
||||
#ifdef TARGET_RISCV32
|
||||
/* C.FLWSP */
|
||||
arg_flw arg_flw = { .rd = a->rd, .rs1 = 2, .imm = a->uimm_flwsp };
|
||||
return trans_flw(ctx, &arg_flw);
|
||||
#else
|
||||
/* C.LDSP */
|
||||
arg_ld arg_ld = { .rd = a->rd, .rs1 = 2, .imm = a->uimm_ldsp };
|
||||
return trans_ld(ctx, &arg_ld);
|
||||
#endif
|
||||
return false;
|
||||
}
|
||||
|
||||
static bool trans_c_fswsp_sdsp(DisasContext *ctx, arg_c_fswsp_sdsp *a)
|
||||
{
|
||||
#ifdef TARGET_RISCV32
|
||||
/* C.FSWSP */
|
||||
arg_fsw a_fsw = { .rs1 = 2, .rs2 = a->rs2, .imm = a->uimm_fswsp };
|
||||
return trans_fsw(ctx, &a_fsw);
|
||||
#else
|
||||
/* C.SDSP */
|
||||
arg_sd a_sd = { .rs1 = 2, .rs2 = a->rs2, .imm = a->uimm_sdsp };
|
||||
return trans_sd(ctx, &a_sd);
|
||||
#endif
|
||||
}
|
||||
|
|
@ -735,7 +735,6 @@ static bool gen_shift(DisasContext *ctx, arg_r *a,
|
|||
#endif
|
||||
|
||||
#include "decode_insn16.inc.c"
|
||||
#include "insn_trans/trans_rvc.inc.c"
|
||||
|
||||
#ifdef CONFIG_PRAGMA_DIAGNOSTIC_AVAILABLE
|
||||
# pragma GCC diagnostic pop
|
||||
|
|
|
|||
Loading…
Reference in a new issue