Improved disassembly of running ISS
This commit is contained in:
		| @@ -10,7 +10,7 @@ InsructionSet RV32F extends RV32IBase{ | ||||
|     instructions{ | ||||
|         FLW { | ||||
|             encoding: imm[11:0]s | rs1[4:0] | b010 | rd[4:0] | b0000111; | ||||
|             args_disass:"f%rd$d, %imm%(x%rs1$d)"; | ||||
|             args_disass:"f{rd}, {imm}(x{rs1})"; | ||||
|             val offs[XLEN] <= X[rs1]'s + imm; | ||||
|             val res[32] <= MEM[offs]{32}; | ||||
|             if(FLEN==32) | ||||
| @@ -22,13 +22,13 @@ InsructionSet RV32F extends RV32IBase{ | ||||
|         } | ||||
|         FSW { | ||||
|             encoding: imm[11:5]s | rs2[4:0] | rs1[4:0] | b010 | imm[4:0]s | b0100111; | ||||
|             args_disass:"f%rs2$d, %imm%(x%rs1$d)"; | ||||
|             args_disass:"f{rs2}, {imm}(x{rs1})"; | ||||
|             val offs[XLEN] <= X[rs1]'s + imm; | ||||
|             MEM[offs]{32}<=F[rs2]{32}; | ||||
|         } | ||||
|         FMADD.S { | ||||
|             encoding: rs3[4:0] | b00 | rs2[4:0] | rs1[4:0] | rm[2:0] | rd[4:0] | b1000011; | ||||
|             args_disass:"x%rd$d, f%rs1$d, f%rs2$d, f%rs3$d"; | ||||
|             args_disass:"x{rd}, f{rs1}, f{rs2}, f{rs3}"; | ||||
|             //F[rd]f<= F[rs1]f * F[rs2]f + F[rs3]f; | ||||
|             val res[32] <= fdispatch_fmadd_s(F[rs1]{32}, F[rs2]{32}, F[rs3]{32}, zext(0, 32), choose(rm<7, rm{8}, FCSR{8})); | ||||
|             if(FLEN==32) | ||||
| @@ -42,7 +42,7 @@ InsructionSet RV32F extends RV32IBase{ | ||||
|         } | ||||
|         FMSUB.S { | ||||
|             encoding: rs3[4:0] | b00 | rs2[4:0] | rs1[4:0] | rm[2:0] | rd[4:0] | b1000111; | ||||
|             args_disass:"x%rd$d, f%rs1$d, f%rs2$d, f%rs3$d"; | ||||
|             args_disass:"x{rd}, f{rs1}, f{rs2}, f{rs3}"; | ||||
|             //F[rd]f<=F[rs1]f * F[rs2]f - F[rs3]f; | ||||
|             val res[32] <= fdispatch_fmadd_s(F[rs1]{32}, F[rs2]{32}, F[rs3]{32}, zext(1, 32), choose(rm<7, rm{8}, FCSR{8})); | ||||
|             if(FLEN==32) | ||||
| @@ -56,7 +56,7 @@ InsructionSet RV32F extends RV32IBase{ | ||||
|         } | ||||
|         FNMADD.S { | ||||
|             encoding: rs3[4:0] | b00 | rs2[4:0] | rs1[4:0] | rm[2:0] | rd[4:0] | b1001111; | ||||
|             args_disass:"x%rd$d, f%rs1$d, f%rs2$d, f%rs3$d"; | ||||
|             args_disass:"x{rd}, f{rs1}, f{rs2}, f{rs3}"; | ||||
|             //F[rd]f<=-F[rs1]f * F[rs2]f + F[rs3]f; | ||||
|             val res[32] <= fdispatch_fmadd_s(F[rs1]{32}, F[rs2]{32}, F[rs3]{32}, zext(2, 32), choose(rm<7, rm{8}, FCSR{8})); | ||||
|             if(FLEN==32) | ||||
| @@ -70,7 +70,7 @@ InsructionSet RV32F extends RV32IBase{ | ||||
|         } | ||||
|         FNMSUB.S { | ||||
|             encoding: rs3[4:0] | b00 | rs2[4:0] | rs1[4:0] | rm[2:0] | rd[4:0] | b1001011; | ||||
|             args_disass:"x%rd$d, f%rs1$d, f%rs2$d, f%rs3$d"; | ||||
|             args_disass:"x{rd}, f{rs1}, f{rs2}, f{rs3}"; | ||||
|             //F[rd]f<=-F[rs1]f * F[rs2]f - F[rs3]f; | ||||
|             val res[32] <= fdispatch_fmadd_s(F[rs1]{32}, F[rs2]{32}, F[rs3]{32}, zext(3, 32), choose(rm<7, rm{8}, FCSR{8})); | ||||
|             if(FLEN==32) | ||||
| @@ -84,7 +84,7 @@ InsructionSet RV32F extends RV32IBase{ | ||||
|         } | ||||
|         FADD.S { | ||||
|             encoding: b0000000 | rs2[4:0] | rs1[4:0] | rm[2:0] | rd[4:0] | b1010011; | ||||
|             args_disass:"f%rd$d, f%rs1$d, f%rs2$d"; | ||||
|             args_disass:"f{rd}, f{rs1}, f{rs2}"; | ||||
|             // F[rd]f <= F[rs1]f + F[rs2]f; | ||||
|             val res[32] <= fdispatch_fadd_s(F[rs1]{32}, F[rs2]{32}, choose(rm<7, rm{8}, FCSR{8})); | ||||
|             if(FLEN==32) | ||||
| @@ -98,7 +98,7 @@ InsructionSet RV32F extends RV32IBase{ | ||||
|         } | ||||
|         FSUB.S { | ||||
|             encoding: b0000100 | rs2[4:0] | rs1[4:0] | rm[2:0] | rd[4:0] | b1010011; | ||||
|             args_disass:"f%rd$d, f%rs1$d, f%rs2$d"; | ||||
|             args_disass:"f{rd}, f{rs1}, f{rs2}"; | ||||
|             // F[rd]f <= F[rs1]f - F[rs2]f; | ||||
|             val res[32] <= fdispatch_fsub_s(F[rs1]{32}, F[rs2]{32}, choose(rm<7, rm{8}, FCSR{8})); | ||||
|             if(FLEN==32) | ||||
| @@ -112,7 +112,7 @@ InsructionSet RV32F extends RV32IBase{ | ||||
|         } | ||||
|         FMUL.S { | ||||
|             encoding: b0001000 | rs2[4:0] | rs1[4:0] | rm[2:0] | rd[4:0] | b1010011; | ||||
|             args_disass:"f%rd$d, f%rs1$d, f%rs2$d"; | ||||
|             args_disass:"f{rd}, f{rs1}, f{rs2}"; | ||||
|             // F[rd]f <= F[rs1]f * F[rs2]f; | ||||
|             val res[32] <= fdispatch_fmul_s(F[rs1]{32}, F[rs2]{32}, choose(rm<7, rm{8}, FCSR{8})); | ||||
|             if(FLEN==32) | ||||
| @@ -126,7 +126,7 @@ InsructionSet RV32F extends RV32IBase{ | ||||
|         } | ||||
|         FDIV.S { | ||||
|             encoding: b0001100 | rs2[4:0] | rs1[4:0] | rm[2:0] | rd[4:0] | b1010011; | ||||
|             args_disass:"f%rd$d, f%rs1$d, f%rs2$d"; | ||||
|             args_disass:"f{rd}, f{rs1}, f{rs2}"; | ||||
|             // F[rd]f <= F[rs1]f / F[rs2]f; | ||||
|             val res[32] <= fdispatch_fdiv_s(F[rs1]{32}, F[rs2]{32}, choose(rm<7, rm{8}, FCSR{8})); | ||||
|             if(FLEN==32) | ||||
| @@ -140,7 +140,7 @@ InsructionSet RV32F extends RV32IBase{ | ||||
|         } | ||||
|         FSQRT.S { | ||||
|             encoding: b0101100 | b00000 | rs1[4:0] | rm[2:0] | rd[4:0] | b1010011; | ||||
|             args_disass:"f%rd$d, f%rs1$d"; | ||||
|             args_disass:"f{rd}, f{rs1}"; | ||||
|             //F[rd]f<=sqrt(F[rs1]f); | ||||
|             val res[32] <= fdispatch_fsqrt_s(F[rs1]{32}, choose(rm<7, rm{8}, FCSR{8})); | ||||
|             if(FLEN==32) | ||||
| @@ -154,7 +154,7 @@ InsructionSet RV32F extends RV32IBase{ | ||||
|         } | ||||
|         FSGNJ.S { | ||||
|             encoding: b0010000 | rs2[4:0] | rs1[4:0] | b000 | rd[4:0] | b1010011; | ||||
|             args_disass:"f%rd$d, f%rs1$d, f%rs2$d"; | ||||
|             args_disass:"f{rd}, f{rs1}, f{rs2}"; | ||||
|             val res[32] <= (F[rs1]{32} & 0x7fffffff) | (F[rs2]{32} & 0x80000000); | ||||
|             if(FLEN==32) | ||||
|                 F[rd] <= res; | ||||
| @@ -165,7 +165,7 @@ InsructionSet RV32F extends RV32IBase{ | ||||
|         } | ||||
|         FSGNJN.S { | ||||
|             encoding: b0010000 | rs2[4:0] | rs1[4:0] | b001 | rd[4:0] | b1010011; | ||||
|             args_disass:"f%rd$d, f%rs1$d, f%rs2$d"; | ||||
|             args_disass:"f{rd}, f{rs1}, f{rs2}"; | ||||
|             val res[32] <= (F[rs1]{32} & 0x7fffffff) | (~F[rs2]{32} & 0x80000000); | ||||
|             if(FLEN==32) | ||||
|                 F[rd] <= res; | ||||
| @@ -176,7 +176,7 @@ InsructionSet RV32F extends RV32IBase{ | ||||
|         } | ||||
|         FSGNJX.S { | ||||
|             encoding: b0010000 | rs2[4:0] | rs1[4:0] | b010 | rd[4:0] | b1010011; | ||||
|             args_disass:"f%rd$d, f%rs1$d, f%rs2$d"; | ||||
|             args_disass:"f{rd}, f{rs1}, f{rs2}"; | ||||
|             val res[32] <= F[rs1]{32} ^ (F[rs2]{32} & 0x80000000); | ||||
|             if(FLEN==32) | ||||
|                 F[rd] <= res; | ||||
| @@ -187,7 +187,7 @@ InsructionSet RV32F extends RV32IBase{ | ||||
|         } | ||||
|         FMIN.S  { | ||||
|             encoding: b0010100 | rs2[4:0] | rs1[4:0] | b000 | rd[4:0] | b1010011; | ||||
|             args_disass:"f%rd$d, f%rs1$d, f%rs2$d"; | ||||
|             args_disass:"f{rd}, f{rs1}, f{rs2}"; | ||||
|             //F[rd]f<= choose(F[rs1]f<F[rs2]f, F[rs1]f, F[rs2]f); | ||||
|             val res[32] <= fdispatch_fsel_s(F[rs1]{32}, F[rs2]{32}, zext(0, 32)); | ||||
|             if(FLEN==32) | ||||
| @@ -201,7 +201,7 @@ InsructionSet RV32F extends RV32IBase{ | ||||
|         } | ||||
|         FMAX.S { | ||||
|             encoding: b0010100 | rs2[4:0] | rs1[4:0] | b001 | rd[4:0] | b1010011; | ||||
|             args_disass:"f%rd$d, f%rs1$d, f%rs2$d"; | ||||
|             args_disass:"f{rd}, f{rs1}, f{rs2}"; | ||||
|             //F[rd]f<= choose(F[rs1]f>F[rs2]f, F[rs1]f, F[rs2]f); | ||||
|             val res[32] <= fdispatch_fsel_s(F[rs1]{32}, F[rs2]{32}, zext(1, 32)); | ||||
|             if(FLEN==32) | ||||
| @@ -215,47 +215,47 @@ InsructionSet RV32F extends RV32IBase{ | ||||
|         } | ||||
|         FCVT.W.S { | ||||
|             encoding: b1100000 | b00000 | rs1[4:0] | rm[2:0] | rd[4:0] | b1010011; | ||||
|             args_disass:"x%rd$d, f%rs1$d"; | ||||
|             args_disass:"x{rd}, f{rs1}"; | ||||
|             X[rd]<= sext(fdispatch_fcvt_s(F[rs1]{32}, zext(0, 32), rm{8}), XLEN); | ||||
|             val flags[32] <= fdispatch_fget_flags(); | ||||
|             FCSR <= (FCSR & ~FFLAG_MASK) + flags{5}; | ||||
|         } | ||||
|         FCVT.WU.S { | ||||
|             encoding: b1100000 | b00001 | rs1[4:0] | rm[2:0] | rd[4:0] | b1010011; | ||||
|             args_disass:"x%rd$d, f%rs1$d"; | ||||
|             args_disass:"x{rd}, f{rs1}"; | ||||
|             X[rd]<= zext(fdispatch_fcvt_s(F[rs1]{32}, zext(1, 32), rm{8}), XLEN); | ||||
|             val flags[32] <= fdispatch_fget_flags(); | ||||
|             FCSR <= (FCSR & ~FFLAG_MASK) + flags{5}; | ||||
|         } | ||||
|         FEQ.S { | ||||
|             encoding: b1010000 | rs2[4:0] | rs1[4:0] | b010 | rd[4:0] | b1010011; | ||||
|             args_disass:"x%rd$d, f%rs1$d, f%rs2$d"; | ||||
|             args_disass:"x{rd}, f{rs1}, f{rs2}"; | ||||
|             X[rd]<=fdispatch_fcmp_s(F[rs1]{32}, F[rs2]{32}, zext(0, 32)); | ||||
|             val flags[32] <= fdispatch_fget_flags(); | ||||
|             FCSR <= (FCSR & ~FFLAG_MASK) + flags{5}; | ||||
|         } | ||||
|         FLT.S { | ||||
|             encoding: b1010000 | rs2[4:0] | rs1[4:0] | b001 | rd[4:0] | b1010011; | ||||
|             args_disass:"x%rd$d, f%rs1$d, f%rs2$d"; | ||||
|             args_disass:"x{rd}, f{rs1}, f{rs2}"; | ||||
|             X[rd]<=fdispatch_fcmp_s(F[rs1]{32}, F[rs2]{32}, zext(2, 32)); | ||||
|             val flags[32] <= fdispatch_fget_flags(); | ||||
|             FCSR <= (FCSR & ~FFLAG_MASK) + flags{5}; | ||||
|         } | ||||
|         FLE.S { | ||||
|             encoding: b1010000 | rs2[4:0] | rs1[4:0] | b000 | rd[4:0] | b1010011; | ||||
|             args_disass:"x%rd$d, f%rs1$d, f%rs2$d"; | ||||
|             args_disass:"x{rd}, f{rs1}, f{rs2}"; | ||||
|             X[rd]<=fdispatch_fcmp_s(F[rs1]{32}, F[rs2]{32}, zext(1, 32)); | ||||
|             val flags[32] <= fdispatch_fget_flags(); | ||||
|             FCSR <= (FCSR & ~FFLAG_MASK) + flags{5}; | ||||
|         } | ||||
|         FCLASS.S { | ||||
|             encoding: b1110000 | b00000 | rs1[4:0] | b001 | rd[4:0] | b1010011; | ||||
|             args_disass:"x%rd$d, f%rs1$d"; | ||||
|             args_disass:"x{rd}, f{rs1}"; | ||||
|             X[rd]<=fdispatch_fclass_s(F[rs1]{32}); | ||||
|         } | ||||
|         FCVT.S.W { | ||||
|             encoding: b1101000 | b00000 | rs1[4:0] | rm[2:0] | rd[4:0] | b1010011; | ||||
|             args_disass:"f%rd$d, x%rs1$d"; | ||||
|             args_disass:"f{rd}, x{rs1}"; | ||||
|             val res[32] <= fdispatch_fcvt_s(X[rs1]{32}, zext(2, 32), rm{8}); | ||||
|             if(FLEN==32) | ||||
|                 F[rd] <= res; | ||||
| @@ -266,7 +266,7 @@ InsructionSet RV32F extends RV32IBase{ | ||||
|         } | ||||
|         FCVT.S.WU { | ||||
|             encoding: b1101000 | b00001 | rs1[4:0] | rm[2:0] | rd[4:0] | b1010011; | ||||
|             args_disass:"f%rd$d, x%rs1$d"; | ||||
|             args_disass:"f{rd}, x{rs1}"; | ||||
|             val res[32] <=fdispatch_fcvt_s(X[rs1]{32}, zext(3,32), rm{8}); | ||||
|             if(FLEN==32) | ||||
|                 F[rd] <= res; | ||||
| @@ -277,12 +277,12 @@ InsructionSet RV32F extends RV32IBase{ | ||||
|         } | ||||
|         FMV.X.W { | ||||
|             encoding: b1110000 | b00000 | rs1[4:0] | b000 | rd[4:0] | b1010011; | ||||
|             args_disass:"x%rd$d, f%rs1$d"; | ||||
|             args_disass:"x{rd}, f{rs1}"; | ||||
|             X[rd]<=sext(F[rs1]{32}); | ||||
|         } | ||||
|         FMV.W.X { | ||||
|             encoding: b1111000 | b00000 | rs1[4:0] | b000 | rd[4:0] | b1010011; | ||||
|             args_disass:"f%rd$d, x%rs1$d"; | ||||
|             args_disass:"f{rd}, x{rs1}"; | ||||
|             if(FLEN==32) | ||||
|                 F[rd] <= X[rs1]; | ||||
|             else { // NaN boxing | ||||
|   | ||||
		Reference in New Issue
	
	Block a user