Updated to version 20230601

Signed-off-by: Jertrude Fides Seguisa <[email protected]>

CMakeLists.txt

@@ -1,18 +1,32 @@
 cmake_minimum_required(VERSION 3.27)
 
-project(armtlmaxi4 CXX)
+project(amba-tlm CXX)
 
-file(GLOB_RECURSE sources src/*.cpp)
-file(GLOB_RECURSE headers include/*.h)
+set(CUSTOM_CXX_FLAGS -static-libstdc++ -Wall -Werror)
 
-set(CUSTOM_CXX_FLAGS -static-libstdc++ -Wall -Werror -Wno-format -Wno-class-memaccess -Wno-error=unused-variable)
+########## Build Library: libarmtlmaxi4
+file(GLOB_RECURSE armtlmaxi4_sources src/libarmaxi4.cpp)
+file(GLOB_RECURSE armtlmaxi4_headers include/*arm_axi4*.h include/*arm_tlm*.h)
 
-########## Library
-add_library(${PROJECT_NAME})
-target_compile_options(${PROJECT_NAME} PRIVATE ${CUSTOM_CXX_FLAGS})
-target_include_directories(${PROJECT_NAME} PUBLIC include)
-target_sources(${PROJECT_NAME} PUBLIC ${sources})
+add_library(armtlmaxi4)
+target_compile_options(armtlmaxi4 PRIVATE ${CUSTOM_CXX_FLAGS})
+target_include_directories(armtlmaxi4 PUBLIC include)
+target_sources(armtlmaxi4 PUBLIC ${armtlmaxi4_sources})
 
-########## Install Package Library
-target_sources(${PROJECT_NAME} PUBLIC FILE_SET HEADERS BASE_DIRS include FILES ${headers})
-install(TARGETS ${PROJECT_NAME} FILE_SET HEADERS)
+########## Install Package Library: libarmtlmaxi4
+target_sources(armtlmaxi4 PUBLIC FILE_SET HEADERS BASE_DIRS include FILES ${armtlmaxi4_headers})
+install(TARGETS armtlmaxi4 FILE_SET HEADERS)
+
+
+########## Build Library: libarmtlmchi
+file(GLOB_RECURSE armtlmchi_sources src/libarmchi.cpp)
+file(GLOB_RECURSE armtlmchi_headers include/*arm_chi*.h include/*arm_tlm*.h)
+
+add_library(armtlmchi)
+target_compile_options(armtlmchi PRIVATE ${CUSTOM_CXX_FLAGS})
+target_include_directories(armtlmchi PUBLIC include)
+target_sources(armtlmchi PUBLIC ${armtlmchi_sources})
+
+########## Install Package Library: libarmtlmchi
+target_sources(armtlmchi PUBLIC FILE_SET HEADERS BASE_DIRS include FILES ${armtlmchi_headers})
+install(TARGETS armtlmchi FILE_SET HEADERS)

amba_tlm_library.license

@@ -1,6 +1,6 @@
 The Clear BSD License
 
-Copyright (c) 2015-2019 Arm Limited.
+Copyright (c) 2015-2023 Arm Limited.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -15,18 +15,18 @@ below) provided that the following conditions are met:
      documentation and/or other materials provided with the distribution.
 
      * Neither the name of the copyright holder nor the names of its
-     contributors may be used to endorse or promote products derived from this
-     software without specific prior written permission.
+     contributors may be used to endorse or promote products derived from
+     this software without specific prior written permission.
 
 NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE GRANTED BY
 THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
-CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT
+NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
 PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
 CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
 EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
-IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

conanfile.py

@@ -1,9 +1,9 @@
 from conan import ConanFile
-from conan.tools.cmake import CMakeToolchain, CMake, cmake_layout
+from conan.tools.cmake import CMakeToolchain, CMake, CMakeDeps, cmake_layout
 
 class AmbaTlmRecipe(ConanFile):
     name = "amba-tlm"
-    version = "20190101"
+    version = "20230601"
 
     license = "The Clear BSD License"
     author = "Arm Limited (or its affiliates)"
@@ -20,7 +20,18 @@ class AmbaTlmRecipe(ConanFile):
 
     default_options = {
         "shared": False,
-        "fPIC": True
+        "fPIC": True,
+
+        "systemc/2.3.3:fPIC": True,
+        "systemc/2.3.3:shared": False,
+        "systemc/2.3.3:enable_pthreads": False,
+        "systemc/2.3.3:enable_assertions": True,
+        "systemc/2.3.3:disable_virtual_bind": False,
+        "systemc/2.3.3:disable_async_updates": False,
+        "systemc/2.3.3:disable_copyright_msg": True,
+        "systemc/2.3.3:enable_phase_callbacks": True,
+        "systemc/2.3.3:enable_phase_callbacks_tracing": False,
+        "systemc/2.3.3:enable_immediate_self_notifications": False,
     }
 
     exports_sources = "CMakeLists.txt", "src/*", "include/*"
@@ -36,8 +47,11 @@ def generate(self):
         tc = CMakeToolchain(self)
         tc.generate()
 
+        deps = CMakeDeps(self)
+        deps.generate()
+
     def requirements(self):
-        pass
+        self.requires("systemc/2.3.3")
 
     def build_requirements(self):
         self.tool_requires("cmake/3.27.6")
@@ -52,4 +66,5 @@ def package(self):
         cmake.install()
 
     def package_info(self):
-        self.cpp_info.libs = ["armtlmaxi4"]
+        self.cpp_info.components["armtlmaxi4"].libs = ["armtlmaxi4"]
+        self.cpp_info.components["armtlmchi"].libs = ["armtlmchi"]

include/ARM/TLM/arm_axi4.h

@@ -1,37 +1,37 @@
-//-------------------------------------------------------------------
-// The Clear BSD License
-//
-// Copyright (c) 2015-2019 Arm Limited.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted (subject to the limitations in the disclaimer
-// below) provided that the following conditions are met:
-//
-//      * Redistributions of source code must retain the above copyright notice,
-//      this list of conditions and the following disclaimer.
-//
-//      * Redistributions in binary form must reproduce the above copyright
-//      notice, this list of conditions and the following disclaimer in the
-//      documentation and/or other materials provided with the distribution.
-//
-//      * Neither the name of the copyright holder nor the names of its
-//      contributors may be used to endorse or promote products derived from this
-//      software without specific prior written permission.
-//
-// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE GRANTED BY
-// THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
-// CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-// PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-// BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
-// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//-------------------------------------------------------------------
+/*
+ * The Clear BSD License
+ *
+ * Copyright (c) 2015-2021 Arm Limited.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted (subject to the limitations in the disclaimer
+ * below) provided that the following conditions are met:
+ *
+ *      * Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *
+ *      * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *
+ *      * Neither the name of the copyright holder nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
+ *
+ * NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE GRANTED BY
+ * THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+ * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT
+ * NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 
 #ifndef ARM_AXI4_H
 #define ARM_AXI4_H
@@ -40,4 +40,4 @@
 #include "arm_axi4_phase.h"
 #include "arm_axi4_socket.h"
 
-#endif // ARM_AXI4_H
+#endif /* ARM_AXI4_H */