Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions .github/workflows/ci-compile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,6 @@ jobs:
path: ~/.conan2
key: conan-${{ runner.os }}-unit-cpp${{ matrix.cpp_std }}-${{ hashFiles('conanfile.py') }}

- name: Cache Conan
uses: actions/cache@v4
with:
path: ~/.conan2
key: conan-${{ runner.os }}-unit-cpp${{ matrix.cpp_std }}-${{ hashFiles('conanfile.py') }}

- name: Install dependencies
run: |
sudo apt-get update
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ if(NOT TARGET dbt-rise-core)
dbt_rise_core_git
GIT_REPOSITORY "https://github.com/Minres/DBT-RISE-Core.git"
#GIT_TAG "origin/develop"
GIT_TAG cc0de2d
GIT_TAG 97c8150
GIT_SHALLOW OFF
UPDATE_DISCONNECTED NOT ${UPDATE_EXTERNAL_PROJECT} # When enabled, this option causes the update step to be skipped.
)
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
[![CI C++ Std compliance](https://github.com/Minres/DBT-RISE-RISCV/actions/workflows/ci-compile.yml/badge.svg)](https://github.com/Minres/DBT-RISE-RISCV/actions/workflows/ci-compile.yml)

# DBT-RISE-RISCV
A instruction set simulator based on DBT-RISE implementing the RISC-V ISA.
The project is hosted at https://github.com/Minres/DBT-RISE-RISCV .
Expand Down
12 changes: 6 additions & 6 deletions conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@ class Pkg(ConanFile):
}

def requirements(self):
self.requires("fmt/8.0.1")
self.requires("spdlog/1.9.2")
self.requires("fmt/12.0.0")
self.requires("spdlog/1.16.0")
self.requires("boost/1.85.0")
self.requires("elfio/3.11")
self.requires("lz4/1.9.3")
self.requires("yaml-cpp/0.7.0")
self.requires("jsoncpp/1.9.5")
self.requires("elfio/3.12")
self.requires("lz4/1.10.0")
self.requires("yaml-cpp/0.8.0")
self.requires("jsoncpp/1.9.6")
self.requires("zlib/1.3.1")
self.requires("asmjit/cci.20240531")
if "WITH_LLVM" in os.environ:
Expand Down
2 changes: 1 addition & 1 deletion src/iss/mem/clic.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
* eyck@minres.com - initial implementation
******************************************************************************/

#include "memory_if.h"
#include "iss/arch/riscv_hart_common.h"
#include "iss/vm_types.h"
#include "memory_if.h"
#include <util/logging.h>

namespace iss {
Expand Down