Re-organize and provide .pc file for packaging

examples/package/CMakeLists.txt

@@ -1,8 +1,8 @@
 cmake_minimum_required(VERSION 3.5)
 project(example LANGUAGES CXX)
 
-find_package(PkgConfig)
-pkg_check_modules(libriscv REQUIRED)
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(libriscv REQUIRED IMPORTED_TARGET libriscv)
 
 add_executable(example example.cpp)
-target_link_libraries(example riscv)
+target_link_libraries(example PkgConfig::libriscv)

lib/CMakeLists.txt

@@ -115,8 +115,14 @@ if (RISCV_BINARY_TRANSLATION)
 		list(APPEND SOURCES libriscv/tr_compiler.cpp)
 	endif()
 endif()
+if (RISCV_SUPERVISOR)
+	list(APPEND SOURCES
+		libriscv/supervisor/supervisor.cpp
+	)
+endif()
 
 configure_file(libriscv_settings.h.in ${CMAKE_CURRENT_BINARY_DIR}/libriscv_settings.h)
+configure_file(libriscv.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libriscv.pc)
 
 add_library(riscv ${SOURCES})
 target_compile_features(riscv PUBLIC cxx_std_20)
@@ -193,12 +199,16 @@ if (${CMAKE_PROJECT_NAME} STREQUAL "libriscv")
 		libriscv/rvc.hpp
 		libriscv/rvfd.hpp
 		libriscv/rsp_server.hpp
-		libriscv/supervisor.hpp
 		libriscv/threads.hpp
 		libriscv/types.hpp
 
 		DESTINATION include/${PROJECT_NAME}
 	)
+	install(FILES
+		libriscv/supervisor/supervisor.hpp
+
+		DESTINATION include/${PROJECT_NAME}/supervisor
+	)
 	install(FILES
 		libriscv/linux/rsp_server.hpp
 
@@ -217,4 +227,8 @@ if (${CMAKE_PROJECT_NAME} STREQUAL "libriscv")
 
 		DESTINATION include/${PROJECT_NAME}/util
 	)
+	install(
+		FILES ${CMAKE_CURRENT_BINARY_DIR}/libriscv.pc
+		DESTINATION lib/pkgconfig
+	)
 endif()

lib/libriscv.pc.in

@@ -0,0 +1,6 @@
+Name: @CMAKE_PROJECT_NAME@
+Description: @CMAKE_PROJECT_DESCRIPTION@
+URL: https://github.com/fwsGonzo/libriscv
+Version: @PROJECT_VERSION@
+Cflags: -I/usr/include
+Libs: -L/usr/lib -lriscv

lib/libriscv/cpu.hpp

@@ -2,7 +2,9 @@
 #include "common.hpp"
 #include "page.hpp"
 #include "registers.hpp"
-#include "supervisor.hpp"
+#ifdef RISCV_SUPERVISOR
+#include "supervisor/supervisor.hpp"
+#endif
 #ifdef RISCV_EXT_ATOMICS
 #include "rva.hpp"
 #endif

lib/libriscv/supervisor/supervisor.cpp

@@ -0,0 +1,33 @@
+#include "supervisor.hpp"
+
+#include "../machine.hpp"
+
+namespace riscv
+{
+	template <int W>
+	bool Supervisor<W>::is_privilege_machine() const noexcept {
+		return false;
+	}
+	template <int W>
+	bool Supervisor<W>::is_privilege_supervisor() const noexcept {
+		return false;
+	}
+
+	template <int W>
+	void Supervisor<W>::mret()
+	{
+		if (!is_privilege_machine())
+			throw MachineException(ILLEGAL_OPERATION, "MRET requires machine privilege level");
+	}
+
+	template <int W>
+	void Supervisor<W>::sret()
+	{
+		if (!is_privilege_supervisor())
+			throw MachineException(ILLEGAL_OPERATION, "SRET requires supervisor privilege level");
+
+	}
+
+	template struct Supervisor<4>;
+	template struct Supervisor<8>;
+}

lib/libriscv/supervisor.hpp → lib/libriscv/supervisor/supervisor.hpp

@@ -1,13 +1,16 @@
 #pragma once
-#include "types.hpp"
+#include "../types.hpp"
 
 namespace riscv
 {
     template <int W>
     struct Supervisor {
         using address_t = address_type<W>;
 
-        void sret() {}
+        void sret();
+        void mret();
+        bool is_privilege_machine() const noexcept;
+        bool is_privilege_supervisor() const noexcept;
 
         address_t satp = 0x0;
         address_t mie;