@@ -895,24 +895,24 @@ static bool op_fp(struct riscv_t *rv, uint32_t insn)
895895{
896896 const uint32_t rd = dec_rd (insn );
897897 const uint32_t rs1 = dec_rs1 (insn ), rs2 = dec_rs2 (insn );
898- const uint32_t rm = dec_funct3 (insn ); /* FIXME: rounding */
898+ const uint32_t rm = dec_funct3 (insn ); /* FIXME: rounding */
899899 const uint32_t funct7 = dec_funct7 (insn );
900900
901901 /* dispatch based on func7 (low 2 bits are width) */
902902 switch (funct7 ) {
903- case 0b0000000 : /* FADD */
903+ case 0b0000000 : /* FADD */
904904 rv -> F [rd ] = rv -> F [rs1 ] + rv -> F [rs2 ];
905905 break ;
906- case 0b0000100 : /* FSUB */
906+ case 0b0000100 : /* FSUB */
907907 rv -> F [rd ] = rv -> F [rs1 ] - rv -> F [rs2 ];
908908 break ;
909- case 0b0001000 : /* FMUL */
909+ case 0b0001000 : /* FMUL */
910910 rv -> F [rd ] = rv -> F [rs1 ] * rv -> F [rs2 ];
911911 break ;
912- case 0b0001100 : /* FDIV */
912+ case 0b0001100 : /* FDIV */
913913 rv -> F [rd ] = rv -> F [rs1 ] / rv -> F [rs2 ];
914914 break ;
915- case 0b0101100 : /* FSQRT */
915+ case 0b0101100 : /* FSQRT */
916916 rv -> F [rd ] = sqrtf (rv -> F [rs1 ]);
917917 break ;
918918 case 0b0010000 : {
@@ -921,13 +921,13 @@ static bool op_fp(struct riscv_t *rv, uint32_t insn)
921921 memcpy (& f2 , rv -> F + rs2 , 4 );
922922
923923 switch (rm ) {
924- case 0b000 : /* FSGNJ.S */
924+ case 0b000 : /* FSGNJ.S */
925925 res = (f1 & ~FMASK_SIGN ) | (f2 & FMASK_SIGN );
926926 break ;
927- case 0b001 : /* FSGNJN.S */
927+ case 0b001 : /* FSGNJN.S */
928928 res = (f1 & ~FMASK_SIGN ) | (~f2 & FMASK_SIGN );
929929 break ;
930- case 0b010 : /* FSGNJX.S */
930+ case 0b010 : /* FSGNJX.S */
931931 res = f1 ^ (f2 & FMASK_SIGN );
932932 break ;
933933 default :
@@ -940,10 +940,10 @@ static bool op_fp(struct riscv_t *rv, uint32_t insn)
940940 }
941941 case 0b0010100 :
942942 switch (rm ) {
943- case 0b000 : /* FMIN */
943+ case 0b000 : /* FMIN */
944944 rv -> F [rd ] = fminf (rv -> F [rs1 ], rv -> F [rs2 ]);
945945 break ;
946- case 0b001 : /* FMAX */
946+ case 0b001 : /* FMAX */
947947 rv -> F [rd ] = fmaxf (rv -> F [rs1 ], rv -> F [rs2 ]);
948948 break ;
949949 default :
@@ -953,10 +953,10 @@ static bool op_fp(struct riscv_t *rv, uint32_t insn)
953953 break ;
954954 case 0b1100000 :
955955 switch (rs2 ) {
956- case 0b00000 : /* FCVT.W.S */
956+ case 0b00000 : /* FCVT.W.S */
957957 rv -> X [rd ] = (int32_t ) rv -> F [rs1 ];
958958 break ;
959- case 0b00001 : /* FCVT.WU.S */
959+ case 0b00001 : /* FCVT.WU.S */
960960 rv -> X [rd ] = (uint32_t ) rv -> F [rs1 ];
961961 break ;
962962 default :
@@ -966,7 +966,7 @@ static bool op_fp(struct riscv_t *rv, uint32_t insn)
966966 break ;
967967 case 0b1110000 :
968968 switch (rm ) {
969- case 0b000 : /* FMV.X.W */
969+ case 0b000 : /* FMV.X.W */
970970 memcpy (rv -> X + rd , rv -> F + rs1 , 4 );
971971 break ;
972972 case 0b001 : { /* FCLASS.S */
@@ -982,13 +982,13 @@ static bool op_fp(struct riscv_t *rv, uint32_t insn)
982982 break ;
983983 case 0b1010000 :
984984 switch (rm ) {
985- case 0b010 : /* FEQ.S */
985+ case 0b010 : /* FEQ.S */
986986 rv -> X [rd ] = (rv -> F [rs1 ] == rv -> F [rs2 ]) ? 1 : 0 ;
987987 break ;
988- case 0b001 : /* FLT.S */
988+ case 0b001 : /* FLT.S */
989989 rv -> X [rd ] = (rv -> F [rs1 ] < rv -> F [rs2 ]) ? 1 : 0 ;
990990 break ;
991- case 0b000 : /* FLE.S */
991+ case 0b000 : /* FLE.S */
992992 rv -> X [rd ] = (rv -> F [rs1 ] <= rv -> F [rs2 ]) ? 1 : 0 ;
993993 break ;
994994 default :
@@ -998,18 +998,18 @@ static bool op_fp(struct riscv_t *rv, uint32_t insn)
998998 break ;
999999 case 0b1101000 :
10001000 switch (rs2 ) {
1001- case 0b00000 : /* FCVT.S.W */
1001+ case 0b00000 : /* FCVT.S.W */
10021002 rv -> F [rd ] = (float ) (int32_t ) rv -> X [rs1 ];
10031003 break ;
1004- case 0b00001 : /* FCVT.S.WU */
1004+ case 0b00001 : /* FCVT.S.WU */
10051005 rv -> F [rd ] = (float ) (uint32_t ) rv -> X [rs1 ];
10061006 break ;
10071007 default :
10081008 rv_except_illegal_insn (rv , insn );
10091009 return false;
10101010 }
10111011 break ;
1012- case 0b1111000 : /* FMV.W.X */
1012+ case 0b1111000 : /* FMV.W.X */
10131013 memcpy (rv -> F + rd , rv -> X + rs1 , 4 );
10141014 break ;
10151015 default :
0 commit comments