Merge pull request #80 from cphurley82/fix-reading-across-page-boundary

Fix reading across page boundary

Author: eyck

.github/workflows/ci-compliance.yml

@@ -31,8 +31,8 @@ jobs:
       - name: Install dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install -y g++ python3-pip cmake
-          pip3 install conan
+          sudo apt-get install -y g++ python3-pip cmake ninja-build
+          pip3 install conan --break-system-packages
           cmake --version
 
       - name: Configure

.github/workflows/ci-unit-tests.yml

@@ -0,0 +1,53 @@
+name: CI Unit Tests
+
+on:
+  push:
+    paths:
+      - '**.cpp'
+      - '**.h'
+      - '**CMakeLists.txt'
+      - '.github/workflows/**'
+      - 'conanfile.py'
+  pull_request:
+    paths:
+      - '**.cpp'
+      - '**.h'
+      - '**CMakeLists.txt'
+      - '.github/workflows/**'
+      - 'conanfile.py'
+
+jobs:
+  unit-tests:
+    name: unit-tests (C++20)
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Cache Conan
+        uses: actions/cache@v4
+        with:
+          path: ~/.conan
+          key: conan-${{ runner.os }}-unit-cpp20-${{ hashFiles('conanfile.txt') }}
+
+      - name: Update submodules
+        run: git submodule update --init --recursive
+
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y g++ python3-pip cmake ninja-build
+          pip3 install conan --break-system-packages
+          cmake --version
+
+      - name: Configure
+        run: >
+          cmake --preset Debug -B build
+          -DBUILD_TESTING=ON
+          -DCMAKE_CXX_STANDARD=20
+
+      - name: Build
+        run: cmake --build build -j
+
+      - name: Run unit tests
+        run: ctest --output-on-failure
+        working-directory: build

.gitignore

@@ -6,3 +6,4 @@
 /build/
 /.cproject
 /.venv
+/conan/

CMakeLists.txt

@@ -6,6 +6,7 @@ project(scc VERSION 2025.09 LANGUAGES CXX C)
 
 option(USE_CWR_SYSTEMC "Use Synopsys Virtualizer SystemC" OFF)
 option(USE_NCSC_SYSTEMC "Cadence Xcelium SystemC" OFF)
+option(BUILD_TESTING "Enable building tests" OFF)
 option(BUILD_SCC_DOCUMENTATION "Create and install the HTML based API documentation (requires Doxygen)" OFF)
 option(FULL_TRACE_TYPE_LIST "Test for extended set of templated datatypes" OFF)
 #Note: this needs to match the SystemC kernel build options
@@ -114,6 +115,10 @@ include(CheckSymbolExists)
 # Check for function getenv()
 check_symbol_exists(getenv "stdlib.h" HAVE_GETENV)
 
+if(BUILD_TESTING)
+    include(CTest)
+endif()
+
 if(NOT TARGET lz4::lz4)
     message(STATUS "${PROJECT_NAME}: using built-in version of lz4")
     add_subdirectory(third_party/lz4-1.9.4)
@@ -134,6 +139,10 @@ if(SystemC_FOUND)
         endif()
     endif()
 
+    if(BUILD_TESTING)
+        add_subdirectory(tests)
+    endif()
+
     # Define the scc library
     add_library(scc INTERFACE)
     add_library(scc::scc ALIAS scc)

Dockerfile.test

