Hostboot-aware errl tool part 1.

Change-Id: Ibe49dc935206775de032d397b2800a7b83208283
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/630
Tested-by: Jenkins Server
Reviewed-by: Monte K. Copeland <copelanm@us.ibm.com>

9 files changed, 59 insertions, 29 deletions

diff --git a/src/include/usr/errl/backtrace.H b/src/include/usr/errl/backtrace.H
index 5db0081d3..e0c8250c5 100755
--- a/src/include/usr/errl/backtrace.H
+++ b/src/include/usr/errl/backtrace.H
@@ -35,7 +35,6 @@
 // I n c l u d e s
 /*****************************************************************************/
 #include <stdint.h>
-#include <errl/errltypes.H>
 #include <vector>
 
 
diff --git a/src/include/usr/errl/errlentry.H b/src/include/usr/errl/errlentry.H
index 330a8a813..32eb5a1ea 100644
--- a/src/include/usr/errl/errlentry.H
+++ b/src/include/usr/errl/errlentry.H
@@ -47,7 +47,7 @@
 /*****************************************************************************/
 #include <stdint.h>
 #include <vector>
-#include <errl/errltypes.H>
+#include <errl/hberrltypes.H>
 #include <errl/errlsctn.H>
 #include <errl/errlprvt.H>
 #include <errl/errluh.H>
@@ -558,4 +558,8 @@ inline void ErrlEntry::setSrcType(const srcType_t i_srcType)
 
 } // End namespace
 
+
+typedef ERRORLOG::ErrlEntry* errlHndl_t;
+
+
 #endif //ERRLENTRY_H
diff --git a/src/include/usr/errl/errlmanager.H b/src/include/usr/errl/errlmanager.H
index 67429cbba..7d41c0ea1 100644
--- a/src/include/usr/errl/errlmanager.H
+++ b/src/include/usr/errl/errlmanager.H
@@ -35,7 +35,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <util/singleton.H>
-#include <errl/errltypes.H>
+#include <errl/errlentry.H>
 #include <sys/sync.h>
 #include <vector>
 #include <kernel/timemgr.H>
diff --git a/src/include/usr/errl/errlreasoncodes.H b/src/include/usr/errl/errlreasoncodes.H
index f5fe78f35..00b156f7e 100644
--- a/src/include/usr/errl/errlreasoncodes.H
+++ b/src/include/usr/errl/errlreasoncodes.H
@@ -35,22 +35,23 @@
 // Module IDs for ERRL component
 enum
 {
-    ERRL_FIRST_MODULE_ID        = 0x00,
-    ERRL_USERDETAILS_MODULE_ID,
+    HBERRL_FIRST_MODULE_ID        = 0x00,
+    HBERRL_USERDETAILS_MODULE_ID  = 1,
+    HBERRL_TEST_MOD_ID            = 2,
     //........
-    ERRL_LAST_MODULE_ID         = 0xFF
+    HBERRL_LAST_MODULE_ID         = 0xFF
 };
 
 // Reason codes for ERRL component
 enum errlReasonCode
 {
-    ERRL_FIRST_ERR          = ERRL_COMP_ID | 0x01,
-    ERRL_FILENAME_TEST      = ERRL_COMP_ID | 0x02,
-    ERRL_ERRORMSG_TEST      = ERRL_COMP_ID | 0x03,
-    ERRL_XMLTOKEN_TEST      = ERRL_COMP_ID | 0x04,
-
+    HBERRL_FIRST_ERR          = HBERRL_COMP_ID | 0x01,
+    HBERRL_FILENAME_TEST      = HBERRL_COMP_ID | 0x02,
+    HBERRL_ERRORMSG_TEST      = HBERRL_COMP_ID | 0x03,
+    HBERRL_XMLTOKEN_TEST      = HBERRL_COMP_ID | 0x04,
+    HBERRL_TEST_REASON_CODE   = HBERRL_COMP_ID | 0x0F,
     //........
-    ERRL_LAST_ERR           = ERRL_COMP_ID | 0xFF
+    HBERRL_LAST_ERR           = HBERRL_COMP_ID | 0xFF
 };
 
 
diff --git a/src/include/usr/errl/errlsctn.H b/src/include/usr/errl/errlsctn.H
index bd31aec40..da7b4adc8 100644
--- a/src/include/usr/errl/errlsctn.H
+++ b/src/include/usr/errl/errlsctn.H
@@ -36,7 +36,7 @@
 /*****************************************************************************/
 #include <stdint.h>
 #include <stdlib.h>
-#include <errl/errltypes.H>
+#include <errl/hberrltypes.H>
 #include <hbotcompid.H>
 #include <errl/errlsctnhdr.H>
 
diff --git a/src/include/usr/errl/errlsctnhdr.H b/src/include/usr/errl/errlsctnhdr.H
index 069fa58ba..598b19150 100644
--- a/src/include/usr/errl/errlsctnhdr.H
+++ b/src/include/usr/errl/errlsctnhdr.H
@@ -38,7 +38,7 @@
 /*****************************************************************************/
 #include <stdint.h>
 #include <stdlib.h>
