Merge pull request #580 from Mellanox/master_devel

merge master_devel for 4.20 release
Mellanox · Apr 28, 2022 · 5b34f7a · 5b34f7a
2 parents ab6f720 + dd35935
commit 5b34f7a
Show file tree

Hide file tree

Showing 194 changed files with 86,281 additions and 20,296 deletions.
diff --git a/adb_parser/Makefile.am b/adb_parser/Makefile.am
@@ -38,7 +38,7 @@ DIST_SUBDIRS = .
 
 USER_DIR = ..
 INCLUDES = -I$(USER_DIR) -I$(USER_DIR)/common
-AM_CXXFLAGS = -Wall -W -g -MP -MD -Werror -pipe $(COMPILER_FPIC)
+AM_CXXFLAGS = -Wall -W -g -MP -MD  -pipe $(COMPILER_FPIC)
 
 lib_LTLIBRARIES = libadb_parser.a
 

diff --git a/adb_parser/adb_common_functions.h b/adb_parser/adb_common_functions.h
@@ -1,5 +1,4 @@
 /*
- * Copyright (C) Jan 2019 Mellanox Technologies Ltd. All rights reserved.
  * Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. ALL RIGHTS RESERVED.
  *
  * This software is available to you under a choice of one of two

diff --git a/adb_parser/adb_config.cpp b/adb_parser/adb_config.cpp
@@ -1,5 +1,4 @@
 /*
- * Copyright (C) Jan 2019 Mellanox Technologies Ltd. All rights reserved.
  * Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. ALL RIGHTS RESERVED.
  *
  * This software is available to you under a choice of one of two
@@ -30,6 +29,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  *
+ *  Version: $Id$
  */
 /*************************** AdbConfig ***************************/
 /**

diff --git a/adb_parser/adb_config.h b/adb_parser/adb_config.h
@@ -1,5 +1,4 @@
 /*
- * Copyright (C) Jan 2019 Mellanox Technologies Ltd. All rights reserved.
  * Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. ALL RIGHTS RESERVED.
  *
  * This software is available to you under a choice of one of two
@@ -30,6 +29,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  *
+ *  Version: $Id$
  */
 /*************************** AdbConfig ***************************/
 

diff --git a/adb_parser/adb_instance.cpp b/adb_parser/adb_instance.cpp
@@ -63,7 +63,7 @@ string addPathSuffixForArraySupport(string path) {
 }
 
 AdbInstance::AdbInstance() :
-    fieldDesc(NULL), nodeDesc(NULL), parent(NULL), offset(0xffffffff), size(0),
+    fieldDesc(NULL), nodeDesc(NULL), parent(NULL), offset(0xffffffff), size(0), maxLeafSize(0),
             arrIdx(0), isNameBeenExtended(false), unionSelector(NULL), isDiff(false), userData(NULL)
 
 {

diff --git a/adb_parser/adb_instance.h b/adb_parser/adb_instance.h
@@ -102,6 +102,7 @@ class AdbInstance {
     vector<AdbInstance*> subItems;
     u_int32_t offset; // Global offset in bits (Relative to 0)
     u_int32_t size; // in bits
+    u_int32_t maxLeafSize; // in bits for DS alignment check
     u_int32_t arrIdx;
     bool      isNameBeenExtended;
     AdbInstance *unionSelector; // For union instances only

diff --git a/adb_parser/adb_node.cpp b/adb_parser/adb_node.cpp
@@ -53,7 +53,7 @@ using namespace boost;
 #include <boost/filesystem/path.hpp>
 #include <boost/filesystem/operations.hpp>
 
-AdbNode::AdbNode() : size(0), isUnion(false), lineNumber(-1), userData(0)
+AdbNode::AdbNode() : size(0), _maxLeafSize(0), isUnion(false), inLayout(false), lineNumber(-1), userData(0)
 {
 }
 

diff --git a/adb_parser/adb_node.h b/adb_parser/adb_node.h
@@ -63,11 +63,13 @@ class AdbNode
     // Members
     string name;
     u_int32_t size; // in bits
+    u_int32_t _maxLeafSize; // in bits
     bool isUnion;
     string desc;
     FieldsList fields;
     FieldsList condFields; // Field that weren't instantiated due to not satisfied condition
     AttrsMap attrs;
+    bool inLayout;
 
     // defined in
     string fileName;