github-mirrors/cva6
1
0
Fork 0
mirror of https://github.com/openhwgroup/cva6.git synced 2025-04-22 13:17:41 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

[Spike upgrade] Update CV-X-IF support code to match latest Spike API.

Browse source 
* vendor/riscv/riscv-isa-sim/customext/cvxif.cc (toplevel): Include new
  header.
  (cvxif_t::do_writeback_p): Replace deprecated (?) MATCH_CUSTOM3 with the
  corresponding numerical value.
  (cvxif_t::custom_3): Use templated load and store methods.
* vendor/riscv/riscv-isa-sim/riscv/cvxif_base.cc (toplevel): Include new
  header.
This commit is contained in:
Zbigniew Chamski 2023-05-10 16:48:46 +02:00
parent 8e259f210e
commit d1191395d1
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
vendor/riscv/riscv-isa-sim/customext/cvxif.cc vendored
View file

@ -4,6 +4,8 @@
//
// Original Author: Zbigniew CHAMSKI <zbigniew.chamski@thalesgroup.com>
#define DECODE_MACRO_USAGE_LOGGED 1
#include "decode_macros.h"
#include "cvxif.h"
#include "mmu.h"
#include <cstring>
@ -43,7 +45,7 @@ class cvxif_t : public cvxif_extn_t
// INSN_R personality serves to simplify access to standard encoding fields.
cvxif_r_insn_t insn_r = copro_insn.r_type;
if (insn_r.opcode != MATCH_CUSTOM3)
if (insn_r.opcode != 0x7b /* MATCH_CUSTOM3 */)
return false;
else switch (insn_r.funct3)
{
@ -148,16 +150,16 @@ class cvxif_t : public cvxif_extn_t
case 1:
// Perform RV load. If runtime XLEN is not 64, assume 32.
if (p->get_xlen() == 64)
return MMU.load_int64(RS1 + insn.i_imm());
return MMU.load<int64_t>(RS1 + insn.i_imm());
else
return MMU.load_int32(RS1 + insn.i_imm());
return MMU.load<int32_t>(RS1 + insn.i_imm());
case 2:
// Perform RV store. If runtime XLEN is not 64, assume 32.
if (p->get_xlen() == 64)
MMU.store_uint64(RS1 + insn.s_imm(), RS2);
MMU.store<uint64_t>(RS1 + insn.s_imm(), RS2);
else
MMU.store_uint32(RS1 + insn.s_imm(), RS2);
MMU.store<uint32_t>(RS1 + insn.s_imm(), RS2);
// Writeback will be disabled by 'do_writeback_p'.
break;

2
vendor/riscv/riscv-isa-sim/riscv/cvxif_base.cc vendored
View file

@ -4,6 +4,8 @@
//
// Original Author: Zbigniew CHAMSKI <zbigniew.chamski@thalesgroup.com>
#define DECODE_MACRO_USAGE_LOGGED 1
#include "decode_macros.h"
#include "cvxif.h"
#include "trap.h"
#include <cstdlib>