gtkwave · rfuest · Mar 1, 2026 · Feb 28, 2026
diff --git a/AUTHORS b/AUTHORS
@@ -0,0 +1,9 @@
+# This is the list of Abseil authors for copyright purposes.
+#
+# This does not necessarily list everyone who has contributed code, since in
+# some cases, their employer may be the copyright holder.  To see the full list
+# of contributors, see the revision history in source control.
+
+Yu-Sheng Lin
+You-Tang Lee
+rfuest
diff --git a/src/CMakeLists.txt → CMakeLists.txt b/src/CMakeLists.txt → CMakeLists.txt
@@ -35,8 +35,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
 # Collect cpp files (recursively) and split regular library sources vs tests (files ending with ".test.cpp")
 file(GLOB_RECURSE FST_CPP_FILES
-    "${CMAKE_CURRENT_SOURCE_DIR}/fstcpp/*.cpp"
-    "${CMAKE_CURRENT_SOURCE_DIR}/gtkwave/*.cpp"
+    "fstcpp/*.cpp"
 )
 
 # Lists to populate
@@ -77,17 +76,18 @@ endforeach()
 #######################################
 # Build the integration tests for testing bit-true behavior
 #######################################
-# compile verilator_shared/*.cpp as an cmake object
+# compile verilator_share/*.cpp as an cmake object
+# Non-recursively to exclude gtkwave/ folder
 file(
-    GLOB_RECURSE
-    VERILATOR_SHARED
-    ${CMAKE_CURRENT_SOURCE_DIR}/integration_test/verilator_share/*.cpp
+    GLOB
+    VERILATOR_SHARE
+    integration_test/verilator_share/*.cpp
 )
-add_library(verilator_shared OBJECT ${VERILATOR_SHARED})
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/integration_test/verilator_share)
+add_library(verilator_share OBJECT ${VERILATOR_SHARE})
+include_directories(integration_test/verilator_share)
 
 # for all direct folders under integration_test/tests, find all *.cpp files and compile them as an executable
-file(GLOB TEST_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/integration_test/tests/*)
+file(GLOB TEST_PATHS integration_test/tests/*)
 
 foreach(TEST_PATH ${TEST_PATHS})
     get_filename_component(TEST_NAME ${TEST_PATH} NAME)
@@ -98,13 +98,13 @@ foreach(TEST_PATH ${TEST_PATHS})
         file(GLOB_RECURSE TEST_SRCS ${TEST_PATH}/*.cpp)
 
         # C executable
-        add_executable(${TEST_NAME}_c ${TEST_SRCS} gtkwave/fstapi.c $<TARGET_OBJECTS:verilator_shared>)
+        add_executable(${TEST_NAME}_c ${TEST_SRCS} integration_test/verilator_share/gtkwave/fstapi.c $<TARGET_OBJECTS:verilator_share>)
         target_link_libraries(${TEST_NAME}_c PRIVATE fstcpp)
         target_include_directories(${TEST_NAME}_c PRIVATE ${TEST_PATH}/verilated)
         add_test(NAME ${TEST_NAME}_c COMMAND ${TEST_NAME}_c ${TEST_NAME}_dump_c.fst)
 
         # C++ executable
-        add_executable(${TEST_NAME}_cpp ${TEST_SRCS} gtkwave/fstapi.cpp $<TARGET_OBJECTS:verilator_shared>)
+        add_executable(${TEST_NAME}_cpp ${TEST_SRCS} integration_test/verilator_share/gtkwave/fstapi.cpp $<TARGET_OBJECTS:verilator_share>)
         target_link_libraries(${TEST_NAME}_cpp PRIVATE fstcpp)
         target_include_directories(${TEST_NAME}_cpp PRIVATE ${TEST_PATH}/verilated)
         add_test(NAME ${TEST_NAME}_cpp COMMAND ${TEST_NAME}_cpp ${TEST_NAME}_dump_cpp.fst)

diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ The unittests are written in C++20.
 - **C++14**: The core of this project is written in clean C++14 to maximize compatibility. Using `vector` and `string` can eliminate most resource management code compared to C.
 - **High Performance**: Optimized for speed to reduce simulation overhead (2x faster than the original `fstapi` when used with Verilator). This is mainly because we process data as binary instead of strings used by the original `fstapi.c`.
 - **Drop-in Compatibility**: Includes an optional C-compatible wrapper `fstapi.cpp`, providing the same writer interface as the original `fstapi.c`.
-- **Robust Testing**: Comprehensive unit tests written in C++20 to ensure correctness. Coverage is also generated and checked (70% line and 70% function coverage).
+- **Robust Testing**: Comprehensive unit tests written in C++20 to ensure correctness. Coverage is also generated and checked (85% line and 85% function coverage).
 - **Bit-true**: The implementation is bit-true to the original `fstapi.c` (tested in unittests).
 
 ## Regression Reports (WIP due to GitHub Actions permission issue)
@@ -24,18 +24,17 @@ To view it:
 
 ## 📂 Project Structure
 
-Every file of this project is under the `src` directory, which also includes third-party files:
-
-```
-fstcpp/              # 🌟 MAIN: Core C++ implementation
-├── Writer.h       #    - The new C++ API header
-└─── Writer.cpp       #    - The implementation
-gtkwave/             # 📚 ORIGINAL: Original GtkWave files
-├── fstapi.cpp       #    - C-style wrapper for backward compatibility
-├── fstapi.c         #    - REFERENCE: the original GtkWave implementation
-└── fstapi.h         #    - The original GtkWave header file used by both fstapi.cpp and fstapi.c
-integration_test/    # 🧪 TESTS: Integration tests generated by Verilator
-```
+- `fstcpp/`: 🌟 MAIN Core C++ implementation, header, and unittests.
+  - `fstcpp_writer.h`: The new C++ API header.
+  - `fstcpp_writer.cpp`: The implementation.
+- `integration_test/`: 🧪 TESTS Integration tests generated by Verilator.
+  - `verilator_share/`
+    - `gtkwave/`: 📚 ORIGINAL GtkWave files copied from `libfst`.
+      - `fstapi.cpp`: C-style wrapper for backward compatibility.
+      - `fstapi.c`: REFERENCE - the original GtkWave implementation.
+      - `fstapi.h`: The original GtkWave header file.
+    - other files: Copied from Verilator 5.042 runtime (slightly modified for bit-true).
+  - other folders: individual integration tests.
 
 ---
 
@@ -52,15 +51,15 @@ To configure the project with debug symbols and prepare it for *VS Code*+*clangd
 
 ```bash
 # Generate build files using Ninja
-cmake -G Ninja -B build/debug -DCMAKE_BUILD_TYPE=Debug src
+cmake -G Ninja -B build/debug -DCMAKE_BUILD_TYPE=Debug .
 ```
 
 ### Manual Build for Development (No coverage test)
 
 If you prefer running steps manually, our repository follows a very standard CMake workflow, here is an example:
 
 ```bash
-cmake -G Ninja -B build/debug -DCMAKE_BUILD_TYPE=Debug src
+cmake -G Ninja -B build/debug -DCMAKE_BUILD_TYPE=Debug .
 cd build/debug
 ninja -j$(nproc)
 ctest -j$(nproc)
@@ -78,7 +77,7 @@ By default, it will create `build/regression` directory.
 
 ### Installation
 
-There is no standard installation step now, just copy the files in `src/fstcpp` to your project. If you want to use the C-style wrapper, also copy `src/gtkwave/fstapi.cpp` and `src/gtkwave/fstapi.h` to your project.
+There is no standard installation step now, just copy the `fstcpp/` folder to your project, and remove `*.test.cpp`. If you want to use the C-style wrapper, also copy `integration_test/verilator_share/gtkwave/fstapi.(cpp|h)` to your project.
 
 The dependencies are `ZLIB` and `lz4`, which are quite easy to install on most Linux distributions.
 
@@ -95,14 +94,18 @@ The main source code of this repository is licensed under the **MIT License**.
 See the [LICENSE](LICENSE) file for more details.
 
 ### Details
-The `src` directory of this project contains a mix of original code and redistributed files:
+The root directory of this project contains a mix of original code and redistributed files:
 
 * **MIT**
   * **`fstcpp/`**: The core of this project.
-  * **`gtkwave/`**: Redistributed from GtkWave.
-  * **`integration_test/`**: All SystemVerilog files and the testbench CPP files are part of this project.
-  * **`integration_test/*/verilated/`**: Generated by Verilator 5.042. They are derivative works and inherit the original MIT license of the SystemVerilog source.
+  * **`integration_test/`**: Without explicitly mentioned, all SystemVerilog files and the testbench CPP files are part of this project.
+    * **`verilator_share/gtkwave/`**: Redistributed from `libfst`, which is MIT license.
+    * **`verilator_share/gtkwave/fstapi.cpp`**: A compatibility layer wrapping this project into `libfst`'s original C-interface.
+    * **`*/verilated/`**: Generated by Verilator 5.042. They are derivative works and inherit the original MIT license of the SystemVerilog source.
 * **LGPL v3**
-  * **`integration_test/verilator_shared/`**: Copied from Verilator 5.042 runtime (slightly modified for bit-true).
+  * **`integration_test/verilator_share/`**: Copied from Verilator 5.042 runtime (slightly modified for bit-true).
+* Projects that we have cited:
+  * [Verilator](https://github.com/verilator/verilator/)
+  * [libfst](https://github.com/gtkwave/libfst/)
 
 **AI usage notice:** The files in this repository are assisted by *Gemini 3 Pro* with *AntiGravity*.
diff --git a/src/fstcpp/fstcpp.h → fstcpp/fstcpp.h b/src/fstcpp/fstcpp.h → fstcpp/fstcpp.h
diff --git a/src/fstcpp/fstcpp_assertion.h → fstcpp/fstcpp_assertion.h b/src/fstcpp/fstcpp_assertion.h → fstcpp/fstcpp_assertion.h
diff --git a/src/fstcpp/fstcpp_file.h → fstcpp/fstcpp_file.h b/src/fstcpp/fstcpp_file.h → fstcpp/fstcpp_file.h
diff --git a/src/fstcpp/fstcpp_stream_write_helper.h → fstcpp/fstcpp_stream_write_helper.h b/src/fstcpp/fstcpp_stream_write_helper.h → fstcpp/fstcpp_stream_write_helper.h
diff --git a/src/fstcpp/fstcpp_variable_info.cpp → fstcpp/fstcpp_variable_info.cpp b/src/fstcpp/fstcpp_variable_info.cpp → fstcpp/fstcpp_variable_info.cpp
diff --git a/src/fstcpp/fstcpp_variable_info.h → fstcpp/fstcpp_variable_info.h b/src/fstcpp/fstcpp_variable_info.h → fstcpp/fstcpp_variable_info.h
diff --git a/src/fstcpp/fstcpp_variable_info.test.cpp → fstcpp/fstcpp_variable_info.test.cpp b/src/fstcpp/fstcpp_variable_info.test.cpp → fstcpp/fstcpp_variable_info.test.cpp
diff --git a/src/fstcpp/fstcpp_writer.cpp → fstcpp/fstcpp_writer.cpp b/src/fstcpp/fstcpp_writer.cpp → fstcpp/fstcpp_writer.cpp
diff --git a/src/fstcpp/fstcpp_writer.h → fstcpp/fstcpp_writer.h b/src/fstcpp/fstcpp_writer.h → fstcpp/fstcpp_writer.h
diff --git a/...fstcpp/fstcpp_writer_easy_blocks.test.cpp → fstcpp/fstcpp_writer_easy_blocks.test.cpp b/...fstcpp/fstcpp_writer_easy_blocks.test.cpp → fstcpp/fstcpp_writer_easy_blocks.test.cpp
diff --git a/...fstcpp_writer_value_change_block.test.cpp → ...fstcpp_writer_value_change_block.test.cpp b/...fstcpp_writer_value_change_block.test.cpp → ...fstcpp_writer_value_change_block.test.cpp
diff --git a/src/integration_test/tests/RSA256/Makefile → integration_test/tests/RSA256/Makefile b/src/integration_test/tests/RSA256/Makefile → integration_test/tests/RSA256/Makefile
diff --git a/...tegration_test/tests/RSA256/Montgomery.sv → integration_test/tests/RSA256/Montgomery.sv b/...tegration_test/tests/RSA256/Montgomery.sv → integration_test/tests/RSA256/Montgomery.sv
diff --git a/...integration_test/tests/RSA256/Pipeline.sv → integration_test/tests/RSA256/Pipeline.sv b/...integration_test/tests/RSA256/Pipeline.sv → integration_test/tests/RSA256/Pipeline.sv
diff --git a/...tion_test/tests/RSA256/PipelineCombine.sv → ...tion_test/tests/RSA256/PipelineCombine.sv b/...tion_test/tests/RSA256/PipelineCombine.sv → ...tion_test/tests/RSA256/PipelineCombine.sv
diff --git a/...n_test/tests/RSA256/PipelineDistribute.sv → ...n_test/tests/RSA256/PipelineDistribute.sv b/...n_test/tests/RSA256/PipelineDistribute.sv → ...n_test/tests/RSA256/PipelineDistribute.sv
diff --git a/...ation_test/tests/RSA256/PipelineFilter.sv → ...ation_test/tests/RSA256/PipelineFilter.sv b/...ation_test/tests/RSA256/PipelineFilter.sv → ...ation_test/tests/RSA256/PipelineFilter.sv
diff --git a/...gration_test/tests/RSA256/PipelineLoop.sv → ...gration_test/tests/RSA256/PipelineLoop.sv b/...gration_test/tests/RSA256/PipelineLoop.sv → ...gration_test/tests/RSA256/PipelineLoop.sv
diff --git a/src/integration_test/tests/RSA256/RSA.sv → integration_test/tests/RSA256/RSA.sv b/src/integration_test/tests/RSA256/RSA.sv → integration_test/tests/RSA256/RSA.sv
diff --git a/src/integration_test/tests/RSA256/RSAMont.sv → integration_test/tests/RSA256/RSAMont.sv b/src/integration_test/tests/RSA256/RSAMont.sv → integration_test/tests/RSA256/RSAMont.sv
diff --git a/src/integration_test/tests/RSA256/RSA_pkg.sv → integration_test/tests/RSA256/RSA_pkg.sv b/src/integration_test/tests/RSA256/RSA_pkg.sv → integration_test/tests/RSA256/RSA_pkg.sv
diff --git a/src/integration_test/tests/RSA256/RSA_tb.sv → integration_test/tests/RSA256/RSA_tb.sv b/src/integration_test/tests/RSA256/RSA_tb.sv → integration_test/tests/RSA256/RSA_tb.sv
diff --git a/...integration_test/tests/RSA256/TwoPower.sv → integration_test/tests/RSA256/TwoPower.sv b/...integration_test/tests/RSA256/TwoPower.sv → integration_test/tests/RSA256/TwoPower.sv
diff --git a/...tion_test/tests/RSA256/rsa256_tb.test.cpp → ...tion_test/tests/RSA256/rsa256_tb.test.cpp b/...tion_test/tests/RSA256/rsa256_tb.test.cpp → ...tion_test/tests/RSA256/rsa256_tb.test.cpp
diff --git a/...n_test/tests/RSA256/verilated/VRSA_tb.cpp → ...n_test/tests/RSA256/verilated/VRSA_tb.cpp b/...n_test/tests/RSA256/verilated/VRSA_tb.cpp → ...n_test/tests/RSA256/verilated/VRSA_tb.cpp
diff --git a/...ion_test/tests/RSA256/verilated/VRSA_tb.h → ...ion_test/tests/RSA256/verilated/VRSA_tb.h b/...ion_test/tests/RSA256/verilated/VRSA_tb.h → ...ion_test/tests/RSA256/verilated/VRSA_tb.h
diff --git a/...RSA256/verilated/VRSA_tb__ConstPool_0.cpp → ...RSA256/verilated/VRSA_tb__ConstPool_0.cpp b/...RSA256/verilated/VRSA_tb__ConstPool_0.cpp → ...RSA256/verilated/VRSA_tb__ConstPool_0.cpp
diff --git a/.../tests/RSA256/verilated/VRSA_tb__Syms.cpp → .../tests/RSA256/verilated/VRSA_tb__Syms.cpp b/.../tests/RSA256/verilated/VRSA_tb__Syms.cpp → .../tests/RSA256/verilated/VRSA_tb__Syms.cpp
diff --git a/...st/tests/RSA256/verilated/VRSA_tb__Syms.h → ...st/tests/RSA256/verilated/VRSA_tb__Syms.h b/...st/tests/RSA256/verilated/VRSA_tb__Syms.h → ...st/tests/RSA256/verilated/VRSA_tb__Syms.h
diff --git a/...erilated/VRSA_tb__TraceDecls__0__Slow.cpp → ...erilated/VRSA_tb__TraceDecls__0__Slow.cpp b/...erilated/VRSA_tb__TraceDecls__0__Slow.cpp → ...erilated/VRSA_tb__TraceDecls__0__Slow.cpp
diff --git a/...ts/RSA256/verilated/VRSA_tb__Trace__0.cpp → ...ts/RSA256/verilated/VRSA_tb__Trace__0.cpp b/...ts/RSA256/verilated/VRSA_tb__Trace__0.cpp → ...ts/RSA256/verilated/VRSA_tb__Trace__0.cpp
diff --git a/...256/verilated/VRSA_tb__Trace__0__Slow.cpp → ...256/verilated/VRSA_tb__Trace__0__Slow.cpp b/...256/verilated/VRSA_tb__Trace__0__Slow.cpp → ...256/verilated/VRSA_tb__Trace__0__Slow.cpp
diff --git a/...ests/RSA256/verilated/VRSA_tb___024root.h → ...ests/RSA256/verilated/VRSA_tb___024root.h b/...ests/RSA256/verilated/VRSA_tb___024root.h → ...ests/RSA256/verilated/VRSA_tb___024root.h
diff --git a/...RSA256/verilated/VRSA_tb___024root__0.cpp → ...RSA256/verilated/VRSA_tb___024root__0.cpp b/...RSA256/verilated/VRSA_tb___024root__0.cpp → ...RSA256/verilated/VRSA_tb___024root__0.cpp
diff --git a/.../verilated/VRSA_tb___024root__0__Slow.cpp → .../verilated/VRSA_tb___024root__0__Slow.cpp b/.../verilated/VRSA_tb___024root__0__Slow.cpp → .../verilated/VRSA_tb___024root__0__Slow.cpp
diff --git a/...256/verilated/VRSA_tb___024root__Slow.cpp → ...256/verilated/VRSA_tb___024root__Slow.cpp b/...256/verilated/VRSA_tb___024root__Slow.cpp → ...256/verilated/VRSA_tb___024root__Slow.cpp
diff --git a/...ests/RSA256/verilated/VRSA_tb___024unit.h → ...ests/RSA256/verilated/VRSA_tb___024unit.h b/...ests/RSA256/verilated/VRSA_tb___024unit.h → ...ests/RSA256/verilated/VRSA_tb___024unit.h
diff --git a/.../verilated/VRSA_tb___024unit__0__Slow.cpp → .../verilated/VRSA_tb___024unit__0__Slow.cpp b/.../verilated/VRSA_tb___024unit__0__Slow.cpp → .../verilated/VRSA_tb___024unit__0__Slow.cpp
diff --git a/...256/verilated/VRSA_tb___024unit__Slow.cpp → ...256/verilated/VRSA_tb___024unit__Slow.cpp b/...256/verilated/VRSA_tb___024unit__Slow.cpp → ...256/verilated/VRSA_tb___024unit__Slow.cpp
diff --git a/...est/tests/RSA256/verilated/VRSA_tb__pch.h → ...est/tests/RSA256/verilated/VRSA_tb__pch.h b/...est/tests/RSA256/verilated/VRSA_tb__pch.h → ...est/tests/RSA256/verilated/VRSA_tb__pch.h
diff --git a/src/integration_test/tests/simple/Makefile → integration_test/tests/simple/Makefile b/src/integration_test/tests/simple/Makefile → integration_test/tests/simple/Makefile
diff --git a/src/integration_test/tests/simple/Simple.sv → integration_test/tests/simple/Simple.sv b/src/integration_test/tests/simple/Simple.sv → integration_test/tests/simple/Simple.sv
diff --git a/...tion_test/tests/simple/Simple_tb.test.cpp → ...tion_test/tests/simple/Simple_tb.test.cpp b/...tion_test/tests/simple/Simple_tb.test.cpp → ...tion_test/tests/simple/Simple_tb.test.cpp
diff --git a/...n_test/tests/simple/verilated/VSimple.cpp → ...n_test/tests/simple/verilated/VSimple.cpp b/...n_test/tests/simple/verilated/VSimple.cpp → ...n_test/tests/simple/verilated/VSimple.cpp
diff --git a/...ion_test/tests/simple/verilated/VSimple.h → ...ion_test/tests/simple/verilated/VSimple.h b/...ion_test/tests/simple/verilated/VSimple.h → ...ion_test/tests/simple/verilated/VSimple.h
diff --git a/.../tests/simple/verilated/VSimple__Syms.cpp → .../tests/simple/verilated/VSimple__Syms.cpp b/.../tests/simple/verilated/VSimple__Syms.cpp → .../tests/simple/verilated/VSimple__Syms.cpp
diff --git a/...st/tests/simple/verilated/VSimple__Syms.h → ...st/tests/simple/verilated/VSimple__Syms.h b/...st/tests/simple/verilated/VSimple__Syms.h → ...st/tests/simple/verilated/VSimple__Syms.h
diff --git a/...erilated/VSimple__TraceDecls__0__Slow.cpp → ...erilated/VSimple__TraceDecls__0__Slow.cpp b/...erilated/VSimple__TraceDecls__0__Slow.cpp → ...erilated/VSimple__TraceDecls__0__Slow.cpp
diff --git a/...ts/simple/verilated/VSimple__Trace__0.cpp → ...ts/simple/verilated/VSimple__Trace__0.cpp b/...ts/simple/verilated/VSimple__Trace__0.cpp → ...ts/simple/verilated/VSimple__Trace__0.cpp
diff --git a/...ple/verilated/VSimple__Trace__0__Slow.cpp → ...ple/verilated/VSimple__Trace__0__Slow.cpp b/...ple/verilated/VSimple__Trace__0__Slow.cpp → ...ple/verilated/VSimple__Trace__0__Slow.cpp
diff --git a/...ests/simple/verilated/VSimple___024root.h → ...ests/simple/verilated/VSimple___024root.h b/...ests/simple/verilated/VSimple___024root.h → ...ests/simple/verilated/VSimple___024root.h
diff --git a/...simple/verilated/VSimple___024root__0.cpp → ...simple/verilated/VSimple___024root__0.cpp b/...simple/verilated/VSimple___024root__0.cpp → ...simple/verilated/VSimple___024root__0.cpp
diff --git a/.../verilated/VSimple___024root__0__Slow.cpp → .../verilated/VSimple___024root__0__Slow.cpp b/.../verilated/VSimple___024root__0__Slow.cpp → .../verilated/VSimple___024root__0__Slow.cpp
diff --git a/...ple/verilated/VSimple___024root__Slow.cpp → ...ple/verilated/VSimple___024root__Slow.cpp b/...ple/verilated/VSimple___024root__Slow.cpp → ...ple/verilated/VSimple___024root__Slow.cpp
diff --git a/...est/tests/simple/verilated/VSimple__pch.h → ...est/tests/simple/verilated/VSimple__pch.h b/...est/tests/simple/verilated/VSimple__pch.h → ...est/tests/simple/verilated/VSimple__pch.h
diff --git a/src/gtkwave/fst_config.h → ...test/verilator_share/gtkwave/fst_config.h b/src/gtkwave/fst_config.h → ...test/verilator_share/gtkwave/fst_config.h
diff --git a/src/gtkwave/fst_win_unistd.h → .../verilator_share/gtkwave/fst_win_unistd.h b/src/gtkwave/fst_win_unistd.h → .../verilator_share/gtkwave/fst_win_unistd.h
diff --git a/src/gtkwave/fstapi.c → ...ion_test/verilator_share/gtkwave/fstapi.c b/src/gtkwave/fstapi.c → ...ion_test/verilator_share/gtkwave/fstapi.c
diff --git a/src/gtkwave/fstapi.cpp → ...n_test/verilator_share/gtkwave/fstapi.cpp b/src/gtkwave/fstapi.cpp → ...n_test/verilator_share/gtkwave/fstapi.cpp
diff --git a/src/gtkwave/fstapi.h → ...ion_test/verilator_share/gtkwave/fstapi.h b/src/gtkwave/fstapi.h → ...ion_test/verilator_share/gtkwave/fstapi.h
diff --git a/...ration_test/verilator_share/sv_vpi_user.h → ...ration_test/verilator_share/sv_vpi_user.h b/...ration_test/verilator_share/sv_vpi_user.h → ...ration_test/verilator_share/sv_vpi_user.h
diff --git a/src/integration_test/verilator_share/svdpi.h → integration_test/verilator_share/svdpi.h b/src/integration_test/verilator_share/svdpi.h → integration_test/verilator_share/svdpi.h
diff --git a/...ration_test/verilator_share/verilated.cpp → ...ration_test/verilator_share/verilated.cpp b/...ration_test/verilator_share/verilated.cpp → ...ration_test/verilator_share/verilated.cpp
diff --git a/...egration_test/verilator_share/verilated.h → integration_test/verilator_share/verilated.h b/...egration_test/verilator_share/verilated.h → integration_test/verilator_share/verilated.h
diff --git a/...n_test/verilator_share/verilated_config.h → ...n_test/verilator_share/verilated_config.h b/...n_test/verilator_share/verilated_config.h → ...n_test/verilator_share/verilated_config.h
diff --git a/...est/verilator_share/verilated_config.h.in → ...est/verilator_share/verilated_config.h.in b/...est/verilator_share/verilated_config.h.in → ...est/verilator_share/verilated_config.h.in
diff --git a/...on_test/verilator_share/verilated_cov.cpp → ...on_test/verilator_share/verilated_cov.cpp b/...on_test/verilator_share/verilated_cov.cpp → ...on_test/verilator_share/verilated_cov.cpp
diff --git a/...tion_test/verilator_share/verilated_cov.h → ...tion_test/verilator_share/verilated_cov.h b/...tion_test/verilator_share/verilated_cov.h → ...tion_test/verilator_share/verilated_cov.h
diff --git a/..._test/verilator_share/verilated_cov_key.h → ..._test/verilator_share/verilated_cov_key.h b/..._test/verilator_share/verilated_cov_key.h → ..._test/verilator_share/verilated_cov_key.h
diff --git a/...on_test/verilator_share/verilated_dpi.cpp → ...on_test/verilator_share/verilated_dpi.cpp b/...on_test/verilator_share/verilated_dpi.cpp → ...on_test/verilator_share/verilated_dpi.cpp
diff --git a/...tion_test/verilator_share/verilated_dpi.h → ...tion_test/verilator_share/verilated_dpi.h b/...tion_test/verilator_share/verilated_dpi.h → ...tion_test/verilator_share/verilated_dpi.h
diff --git a/..._test/verilator_share/verilated_fst_c.cpp → ..._test/verilator_share/verilated_fst_c.cpp b/..._test/verilator_share/verilated_fst_c.cpp → ..._test/verilator_share/verilated_fst_c.cpp
diff --git a/...on_test/verilator_share/verilated_fst_c.h → ...on_test/verilator_share/verilated_fst_c.h b/...on_test/verilator_share/verilated_fst_c.h → ...on_test/verilator_share/verilated_fst_c.h
diff --git a/...on_test/verilator_share/verilated_funcs.h → ...on_test/verilator_share/verilated_funcs.h b/...on_test/verilator_share/verilated_funcs.h → ...on_test/verilator_share/verilated_funcs.h
diff --git a/...tion_test/verilator_share/verilated_imp.h → ...tion_test/verilator_share/verilated_imp.h b/...tion_test/verilator_share/verilated_imp.h → ...tion_test/verilator_share/verilated_imp.h
diff --git a/...st/verilator_share/verilated_intrinsics.h → ...st/verilator_share/verilated_intrinsics.h b/...st/verilator_share/verilated_intrinsics.h → ...st/verilator_share/verilated_intrinsics.h
diff --git a/...st/verilator_share/verilated_probdist.cpp → ...st/verilator_share/verilated_probdist.cpp b/...st/verilator_share/verilated_probdist.cpp → ...st/verilator_share/verilated_probdist.cpp
diff --git a/...st/verilator_share/verilated_profiler.cpp → ...st/verilator_share/verilated_profiler.cpp b/...st/verilator_share/verilated_profiler.cpp → ...st/verilator_share/verilated_profiler.cpp
diff --git a/...test/verilator_share/verilated_profiler.h → ...test/verilator_share/verilated_profiler.h b/...test/verilator_share/verilated_profiler.h → ...test/verilator_share/verilated_profiler.h
diff --git a/...test/verilator_share/verilated_random.cpp → ...test/verilator_share/verilated_random.cpp b/...test/verilator_share/verilated_random.cpp → ...test/verilator_share/verilated_random.cpp
diff --git a/...n_test/verilator_share/verilated_random.h → ...n_test/verilator_share/verilated_random.h b/...n_test/verilator_share/verilated_random.h → ...n_test/verilator_share/verilated_random.h
diff --git a/...test/verilator_share/verilated_saif_c.cpp → ...test/verilator_share/verilated_saif_c.cpp b/...test/verilator_share/verilated_saif_c.cpp → ...test/verilator_share/verilated_saif_c.cpp
diff --git a/...n_test/verilator_share/verilated_saif_c.h → ...n_test/verilator_share/verilated_saif_c.h b/...n_test/verilator_share/verilated_saif_c.h → ...n_test/verilator_share/verilated_saif_c.h
diff --git a/...n_test/verilator_share/verilated_save.cpp → ...n_test/verilator_share/verilated_save.cpp b/...n_test/verilator_share/verilated_save.cpp → ...n_test/verilator_share/verilated_save.cpp
diff --git a/...ion_test/verilator_share/verilated_save.h → ...ion_test/verilator_share/verilated_save.h b/...ion_test/verilator_share/verilated_save.h → ...ion_test/verilator_share/verilated_save.h
diff --git a/...est/verilator_share/verilated_sym_props.h → ...est/verilator_share/verilated_sym_props.h b/...est/verilator_share/verilated_sym_props.h → ...est/verilator_share/verilated_sym_props.h
diff --git a/...ion_test/verilator_share/verilated_syms.h → ...ion_test/verilator_share/verilated_syms.h b/...ion_test/verilator_share/verilated_syms.h → ...ion_test/verilator_share/verilated_syms.h
diff --git a/...est/verilator_share/verilated_threads.cpp → ...est/verilator_share/verilated_threads.cpp b/...est/verilator_share/verilated_threads.cpp → ...est/verilator_share/verilated_threads.cpp
diff --git a/..._test/verilator_share/verilated_threads.h → ..._test/verilator_share/verilated_threads.h b/..._test/verilator_share/verilated_threads.h → ..._test/verilator_share/verilated_threads.h
diff --git a/...test/verilator_share/verilated_timing.cpp → ...test/verilator_share/verilated_timing.cpp b/...test/verilator_share/verilated_timing.cpp → ...test/verilator_share/verilated_timing.cpp
diff --git a/...n_test/verilator_share/verilated_timing.h → ...n_test/verilator_share/verilated_timing.h b/...n_test/verilator_share/verilated_timing.h → ...n_test/verilator_share/verilated_timing.h
diff --git a/...on_test/verilator_share/verilated_trace.h → ...on_test/verilator_share/verilated_trace.h b/...on_test/verilator_share/verilated_trace.h → ...on_test/verilator_share/verilated_trace.h
diff --git a/...est/verilator_share/verilated_trace_imp.h → ...est/verilator_share/verilated_trace_imp.h b/...est/verilator_share/verilated_trace_imp.h → ...est/verilator_share/verilated_trace_imp.h
diff --git a/...on_test/verilator_share/verilated_types.h → ...on_test/verilator_share/verilated_types.h b/...on_test/verilator_share/verilated_types.h → ...on_test/verilator_share/verilated_types.h
diff --git a/...on_test/verilator_share/verilated_vpi.cpp → ...on_test/verilator_share/verilated_vpi.cpp b/...on_test/verilator_share/verilated_vpi.cpp → ...on_test/verilator_share/verilated_vpi.cpp
diff --git a/...tion_test/verilator_share/verilated_vpi.h → ...tion_test/verilator_share/verilated_vpi.h b/...tion_test/verilator_share/verilated_vpi.h → ...tion_test/verilator_share/verilated_vpi.h
diff --git a/...ration_test/verilator_share/verilatedos.h → ...ration_test/verilator_share/verilatedos.h b/...ration_test/verilator_share/verilatedos.h → ...ration_test/verilator_share/verilatedos.h
diff --git a/...tion_test/verilator_share/verilatedos_c.h → ...tion_test/verilator_share/verilatedos_c.h b/...tion_test/verilator_share/verilatedos_c.h → ...tion_test/verilator_share/verilatedos_c.h
diff --git a/...tegration_test/verilator_share/veriuser.h → integration_test/verilator_share/veriuser.h b/...tegration_test/verilator_share/veriuser.h → integration_test/verilator_share/veriuser.h
diff --git a/...test/verilator_share/vltstd/sv_vpi_user.h → ...test/verilator_share/vltstd/sv_vpi_user.h b/...test/verilator_share/vltstd/sv_vpi_user.h → ...test/verilator_share/vltstd/sv_vpi_user.h
diff --git a/...ation_test/verilator_share/vltstd/svdpi.h → ...ation_test/verilator_share/vltstd/svdpi.h b/...ation_test/verilator_share/vltstd/svdpi.h → ...ation_test/verilator_share/vltstd/svdpi.h
diff --git a/...on_test/verilator_share/vltstd/veriuser.h → ...on_test/verilator_share/vltstd/veriuser.h b/...on_test/verilator_share/vltstd/veriuser.h → ...on_test/verilator_share/vltstd/veriuser.h
diff --git a/...on_test/verilator_share/vltstd/vpi_user.h → ...on_test/verilator_share/vltstd/vpi_user.h b/...on_test/verilator_share/vltstd/vpi_user.h → ...on_test/verilator_share/vltstd/vpi_user.h
diff --git a/...tegration_test/verilator_share/vpi_user.h → integration_test/verilator_share/vpi_user.h b/...tegration_test/verilator_share/vpi_user.h → integration_test/verilator_share/vpi_user.h
diff --git a/run_regression.sh b/run_regression.sh
@@ -5,13 +5,13 @@
 # --build <build_dir>, default to ./build/regression
 # --coverage, default to false
 # --coverage-html, default to false, autoset --coverage to true
-# --coverage-line, default to 70
-# --coverage-func, default to 70
+# --coverage-line, default to 85
+# --coverage-func, default to 85
 BUILD_DIR="build/regression"
 COVERAGE=0
 COVERAGE_HTML=0
-COVERAGE_LINE=70
-COVERAGE_FUNC=70
+COVERAGE_LINE=85
+COVERAGE_FUNC=85
 ROOT_DIR=$(pwd)
 TEST_EXIT_CODE=0
 while [[ "$#" -gt 0 ]]; do
@@ -32,7 +32,7 @@ function CMakeInit() {
 	mkdir -p "$BUILD_DIR"
 	local cov_opt="OFF"
 	if [ $COVERAGE -eq 1 ]; then cov_opt="ON"; fi
-	cmake -B "$BUILD_DIR" -S src -G Ninja -DENABLE_COVERAGE=$cov_opt
+	cmake -B "$BUILD_DIR" -S . -G Ninja -DENABLE_COVERAGE=$cov_opt
 }
 
 function BuildAndRunTests() {
@@ -44,7 +44,7 @@ function BuildAndRunTests() {
 function CollectCoverage() {
 	if [ $COVERAGE = 1 ]; then
 		lcov --capture --directory . --output-file coverage.info --ignore-errors inconsistent,mismatch,empty
-		lcov --extract coverage.info '*/src/fstcpp/*' --output-file coverage.info --ignore-errors inconsistent,mismatch,empty
+		lcov --extract coverage.info '*/fstcpp/*' --output-file coverage.info --ignore-errors inconsistent,mismatch,empty
 		if [ $COVERAGE_HTML = 1 ]; then
 			genhtml coverage.info --output-directory html
 		fi