vhaudiquet/vriscv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ZICSR mock implementation

Browse Source
This commit is contained in:
Valentin Haudiquet 2023-10-05 19:52:59 +02:00
parent ad3ec2e504
commit 1b068529c8
2 changed files with 76 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/cpu/instruction.h
View File

@ -60,7 +60,16 @@
#define FUNC3_OR 0x7 #define FUNC3_OR 0x7
#define FUNC3_AND 0x8 #define FUNC3_AND 0x8
/* OPCODE_SYSTEM sub functions (func3 + imm) */
#define FUNC3_ECALL_EBREAK 0x0
#define IMM_ECALL 0x0 #define IMM_ECALL 0x0
#define IMM_EBREAK 0x1 #define IMM_EBREAK 0x1
/* RISC-V RV32 ZICSR Extension */
#define FUNC3_CSRRW 0x1
#define FUNC3_CSRRS 0x2
#define FUNC3_CSRRC 0x3
#define FUNC3_CSRRWI 0x5
#define FUNC3_CSRRSI 0x6
#define FUNC3_CSRRCI 0x7
#endif #endif

59
src/cpu/rv32cpu.c
View File

@ -417,6 +417,9 @@ static void cpu_execute(rv32_cpu_t* cpu, instruction_t* instruction)
} }
case OPCODE_SYSTEM: case OPCODE_SYSTEM:
{ {
switch(instruction->func3)
{
case FUNC3_ECALL_EBREAK:
switch(instruction->immediate) switch(instruction->immediate)
{ {
case IMM_ECALL: case IMM_ECALL:
@ -426,10 +429,35 @@ static void cpu_execute(rv32_cpu_t* cpu, instruction_t* instruction)
fprintf(stderr, "EBREAK\n"); fprintf(stderr, "EBREAK\n");
break; break;
default: default:
fprintf(stderr, "FATAL: Unknown SYSTEM instruction while executing (IMM=0x%x)\n", instruction->immediate); fprintf(stderr, "FATAL: Unknown IMM for ECALL/EBREAK instruction while executing (IMM=0x%x)\n", instruction->immediate);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
break; break;
} }
break;
case FUNC3_CSRRW:
fprintf(stderr, "CSRRW\n");
break;
case FUNC3_CSRRS:
fprintf(stderr, "CSRRS\n");
break;
case FUNC3_CSRRC:
fprintf(stderr, "CSRRC\n");
break;
case FUNC3_CSRRWI:
fprintf(stderr, "CSRRWI\n");
break;
case FUNC3_CSRRSI:
fprintf(stderr, "CSRRSI\n");
break;
case FUNC3_CSRRCI:
fprintf(stderr, "CSRRCI\n");
break;
default:
fprintf(stderr, "FATAL: Unknown func3 0x%x for SYSTEM instruction while executing\n", instruction->func3);
exit(EXIT_FAILURE);
break;
}
break; break;
} }
default: default:
@ -456,6 +484,7 @@ void cpu_loop(rv32_cpu_t* cpu)
instruction_t instruction; instruction_t instruction;
cpu_decode(raw_instruction, &instruction); cpu_decode(raw_instruction, &instruction);
printf("0x%x: ", cpu->pc);
cpu_print_instruction(&instruction); cpu_print_instruction(&instruction);
// Execute // Execute
@ -730,6 +759,9 @@ static void cpu_print_instruction(instruction_t* instruction)
} }
case OPCODE_SYSTEM: case OPCODE_SYSTEM:
{ {
switch(instruction->func3)
{
case FUNC3_ECALL_EBREAK:
switch(instruction->immediate) switch(instruction->immediate)
{ {
case IMM_ECALL: case IMM_ECALL:
@ -739,7 +771,30 @@ static void cpu_print_instruction(instruction_t* instruction)
printf("ebreak\n"); printf("ebreak\n");
break; break;
default: default:
fprintf(stderr, "Warning: Unknown SYSTEM instruction (IMM=0x%x)\n", instruction->immediate); fprintf(stderr, "Warning: Unknown IMM for ECALL/EBREAK instruction (IMM=0x%x)\n", instruction->immediate);
break;
}
break;
case FUNC3_CSRRW:
printf("csrrw csr[0x%x], x%u, x%u\n", instruction->immediate, instruction->rd, instruction->rs1);
break;
case FUNC3_CSRRS:
printf("csrrs csr[0x%x], x%u, x%u\n", instruction->immediate, instruction->rd, instruction->rs1);
break;
case FUNC3_CSRRC:
printf("csrrc csr[0x%x], x%u, x%u\n", instruction->immediate, instruction->rd, instruction->rs1);
break;
case FUNC3_CSRRWI:
printf("csrrwi csr[0x%x], x%u, 0x%x\n", instruction->immediate, instruction->rd, instruction->rs1);
break;
case FUNC3_CSRRSI:
printf("csrrsi csr[0x%x], x%u, 0x%x\n", instruction->immediate, instruction->rd, instruction->rs1);
break;
case FUNC3_CSRRCI:
printf("csrrci csr[0x%x], x%u, 0x%x\n", instruction->immediate, instruction->rd, instruction->rs1);
break;
default:
fprintf(stderr, "Warning: Unknown func3 0x%x for SYSTEM instruction\n", instruction->func3);
break; break;
} }
break; break;