-#include <errl/errltypes.H>
+#include <errl/hberrltypes.H>
 #include <hbotcompid.H>
 #include <string.h>
 
diff --git a/src/include/usr/errl/errluserdetails.H b/src/include/usr/errl/errluserdetails.H
index 5ed8fe029..7dd052650 100755
--- a/src/include/usr/errl/errluserdetails.H
+++ b/src/include/usr/errl/errluserdetails.H
@@ -48,22 +48,21 @@
 /*****************************************************************************/
 // I n c l u d e s
 /*****************************************************************************/
-#include    <hbotcompid.H>      // list of compid's supported
 
-#include    <errl/errltypes.H>  //  errlver_t, errlsubsec_t
-#include    <errl/errlentry.H>  //  addFFDC, appendFFDC
+
+// safe to include these, PARSER or no PARSER
+#include    <hbotcompid.H>      // list of compid's supported
+#include    <errl/hberrltypes.H>  //  errlver_t, errlsubsec_t
 
 
 
-/*****************************************************************************/
-//  Typedefs
-/*****************************************************************************/
 
+#ifndef PARSER
+#include    <errl/errlentry.H>  //  addFFDC, appendFFDC
 
 namespace ERRORLOG
 {
 
-#ifndef PARSER
 
 /**
  * @brief ERRL User Data Details
@@ -179,6 +178,7 @@ private:
     uint32_t  iv_BufLen;        // Length of internal buffer
 
 };
+} // namespace 
 
 #else // (if PARSER defined)
 
@@ -196,6 +196,10 @@ private:
  *  These will compile and run in the errl tool.
  *
 */
+namespace ERRORLOG
+{
+
+
 class ErrlUserDetails
 {
 public:
@@ -251,8 +255,9 @@ private:
     ErrlUserDetails & operator=(const ErrlUserDetails &);
 };
 
-#endif //PARSER
+} // namespace
 
-} // end namespace
+
+#endif //PARSER
 
 #endif
diff --git a/src/include/usr/errl/errltypes.H b/src/include/usr/errl/hberrltypes.H
index ecd6e8187..3bb767b0c 100644
--- a/src/include/usr/errl/errltypes.H
+++ b/src/include/usr/errl/hberrltypes.H
@@ -1,7 +1,7 @@
 //  IBM_PROLOG_BEGIN_TAG
 //  This is an automatically generated prolog.
 //
-//  $Source: src/include/usr/errl/errltypes.H $
+//  $Source: src/include/usr/errl/hberrltypes.H $
 //
 //  IBM CONFIDENTIAL
 //
@@ -20,8 +20,8 @@
 //  Origin: 30
 //
 //  IBM_PROLOG_END
-#ifndef ERRLTYPES_H
-#define ERRLTYPES_H
+#ifndef HBERRLTYPES_H
+#define HBERRLTYPES_H
 /**
  *  @file errltypes.H
  *
@@ -40,7 +40,28 @@
  * @brief Pointer to an ErrlEntry object
  */
 namespace ERRORLOG { class ErrlEntry; };
-typedef ERRORLOG::ErrlEntry* errlHndl_t;
+
+
+
+// Identifiers for Hostboot ERRL user-defined data sections.
+// Range: 0 .. 255
+enum
+{
+    HBERRL_SST_NOFORMAT         = 0,
+    HBERRL_SST_DEFAULT          = 0,
+        HBERRL_VER_DEFAULT           = 0, // 0,0 not handled
+    HBERRL_SST_PRESIDENT        = 1, // testing
+    HBERRL_SST_FIRSTLADY        = 2, // testing
+    HBERRL_SST_STRING           = 3, // null-ended string
+        HBERRL_VER_STRINGNAME        = 0, // label: "Name"
+        HBERRL_VER_STRINGTASK        = 1, // label: "Task"
+        HBERRL_VER_STRINGTASKNAME    = 2, // label: "Task name"
+        HBERRL_VER_STRINGATTRNAME    = 3, // label: "Attribute name"
+        HBERRL_VER_STRINGFILENAME    = 4, // label: "File name"
+        HBERRL_VER_STRINGPROCNAME    = 5, // label: "Procedure name"
+    HBERRL_SST_BACKTRACE        = 4, // backtrace
+};
+
 
 /**
  * @brief Macros to store different numbers into uint64_t
@@ -493,4 +514,4 @@ typedef struct pelsrcsection
 
 } // End namespace
 
-#endif // ERRLTYPES_H
+#endif // HBERRLTYPES_H
diff --git a/src/include/usr/errl/parser/errlparserbase.H b/src/include/usr/errl/parser/errlparserbase.H
index f165f7514..b5074f2d5 100755
--- a/src/include/usr/errl/parser/errlparserbase.H
+++ b/src/include/usr/errl/parser/errlparserbase.H
@@ -49,7 +49,7 @@
 // Unavoidable include for va_list
 #include <cstdarg>
 
-#include <errl/errltypes.H>
+#include <errl/hberrltypes.H>
 
 /*****************************************************************************/
 //  Typedefs