fix: decode enum and main func

Author: EmbroiderSnow

sim/src/decode.c

@@ -14,8 +14,7 @@ extern CPU_state cpu;
 #define NOP do {} while(0)
 
 enum {
-  TYPE_I, TYPE_U, TYPE_S,
-  TYPE_N, TYPE_J
+    TYPE_R, TYPE_I, TYPE_S, TYPE_B, TYPE_U, TYPE_J, TYPE_N
 };
 
 #define src1R() do { *src1 = R(rs1); } while (0)
@@ -27,7 +26,7 @@ enum {
                                 BITS(i, 20, 20) << 11 | \
                                 BITS(i, 30, 21) << 1, 21);} while(0)
 #define immS() do { *imm = (SEXT(BITS(i, 31, 25), 7) << 5) | BITS(i, 11, 7); } while(0)
-#define immB() do { *imm = (SEXT(BITS(i, 31, 31) << 12 | \
+#define immB() do { *imm = SEXT(BITS(i, 31, 31) << 12 | \
                                 BITS(i, 7, 7) << 11 | \
                                 BITS(i, 30, 25) << 5 | \
                                 BITS(i, 11, 8) << 1, 13);} while(0)
@@ -40,10 +39,10 @@ static void decode_operand(Decode *s, int *rd, uint64_t *src1, uint64_t *src2, u
     switch(type) {
         case TYPE_R: src1R(); src2R();         break;
         case TYPE_I: src1R();          immI(); break;
-        case TYPE_U:                   immU(); break;
-        case TYPE_J:                   immJ(); break;
         case TYPE_S: src1R(); src2R(); immS(); break;
         case TYPE_B: src1R(); src2R(); immB(); break;
+        case TYPE_U:                   immU(); break;
+        case TYPE_J:                   immJ(); break;
     }
 }
 void decode_exec(Decode *s){
@@ -116,8 +115,8 @@ void decode_exec(Decode *s){
     INSTPAT("0000000 ????? ????? 101 ????? 01110 11", srlw   , R, R(rd) = SEXT((uint32_t)src1 >> (src2 & 0x1f), 32));
     INSTPAT("0100000 ????? ????? 101 ????? 01110 11", sraw   , R, R(rd) = SEXT((int32_t)src1 >> (src2 & 0x1f), 32));
     // FENCE, FENCE.I
-    INSTPAT("0000??? ????? 00000 000 00000 00011 11", fence  , I, NOP);
-    INSTPAT("0000000 00000 00000 000 00000 00011 11", fencei , I, NOP);
+    INSTPAT("0000??? ????? 00000 000 00000 00011 11", fence  , N, NOP);
+    INSTPAT("0000000 00000 00000 000 00000 00011 11", fencei , N, NOP);
     // ECALL
     INSTPAT("0000000 00001 00000 000 00000 11100 11", ebreak , N, HALT(s->pc, R(10))); // R(10) is $a0
     // CSRRW, CSRRS, CSRRC, CSRRWI, CSRRSI, CSRRCI

sim/src/main.c

@@ -18,7 +18,7 @@ int main(int argc, char *argv[]){
     if (argc > 2 && strcmp(argv[2], "-d") == 0) {
         debug_loop();
     }
-    else if (argc > 2 && strcmp(argv[2], "-b") == 9) {
+    else if (argc > 2 && strcmp(argv[2], "-b") == 0) {
         cpu_exec();
     }
     else {