@@ -0,0 +1,17 @@
+FROM ubuntu:24.04
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends \
+        build-essential \
+        cmake \
+        ninja-build \
+        git \
+        python3 \
+        python3-pip \
+        ca-certificates && \
+    pip3 install "conan" && \
+    rm -rf /var/lib/apt/lists/*
+
+WORKDIR /work

TESTING.md

@@ -0,0 +1,70 @@
+# Running Tests
+
+This repository has a GoogleTest-based suite (see `tests/`). The tests target the CMake option `BUILD_TESTING=ON` and require the same dependencies as the main build plus GoogleTest (fetched automatically via `FetchContent`).
+
+## Prerequisites
+
+- CMake ≥ 3.20
+- A C++ compiler (GCC/Clang) with C++17 or later
+- Ninja build system
+- Python 3 with `conan` installed. A virtual environment is recommended:
+
+```bash
+python3 -m venv .venv
+source .venv/bin/activate
+pip install conan
+```
+
+If Conan cannot supply SystemC/CCI on your host, use the Docker flow below or point CMake at a local SystemC install via `SYSTEMC_HOME`.
+
+## Configure and Build
+
+```bash
+cmake --preset Debug -B build -DBUILD_TESTING=ON -DCMAKE_CXX_STANDARD=20
+cmake --build build -j
+```
+
+## Run Tests
+
+```bash
+cd build
+
+# unit tests
+ctest --output-on-failure
+
+# transaction recording example binary
+./examples/transaction_recording/transaction_recording
+```
+
+## Run Tests in Docker (Linux toolchain)
+
+If your host setup cannot fetch SystemC via Conan, use the provided Dockerfile:
+
+```bash
+# from repo root
+docker build -f Dockerfile.test -t scc-tests .
+docker run --rm -v "$PWD":/work -w /work scc-tests /bin/bash -lc "\
+  cmake --preset Debug -B build -DBUILD_TESTING=ON -DCMAKE_CXX_STANDARD=20 && \
+  cmake --build build -j && \
+  cd build && ctest --output-on-failure && \
+  ./examples/transaction_recording/transaction_recording"
+```
+
+## CI
+
+### Unit Tests
+Tests run in `.github/workflows/ci-unit-tests.yml`, which configures with `-DBUILD_TESTING=ON`, builds, and runs `ctest` with C++20.
+
+### C++ Standards Compliance
+The repository is tested for compliance with multiple C++ standards in `.github/workflows/ci-compliance.yml`. This workflow:
+- Tests against C++11, C++14, C++17, and C++20
+- Builds the project with each standard
+- Runs the `transaction_recording` example to verify basic functionality
+
+To test a specific C++ standard locally:
+
+```bash
+cmake --preset Debug -B build -DCMAKE_CXX_STANDARD=<11|14|17|20>
+cmake --build build -j
+./build/examples/transaction_recording/transaction_recording
+```

conanfile.py

@@ -39,8 +39,13 @@ def requirements(self):
                 self.requires("systemc/2.3.4")
             else:
                 self.requires("systemc/3.0.1")
+            if cppstd == "11":
+                self.requires("gtest/1.10.0")
+            else:
+                self.requires("gtest/1.14.0")
         else:
             self.requires("systemc/2.3.4")
+        self.requires("gtest/1.14.0")
         self.requires("spdlog/1.16.0")
         self.requires("boost/1.89.0")
         self.requires("lz4/1.10.0")

src/components/scc/memory.h

@@ -251,7 +251,8 @@ int memory<SIZE, BUSWIDTH>::handle_operation(tlm::tlm_generic_payload& trans, sc
                     auto first_part = mem.page_size - offs;
                     std::copy(p.data() + offs, p.data() + offs + first_part, ptr);
                     const auto& p2 = mem((adr / mem.page_size) + 1);
-                    std::copy(p2.data(), p2.data() + len, ptr + first_part);
+                    auto second_part = len - first_part;
+                    std::copy(p2.data(), p2.data() + second_part, ptr + first_part);
                 } else {
                     std::copy(p.data() + offs, p.data() + offs + len, ptr);
                 }

tests/CMakeLists.txt

@@ -0,0 +1,16 @@
+find_package(GTest REQUIRED)
+
+add_executable(memory_boundary_test
+    memory_boundary_test.cpp
+    gtest_sc_main.cpp
+)
+
+target_link_libraries(memory_boundary_test
+    PRIVATE
+        GTest::gtest
+        scc::scc
+        SystemC::systemc
+)
+target_compile_definitions(memory_boundary_test PRIVATE SC_DISABLE_API_VERSION_CHECK)
+
+add_test(NAME memory_boundary_test COMMAND memory_boundary_test)

tests/gtest_sc_main.cpp

@@ -0,0 +1,7 @@
+#include <gtest/gtest.h>
+#include <systemc>
+
+int sc_main(int argc, char* argv[]) {
+    ::testing::InitGoogleTest(&argc, argv);
+    return RUN_ALL_TESTS();
+}