Skip to content

Commit 568d79c

Browse files
EmbroiderSnowEmbroiderSnow
committed
feat(debug): si command print current instruction in pc
1 parent 29d4733 commit 568d79c

File tree

3 files changed

+130
-11
lines changed

3 files changed

+130
-11
lines changed

‎sim/include/decode.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ typedef struct {
88
uint32_t inst;
99
} Decode;
1010

11+
// This is a DECLARATION
12+
extern const char* riscv_abi_names[32];
13+
1114
void decode_exec(Decode *s);
15+
void disassemble(Decode *s, char *asm_buf);
1216

1317
#endif

‎sim/src/dbg.c‎

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
#include <memory.h>
33
#include <common.h>
44
#include <dbg.h>
5-
6-
const char* riscv_abi_names[32] = {
7-
"zero", "ra", "sp", "gp", "tp", "t0", "t1", "t2",
8-
"s0", "s1", "a0", "a1", "a2", "a3", "a4", "a5",
9-
"a6", "a7", "s2", "s3", "s4", "s5", "s6", "s7",
10-
"s8", "s9", "s10","s11","t3","t4","t5","t6"
11-
};
5+
#include <decode.h>
126

137
static void cmd_help() {
148
printf("Available commands:\n");
@@ -28,10 +22,24 @@ static void cmd_quit() {
2822
exit(0);
2923
}
3024

31-
static void cmd_step(int stemps) {
32-
for (int i = 0; i < stemps; ++i) {
33-
exec_once();
34-
// TODO: print pc and current instruction
25+
static void cmd_step(int steps) {
26+
for (int i = 0; i < steps; ++i) {
27+
uint64_t current_pc = cpu.pc;
28+
uint32_t inst_code = mem_read(current_pc, 4);
29+
30+
// Prepare for disassembly
31+
Decode s;
32+
s.pc = current_pc;
33+
s.inst = inst_code;
34+
35+
char asm_buf[128]; // Buffer to hold the disassembled instruction
36+
disassemble(&s, asm_buf);
37+
38+
// Print the address and the disassembled instruction
39+
printf("\33[1;34m=> 0x%016lx\33[1;0m: \t%s\n", current_pc, asm_buf);
40+
41+
// Execute the instruction
42+
exec_once();
3543
}
3644
}
3745

‎sim/src/decode.c‎

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,3 +158,110 @@ void decode_exec(Decode *s){
158158

159159
return;
160160
}
161+
162+
const char* riscv_abi_names[32] = {
163+
"zero", "ra", "sp", "gp", "tp", "t0", "t1", "t2",
164+
"s0", "s1", "a0", "a1", "a2", "a3", "a4", "a5",
165+
"a6", "a7", "s2", "s3", "s4", "s5", "s6", "s7",
166+
"s8", "s9", "s10","s11","t3","t4","t5","t6"
167+
};
168+
169+
void disassemble(Decode *s, char *asm_buf) {
170+
int rd = 0;
171+
uint64_t src1 = 0, src2 = 0, imm = 0;
172+
// Extract rs1 and rs2 register indices from the instruction word
173+
int rs1_idx = (s->inst >> 15) & 0x1F;
174+
int rs2_idx = (s->inst >> 20) & 0x1F;
175+
176+
#define INSTPAT_INST(s) ((s)->inst)
177+
#define INSTPAT_MATCH(s, name, type, ... /* sprintf body */ ) { \
178+
decode_operand(s, &rd, &src1, &src2, &imm, concat(TYPE_, type)); \
179+
__VA_ARGS__ ; \
180+
}
181+
182+
INSTPAT_START();
183+
// RV64I
184+
INSTPAT("??????? ????? ????? ??? ????? 01101 11", lui, U, sprintf(asm_buf, "lui %s, 0x%lx", riscv_abi_names[rd], imm));
185+
INSTPAT("??????? ????? ????? ??? ????? 00101 11", auipc, U, sprintf(asm_buf, "auipc %s, 0x%lx", riscv_abi_names[rd], imm));
186+
INSTPAT("??????? ????? ????? ??? ????? 11011 11", jal, J, sprintf(asm_buf, "jal %s, 0x%lx", riscv_abi_names[rd], s->pc + imm));
187+
INSTPAT("??????? ????? ????? 000 ????? 11001 11", jalr, I, sprintf(asm_buf, "jalr %s, %s, %ld", riscv_abi_names[rd], riscv_abi_names[rs1_idx], imm));
188+
// BEQ, BNE, BLT, BGE, BLTU, BGEU - printing target address
189+
INSTPAT("??????? ????? ????? 000 ????? 11000 11", beq, B, sprintf(asm_buf, "beq %s, %s, 0x%lx", riscv_abi_names[rs1_idx], riscv_abi_names[rs2_idx], s->pc + imm));
190+
INSTPAT("??????? ????? ????? 001 ????? 11000 11", bne, B, sprintf(asm_buf, "bne %s, %s, 0x%lx", riscv_abi_names[rs1_idx], riscv_abi_names[rs2_idx], s->pc + imm));
191+
INSTPAT("??????? ????? ????? 100 ????? 11000 11", blt, B, sprintf(asm_buf, "blt %s, %s, 0x%lx", riscv_abi_names[rs1_idx], riscv_abi_names[rs2_idx], s->pc + imm));
192+
INSTPAT("??????? ????? ????? 101 ????? 11000 11", bge, B, sprintf(asm_buf, "bge %s, %s, 0x%lx", riscv_abi_names[rs1_idx], riscv_abi_names[rs2_idx], s->pc + imm));
193+
INSTPAT("??????? ????? ????? 110 ????? 11000 11", bltu, B, sprintf(asm_buf, "bltu %s, %s, 0x%lx", riscv_abi_names[rs1_idx], riscv_abi_names[rs2_idx], s->pc + imm));
194+
INSTPAT("??????? ????? ????? 111 ????? 11000 11", bgeu, B, sprintf(asm_buf, "bgeu %s, %s, 0x%lx", riscv_abi_names[rs1_idx], riscv_abi_names[rs2_idx], s->pc + imm));
195+
// LB, LH, LW, LBU, LHU, LWU, LD - in format offset(base)
196+
INSTPAT("??????? ????? ????? 000 ????? 00000 11", lb, I, sprintf(asm_buf, "lb %s, %ld(%s)", riscv_abi_names[rd], imm, riscv_abi_names[rs1_idx]));
197+
INSTPAT("??????? ????? ????? 001 ????? 00000 11", lh, I, sprintf(asm_buf, "lh %s, %ld(%s)", riscv_abi_names[rd], imm, riscv_abi_names[rs1_idx]));
198+
INSTPAT("??????? ????? ????? 010 ????? 00000 11", lw, I, sprintf(asm_buf, "lw %s, %ld(%s)", riscv_abi_names[rd], imm, riscv_abi_names[rs1_idx]));
199+
INSTPAT("??????? ????? ????? 100 ????? 00000 11", lbu, I, sprintf(asm_buf, "lbu %s, %ld(%s)", riscv_abi_names[rd], imm, riscv_abi_names[rs1_idx]));
200+
INSTPAT("??????? ????? ????? 101 ????? 00000 11", lhu, I, sprintf(asm_buf, "lhu %s, %ld(%s)", riscv_abi_names[rd], imm, riscv_abi_names[rs1_idx]));
201+
INSTPAT("??????? ????? ????? 110 ????? 00000 11", lwu, I, sprintf(asm_buf, "lwu %s, %ld(%s)", riscv_abi_names[rd], imm, riscv_abi_names[rs1_idx]));
202+
INSTPAT("??????? ????? ????? 011 ????? 00000 11", ld, I, sprintf(asm_buf, "ld %s, %ld(%s)", riscv_abi_names[rd], imm, riscv_abi_names[rs1_idx]));
203+
// SB, SH, SW, SD - in format offset(base)
204+
INSTPAT("??????? ????? ????? 000 ????? 01000 11", sb, S, sprintf(asm_buf, "sb %s, %ld(%s)", riscv_abi_names[rs2_idx], imm, riscv_abi_names[rs1_idx]));
205+
INSTPAT("??????? ????? ????? 001 ????? 01000 11", sh, S, sprintf(asm_buf, "sh %s, %ld(%s)", riscv_abi_names[rs2_idx], imm, riscv_abi_names[rs1_idx]));
206+
INSTPAT("??????? ????? ????? 010 ????? 01000 11", sw, S, sprintf(asm_buf, "sw %s, %ld(%s)", riscv_abi_names[rs2_idx], imm, riscv_abi_names[rs1_idx]));
207+
INSTPAT("??????? ????? ????? 011 ????? 01000 11", sd, S, sprintf(asm_buf, "sd %s, %ld(%s)", riscv_abi_names[rs2_idx], imm, riscv_abi_names[rs1_idx]));
208+
INSTPAT("??????? ????? ????? 000 ????? 00100 11", addi, I, sprintf(asm_buf, "addi %s, %s, %ld", riscv_abi_names[rd], riscv_abi_names[rs1_idx], imm));
209+
// SLTI, SLTIU
210+
INSTPAT("??????? ????? ????? 010 ????? 00100 11", slti, I, sprintf(asm_buf, "slti %s, %s, %ld", riscv_abi_names[rd], riscv_abi_names[rs1_idx], imm));
211+
INSTPAT("??????? ????? ????? 011 ????? 00100 11", sltiu, I, sprintf(asm_buf, "sltiu %s, %s, %ld", riscv_abi_names[rd], riscv_abi_names[rs1_idx], imm));
212+
// SLLI, SRLI, SRAI, SLLIW, SRLIW, SRAIW
213+
INSTPAT("000000? ????? ????? 001 ????? 00100 11", slli, I, sprintf(asm_buf, "slli %s, %s, %ld", riscv_abi_names[rd], riscv_abi_names[rs1_idx], imm & 0x3f));
214+
INSTPAT("000000? ????? ????? 101 ????? 00100 11", srli, I, sprintf(asm_buf, "srli %s, %s, %ld", riscv_abi_names[rd], riscv_abi_names[rs1_idx], imm & 0x3f));
215+
INSTPAT("010000? ????? ????? 101 ????? 00100 11", srai, I, sprintf(asm_buf, "srai %s, %s, %ld", riscv_abi_names[rd], riscv_abi_names[rs1_idx], imm & 0x3f));
216+
INSTPAT("0000000 ????? ????? 001 ????? 00110 11", slliw, I, sprintf(asm_buf, "slliw %s, %s, %ld", riscv_abi_names[rd], riscv_abi_names[rs1_idx], imm & 0x1f));
217+
INSTPAT("0000000 ????? ????? 101 ????? 00110 11", srliw, I, sprintf(asm_buf, "srliw %s, %s, %ld", riscv_abi_names[rd], riscv_abi_names[rs1_idx], imm & 0x1f));
218+
INSTPAT("0100000 ????? ????? 101 ????? 00110 11", sraiw, I, sprintf(asm_buf, "sraiw %s, %s, %ld", riscv_abi_names[rd], riscv_abi_names[rs1_idx], imm & 0x1f));
219+
// XORI, ORI, ANDI, ADDIW
220+
INSTPAT("??????? ????? ????? 100 ????? 00100 11", xori, I, sprintf(asm_buf, "xori %s, %s, %ld", riscv_abi_names[rd], riscv_abi_names[rs1_idx], imm));
221+
INSTPAT("??????? ????? ????? 110 ????? 00100 11", ori, I, sprintf(asm_buf, "ori %s, %s, %ld", riscv_abi_names[rd], riscv_abi_names[rs1_idx], imm));
222+
INSTPAT("??????? ????? ????? 111 ????? 00100 11", andi, I, sprintf(asm_buf, "andi %s, %s, %ld", riscv_abi_names[rd], riscv_abi_names[rs1_idx], imm));
223+
INSTPAT("??????? ????? ????? 000 ????? 00110 11", addiw, I, sprintf(asm_buf, "addiw %s, %s, %ld", riscv_abi_names[rd], riscv_abi_names[rs1_idx], imm));
224+
// ADD, SUB, SLL, SLT, SLTU, XOR, SRL, SRA, OR, AND
225+
INSTPAT("0000000 ????? ????? 000 ????? 01100 11", add, R, sprintf(asm_buf, "add %s, %s, %s", riscv_abi_names[rd], riscv_abi_names[rs1_idx], riscv_abi_names[rs2_idx]));
226+
INSTPAT("0100000 ????? ????? 000 ????? 01100 11", sub, R, sprintf(asm_buf, "sub %s, %s, %s", riscv_abi_names[rd], riscv_abi_names[rs1_idx], riscv_abi_names[rs2_idx]));
227+
INSTPAT("0000000 ????? ????? 001 ????? 01100 11", sll, R, sprintf(asm_buf, "sll %s, %s, %s", riscv_abi_names[rd], riscv_abi_names[rs1_idx], riscv_abi_names[rs2_idx]));
228+
INSTPAT("0000000 ????? ????? 010 ????? 01100 11", slt, R, sprintf(asm_buf, "slt %s, %s, %s", riscv_abi_names[rd], riscv_abi_names[rs1_idx], riscv_abi_names[rs2_idx]));
229+
INSTPAT("0000000 ????? ????? 011 ????? 01100 11", sltu, R, sprintf(asm_buf, "sltu %s, %s, %s", riscv_abi_names[rd], riscv_abi_names[rs1_idx], riscv_abi_names[rs2_idx]));
230+
INSTPAT("0000000 ????? ????? 100 ????? 01100 11", xor, R, sprintf(asm_buf, "xor %s, %s, %s", riscv_abi_names[rd], riscv_abi_names[rs1_idx], riscv_abi_names[rs2_idx]));
231+
INSTPAT("0000000 ????? ????? 101 ????? 01100 11", srl, R, sprintf(asm_buf, "srl %s, %s, %s", riscv_abi_names[rd], riscv_abi_names[rs1_idx], riscv_abi_names[rs2_idx]));
232+
INSTPAT("0100000 ????? ????? 101 ????? 01100 11", sra, R, sprintf(asm_buf, "sra %s, %s, %s", riscv_abi_names[rd], riscv_abi_names[rs1_idx], riscv_abi_names[rs2_idx]));
233+
INSTPAT("0000000 ????? ????? 110 ????? 01100 11", or, R, sprintf(asm_buf, "or %s, %s, %s", riscv_abi_names[rd], riscv_abi_names[rs1_idx], riscv_abi_names[rs2_idx]));
234+
INSTPAT("0000000 ????? ????? 111 ????? 01100 11", and, R, sprintf(asm_buf, "and %s, %s, %s", riscv_abi_names[rd], riscv_abi_names[rs1_idx], riscv_abi_names[rs2_idx]));
235+
// ADDW, SUBW, SLLW, SRLW, SRAW
236+
INSTPAT("0000000 ????? ????? 000 ????? 01110 11", addw, R, sprintf(asm_buf, "addw %s, %s, %s", riscv_abi_names[rd], riscv_abi_names[rs1_idx], riscv_abi_names[rs2_idx]));
237+
INSTPAT("0100000 ????? ????? 000 ????? 01110 11", subw, R, sprintf(asm_buf, "subw %s, %s, %s", riscv_abi_names[rd], riscv_abi_names[rs1_idx], riscv_abi_names[rs2_idx]));
238+
INSTPAT("0000000 ????? ????? 001 ????? 01110 11", sllw, R, sprintf(asm_buf, "sllw %s, %s, %s", riscv_abi_names[rd], riscv_abi_names[rs1_idx], riscv_abi_names[rs2_idx]));
239+
INSTPAT("0000000 ????? ????? 101 ????? 01110 11", srlw, R, sprintf(asm_buf, "srlw %s, %s, %s", riscv_abi_names[rd], riscv_abi_names[rs1_idx], riscv_abi_names[rs2_idx]));
240+
INSTPAT("0100000 ????? ????? 101 ????? 01110 11", sraw, R, sprintf(asm_buf, "sraw %s, %s, %s", riscv_abi_names[rd], riscv_abi_names[rs1_idx], riscv_abi_names[rs2_idx]));
241+
// FENCE, FENCE.I, EBREAK, ECALL
242+
INSTPAT("0000??? ????? 00000 000 00000 00011 11", fence, N, sprintf(asm_buf, "fence"));
243+
INSTPAT("0000000 00000 00000 000 00000 00011 11", fencei, N, sprintf(asm_buf, "fence.i"));
244+
INSTPAT("0000000 00001 00000 000 00000 11100 11", ebreak, N, sprintf(asm_buf, "ebreak"));
245+
INSTPAT("0000000 00000 00000 000 00000 11100 11", ecall, N, sprintf(asm_buf, "ecall"));
246+
247+
// RV64M
248+
// MUL, MULH, MULHSU, MULHU, DIV, DIVU, REM, REMU
249+
INSTPAT("0000001 ????? ????? 000 ????? 01100 11", mul, R, sprintf(asm_buf, "mul %s, %s, %s", riscv_abi_names[rd], riscv_abi_names[rs1_idx], riscv_abi_names[rs2_idx]));
250+
INSTPAT("0000001 ????? ????? 001 ????? 01100 11", mulh, R, sprintf(asm_buf, "mulh %s, %s, %s", riscv_abi_names[rd], riscv_abi_names[rs1_idx], riscv_abi_names[rs2_idx]));
251+
INSTPAT("0000001 ????? ????? 010 ????? 01100 11", mulhsu, R, sprintf(asm_buf, "mulhsu %s, %s, %s", riscv_abi_names[rd], riscv_abi_names[rs1_idx], riscv_abi_names[rs2_idx]));
252+
INSTPAT("0000001 ????? ????? 011 ????? 01100 11", mulhu, R, sprintf(asm_buf, "mulhu %s, %s, %s", riscv_abi_names[rd], riscv_abi_names[rs1_idx], riscv_abi_names[rs2_idx]));
253+
INSTPAT("0000001 ????? ????? 100 ????? 01100 11", div, R, sprintf(asm_buf, "div %s, %s, %s", riscv_abi_names[rd], riscv_abi_names[rs1_idx], riscv_abi_names[rs2_idx]));
254+
INSTPAT("0000001 ????? ????? 101 ????? 01100 11", divu, R, sprintf(asm_buf, "divu %s, %s, %s", riscv_abi_names[rd], riscv_abi_names[rs1_idx], riscv_abi_names[rs2_idx]));
255+
INSTPAT("0000001 ????? ????? 110 ????? 01100 11", rem, R, sprintf(asm_buf, "rem %s, %s, %s", riscv_abi_names[rd], riscv_abi_names[rs1_idx], riscv_abi_names[rs2_idx]));
256+
INSTPAT("0000001 ????? ????? 111 ????? 01100 11", remu, R, sprintf(asm_buf, "remu %s, %s, %s", riscv_abi_names[rd], riscv_abi_names[rs1_idx], riscv_abi_names[rs2_idx]));
257+
// MULW, DIVW, DIVUW, REMW, REMUW
258+
INSTPAT("0000001 ????? ????? 000 ????? 01110 11", mulw, R, sprintf(asm_buf, "mulw %s, %s, %s", riscv_abi_names[rd], riscv_abi_names[rs1_idx], riscv_abi_names[rs2_idx]));
259+
INSTPAT("0000001 ????? ????? 100 ????? 01110 11", divw, R, sprintf(asm_buf, "divw %s, %s, %s", riscv_abi_names[rd], riscv_abi_names[rs1_idx], riscv_abi_names[rs2_idx]));
260+
INSTPAT("0000001 ????? ????? 101 ????? 01110 11", divuw, R, sprintf(asm_buf, "divuw %s, %s, %s", riscv_abi_names[rd], riscv_abi_names[rs1_idx], riscv_abi_names[rs2_idx]));
261+
INSTPAT("0000001 ????? ????? 110 ????? 01110 11", remw, R, sprintf(asm_buf, "remw %s, %s, %s", riscv_abi_names[rd], riscv_abi_names[rs1_idx], riscv_abi_names[rs2_idx]));
262+
INSTPAT("0000001 ????? ????? 111 ????? 01110 11", remuw, R, sprintf(asm_buf, "remuw %s, %s, %s", riscv_abi_names[rd], riscv_abi_names[rs1_idx], riscv_abi_names[rs2_idx]));
263+
264+
// Invalid Opcode
265+
INSTPAT("??????? ????? ????? ??? ????? ????? ??", unk, N, sprintf(asm_buf, "unknown instruction"));
266+
INSTPAT_END();
267+
}

0 commit comments

Comments
 (0)