| Message ID | 1611301998-25676-1-git-send-email-yangtiezhu@loongson.cn (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 919af8b96c89898b83c32a83b34caff0b4e74335 |
| Headers | show |
| Series | MIPS: Make definitions of MIPSInst_FMA_{FUNC,FMTM} consistent with MIPS64 manual | expand |
On Fri, Jan 22, 2021 at 03:53:18PM +0800, Tiezhu Yang wrote: > The kernel definitions of MIPSInst_FMA_FUNC and MIPSInst_FMA_FFMT are not > consistent with MADD.fmt, NMADD.fmt and NMSUB.fmt in the MIPS64 manual [1], > the field func is bit 5..3 and fmt is bit 2..0, fix them. Otherwise there > exists error when add new instruction simulation. > > [1] https://www.mips.com/?do-download=the-mips64-instruction-set-v6-06 > > Reported-by: Ming Wang <wangming01@loongson.cn> > Signed-off-by: Tiezhu Yang <yangtiezhu@loongson.cn> > --- > arch/mips/include/asm/inst.h | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) applied to mips-next. Thomas.
diff --git a/arch/mips/include/asm/inst.h b/arch/mips/include/asm/inst.h index 22912f7..2f98ced 100644 --- a/arch/mips/include/asm/inst.h +++ b/arch/mips/include/asm/inst.h @@ -65,11 +65,11 @@ #define I_FR_SFT 21 #define MIPSInst_FR(x) ((MIPSInst(x) & 0x03e00000) >> I_FR_SFT) -#define I_FMA_FUNC_SFT 2 -#define MIPSInst_FMA_FUNC(x) ((MIPSInst(x) & 0x0000003c) >> I_FMA_FUNC_SFT) +#define I_FMA_FUNC_SFT 3 +#define MIPSInst_FMA_FUNC(x) ((MIPSInst(x) & 0x00000038) >> I_FMA_FUNC_SFT) #define I_FMA_FFMT_SFT 0 -#define MIPSInst_FMA_FFMT(x) (MIPSInst(x) & 0x00000003) +#define MIPSInst_FMA_FFMT(x) (MIPSInst(x) & 0x00000007) typedef unsigned int mips_instruction;
The kernel definitions of MIPSInst_FMA_FUNC and MIPSInst_FMA_FFMT are not consistent with MADD.fmt, NMADD.fmt and NMSUB.fmt in the MIPS64 manual [1], the field func is bit 5..3 and fmt is bit 2..0, fix them. Otherwise there exists error when add new instruction simulation. [1] https://www.mips.com/?do-download=the-mips64-instruction-set-v6-06 Reported-by: Ming Wang <wangming01@loongson.cn> Signed-off-by: Tiezhu Yang <yangtiezhu@loongson.cn> --- arch/mips/include/asm/inst.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)