From 74ff1d455a43d83929c28017a31f14247077dfa8 Mon Sep 17 00:00:00 2001
From: Eyck Jentzsch <eyck@minres.com>
Date: Fri, 20 Oct 2023 20:38:59 +0200
Subject: [PATCH] fixes install routine

---
 CMakeLists.txt                    | 2 ++
 src/iss/plugin/cycle_estimate.cpp | 9 +++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fed2f4b..59e613c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,6 +35,7 @@ endif()
 # library files
 FILE(GLOB GEN_ISS_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src-gen/iss/arch/*.cpp)
 FILE(GLOB GEN_VM_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src-gen/vm/interp/vm_*.cpp)
+FILE(GLOB GEN_YAML_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.yaml)
 list(APPEND LIB_SOURCES ${GEN_ISS_SOURCES} ${GEN_VM_SOURCES})
 foreach(FILEPATH ${GEN_ISS_SOURCES})
     get_filename_component(CORE ${FILEPATH} NAME_WE)
@@ -112,6 +113,7 @@ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/incl/iss COMPONENT ${PROJECT_NAME}
         FILES_MATCHING # install only matched files
         PATTERN "*.h" # select header files
         )
+install(FILES ${GEN_YAML_SOURCES} DESTINATION share/tgc-vp)
 ###############################################################################
 #
 ###############################################################################
diff --git a/src/iss/plugin/cycle_estimate.cpp b/src/iss/plugin/cycle_estimate.cpp
index 267c88e..b389cb4 100644
--- a/src/iss/plugin/cycle_estimate.cpp
+++ b/src/iss/plugin/cycle_estimate.cpp
@@ -1,3 +1,4 @@
+
 /*******************************************************************************
  * Copyright (C) 2017 - 2023, MINRES Technologies GmbH
  * All rights reserved.
@@ -60,7 +61,7 @@ bool iss::plugin::cycle_estimate::registration(const char* const version, vm_if&
             try {
                 auto root = YAML::LoadAll(is);
                 if(root.size()!=1) {
-                    LOG(ERR) << "Too many rro nodes in YAML file " << config_file_name;
+                    LOG(ERR) << "Too many root nodes in YAML file " << config_file_name;
                 }
                 for (auto p : root[0]) {
                     auto isa_subset = p.first;
@@ -97,7 +98,7 @@ void iss::plugin::cycle_estimate::callback(instr_info_t instr_info) {
     auto entry = delays[instr_info.instr_id];
     bool taken = instr_if->is_branch_taken();
     if (taken && (entry.taken > 1))
-        instr_if->update_last_instr_cycles(entry.taken);
-    else if (entry.not_taken > 1)
-        instr_if->update_last_instr_cycles(entry.not_taken);
+        instr_if->update_last_instr_cycles(entry.taken);
+    else if (entry.not_taken > 1)
+        instr_if->update_last_instr_cycles(entry.not_taken);
 }