summaryrefslogtreecommitdiffstats
path: root/src/usr/hwpf
diff options
context:
space:
mode:
Diffstat (limited to 'src/usr/hwpf')
-rwxr-xr-xsrc/usr/hwpf/fapi/fapiCreateIfAttrService.pl6
-rw-r--r--src/usr/hwpf/hwp/fapiHwpExecInitFile.C11
-rw-r--r--src/usr/hwpf/hwp/mvpd_accessors/setMvpdRing.C5
-rw-r--r--src/usr/hwpf/hwp/spd_accessors/getSpdAttrAccessor.C5
-rw-r--r--src/usr/hwpf/hwp/spd_accessors/getSpdAttrAccessorErrors.xml5
-rwxr-xr-xsrc/usr/hwpf/ifcompiler/initCompiler.C2
-rwxr-xr-xsrc/usr/hwpf/ifcompiler/initCompiler.H6
-rwxr-xr-xsrc/usr/hwpf/ifcompiler/initCompiler.lex11
-rwxr-xr-xsrc/usr/hwpf/ifcompiler/initCompiler.y5
-rwxr-xr-xsrc/usr/hwpf/ifcompiler/initRpn.C2
-rwxr-xr-xsrc/usr/hwpf/ifcompiler/initRpn.H6
-rwxr-xr-xsrc/usr/hwpf/ifcompiler/initScom.C6
-rwxr-xr-xsrc/usr/hwpf/ifcompiler/initScom.H6
-rwxr-xr-xsrc/usr/hwpf/ifcompiler/initSymbols.C6
-rwxr-xr-xsrc/usr/hwpf/ifcompiler/initSymbols.H6
-rw-r--r--src/usr/hwpf/makefile2
16 files changed, 64 insertions, 26 deletions
diff --git a/src/usr/hwpf/fapi/fapiCreateIfAttrService.pl b/src/usr/hwpf/fapi/fapiCreateIfAttrService.pl
index d1dbbc720..e1dc082af 100755
--- a/src/usr/hwpf/fapi/fapiCreateIfAttrService.pl
+++ b/src/usr/hwpf/fapi/fapiCreateIfAttrService.pl
@@ -6,7 +6,9 @@
#
# OpenPOWER HostBoot Project
#
-# COPYRIGHT International Business Machines Corp. 2011,2014
+# Contributors Listed Below - COPYRIGHT 2011,2014
+# [+] International Business Machines Corp.
+#
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -21,7 +23,7 @@
# permissions and limitations under the License.
#
# IBM_PROLOG_END_TAG
-#
+# $Id: fapiCreateIfAttrService.pl,v 1.9 2014/04/21 18:35:11 mjjones Exp $
# Purpose: This perl script will parse HWP Attribute XML files and
# initfile attr files and create the fapiGetInitFileAttr() function
# in a file called fapiAttributeService.C
diff --git a/src/usr/hwpf/hwp/fapiHwpExecInitFile.C b/src/usr/hwpf/hwp/fapiHwpExecInitFile.C
index 359e7b088..1bb1bb507 100644
--- a/src/usr/hwpf/hwp/fapiHwpExecInitFile.C
+++ b/src/usr/hwpf/hwp/fapiHwpExecInitFile.C
@@ -5,7 +5,9 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* COPYRIGHT International Business Machines Corp. 2011,2014 */
+/* Contributors Listed Below - COPYRIGHT 2011,2014 */
+/* [+] International Business Machines Corp. */
+/* */
/* */
/* Licensed under the Apache License, Version 2.0 (the "License"); */
/* you may not use this file except in compliance with the License. */
@@ -25,7 +27,7 @@
*
* @brief Implements a Hardware Procedure to execute an initfile.
*/
-
+// $Id: fapiHwpExecInitFile.C,v 1.21 2014/06/30 16:48:42 thi Exp $
/*
* Change Log ******************************************************************
* Flag Defect/Feature User Date Description
@@ -66,6 +68,7 @@
* SW187788 mww 02/27/2013 Add minimal succinct trace
* SW195717 mww 04/22/2013 Add function to dump ffdc
* and trace.
+ * SW251791 muqahmed 03/14/2014 Fixed compile warning
*/
#include <fapiHwpExecInitFile.H>
@@ -262,7 +265,7 @@ public:
iv_attrSymbolTableSize( 0 ),
iv_pLitSymbolTableAddr( NULL ),
- iv_litSymbolTableSize( NULL ),
+ iv_litSymbolTableSize( 0 ),
iv_pScomSectionAddr( NULL ),
iv_scomSectionSize( 0 ),
@@ -564,7 +567,7 @@ void InitFileStats::dump()
iv_litSymbolTableSize );
for ( int i=0; i<iv_litSymbolTableSize; i++ )
{
- FAPI_IMP( " 0xX%03x 0x%08x",
+ FAPI_IMP( " 0xX%03x 0x%08llx",
i+1,
iv_pLitSymbolTableAddr[i] );
}
diff --git a/src/usr/hwpf/hwp/mvpd_accessors/setMvpdRing.C b/src/usr/hwpf/hwp/mvpd_accessors/setMvpdRing.C
index dbeef398d..d28a810c8 100644
--- a/src/usr/hwpf/hwp/mvpd_accessors/setMvpdRing.C
+++ b/src/usr/hwpf/hwp/mvpd_accessors/setMvpdRing.C
@@ -5,7 +5,9 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* COPYRIGHT International Business Machines Corp. 2012,2014 */
+/* Contributors Listed Below - COPYRIGHT 2012,2014 */
+/* [+] International Business Machines Corp. */
+/* */
/* */
/* Licensed under the Apache License, Version 2.0 (the "License"); */
/* you may not use this file except in compliance with the License. */
@@ -20,6 +22,7 @@
/* permissions and limitations under the License. */
/* */
/* IBM_PROLOG_END_TAG */
+// $Id: setMvpdRing.C,v 1.2 2014/06/27 19:24:02 thi Exp $
/**
* @file setMvpdRing.C
*
diff --git a/src/usr/hwpf/hwp/spd_accessors/getSpdAttrAccessor.C b/src/usr/hwpf/hwp/spd_accessors/getSpdAttrAccessor.C
index 8f39440ac..d351e7e10 100644
--- a/src/usr/hwpf/hwp/spd_accessors/getSpdAttrAccessor.C
+++ b/src/usr/hwpf/hwp/spd_accessors/getSpdAttrAccessor.C
@@ -5,7 +5,9 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* COPYRIGHT International Business Machines Corp. 2013,2014 */
+/* Contributors Listed Below - COPYRIGHT 2013,2014 */
+/* [+] International Business Machines Corp. */
+/* */
/* */
/* Licensed under the Apache License, Version 2.0 (the "License"); */
/* you may not use this file except in compliance with the License. */
@@ -20,6 +22,7 @@
/* permissions and limitations under the License. */
/* */
/* IBM_PROLOG_END_TAG */
+// $Id: getSpdAttrAccessor.C,v 1.2 2014/06/27 19:46:27 thi Exp $
/**
* @file getSpdAttrAccessor.C
*
diff --git a/src/usr/hwpf/hwp/spd_accessors/getSpdAttrAccessorErrors.xml b/src/usr/hwpf/hwp/spd_accessors/getSpdAttrAccessorErrors.xml
index 2b76af1d4..625c29913 100644
--- a/src/usr/hwpf/hwp/spd_accessors/getSpdAttrAccessorErrors.xml
+++ b/src/usr/hwpf/hwp/spd_accessors/getSpdAttrAccessorErrors.xml
@@ -5,7 +5,9 @@
<!-- -->
<!-- OpenPOWER HostBoot Project -->
<!-- -->
-<!-- COPYRIGHT International Business Machines Corp. 2013,2014 -->
+<!-- Contributors Listed Below - COPYRIGHT 2013,2014 -->
+<!-- [+] International Business Machines Corp. -->
+<!-- -->
<!-- -->
<!-- Licensed under the Apache License, Version 2.0 (the "License"); -->
<!-- you may not use this file except in compliance with the License. -->
@@ -20,6 +22,7 @@
<!-- permissions and limitations under the License. -->
<!-- -->
<!-- IBM_PROLOG_END_TAG -->
+<!-- $Id: getSpdAttrAccessorErrors.xml,v 1.2 2014/06/27 19:55:53 thi Exp $ -->
<hwpErrors>
<!-- ********************************************************************* -->
<hwpError>
diff --git a/src/usr/hwpf/ifcompiler/initCompiler.C b/src/usr/hwpf/ifcompiler/initCompiler.C
index cef35fc5f..0ea6dfb7d 100755
--- a/src/usr/hwpf/ifcompiler/initCompiler.C
+++ b/src/usr/hwpf/ifcompiler/initCompiler.C
@@ -35,7 +35,7 @@
// camvanng 04/12/12 Ability to specify search paths for include files
// camvanng 06/27/12 Improve error and debug tracing
// End Change Log *********************************************************************************
-
+// $Id: initCompiler.C,v 1.4 2014/06/27 19:59:45 thi Exp $
/**
* @file initCompiler.C
* @brief Compile an initfile into bytecode.
diff --git a/src/usr/hwpf/ifcompiler/initCompiler.H b/src/usr/hwpf/ifcompiler/initCompiler.H
index d2a6fa756..9655554e5 100755
--- a/src/usr/hwpf/ifcompiler/initCompiler.H
+++ b/src/usr/hwpf/ifcompiler/initCompiler.H
@@ -5,7 +5,9 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* COPYRIGHT International Business Machines Corp. 2010,2014 */
+/* Contributors Listed Below - COPYRIGHT 2011,2014 */
+/* [+] International Business Machines Corp. */
+/* */
/* */
/* Licensed under the Apache License, Version 2.0 (the "License"); */
/* you may not use this file except in compliance with the License. */
@@ -36,7 +38,7 @@
// camvanng 04/12/12 Ability to specify search paths for include files
// camvanng 06/27/12 Improve error and debug tracing
// End Change Log *********************************************************************************
-
+// $Id: initCompiler.H,v 1.4 2014/06/27 20:02:27 thi Exp $
/**
* @file initCompiler.H
* @brief Compile an initfile into bytecode.
diff --git a/src/usr/hwpf/ifcompiler/initCompiler.lex b/src/usr/hwpf/ifcompiler/initCompiler.lex
index 8836386bf..26248e7d9 100755
--- a/src/usr/hwpf/ifcompiler/initCompiler.lex
+++ b/src/usr/hwpf/ifcompiler/initCompiler.lex
@@ -5,7 +5,9 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* COPYRIGHT International Business Machines Corp. 2010,2014 */
+/* Contributors Listed Below - COPYRIGHT 2011,2014 */
+/* [+] International Business Machines Corp. */
+/* */
/* */
/* Licensed under the Apache License, Version 2.0 (the "License"); */
/* you may not use this file except in compliance with the License. */
@@ -21,6 +23,7 @@
/* */
/* IBM_PROLOG_END_TAG */
/* Change Log *************************************************************************************
+// $Id: initCompiler.lex,v 1.15 2014/07/07 20:44:40 thi Exp $
//
// Flag Track Userid Date Description
// ---- -------- -------- -------- -------------------------------------------------------------
@@ -46,6 +49,7 @@
// camvanng 06/15/12 Ability to do bitwise OR and AND operations
// camvanng 06/27/12 Improve error handling
// camvanng 07/12/12 Support for "ANY"
+// thi 07/07/14 Add compilation option to sync with HB and CVS
// End Change Log *********************************************************************************/
/**
* @file initCompiler.lex
@@ -61,7 +65,12 @@
#include <iomanip>
#include <vector>
#include <initRpn.H>
+
+#ifdef HOSTBOOT_COMPILE
#include <ifcompiler.y.tab.h>
+#else
+#include <y.tab.h>
+#endif
uint64_t bits2int( const char * bitString);
uint64_t hexs2int(const char * hexString, int32_t size);
diff --git a/src/usr/hwpf/ifcompiler/initCompiler.y b/src/usr/hwpf/ifcompiler/initCompiler.y
index 081c3b573..cacc890f3 100755
--- a/src/usr/hwpf/ifcompiler/initCompiler.y
+++ b/src/usr/hwpf/ifcompiler/initCompiler.y
@@ -5,7 +5,9 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* COPYRIGHT International Business Machines Corp. 2010,2014 */
+/* Contributors Listed Below - COPYRIGHT 2011,2014 */
+/* [+] International Business Machines Corp. */
+/* */
/* */
/* Licensed under the Apache License, Version 2.0 (the "License"); */
/* you may not use this file except in compliance with the License. */
@@ -43,6 +45,7 @@
// camvanng 06/15/12 Ability to do bitwise OR and AND operations
// camvanng 06/27/12 Improve error and debug tracing
// End Change Log *********************************************************************************
+// $Id: initCompiler.y,v 1.10 2014/06/30 19:49:24 thi Exp $
/**
* @file initCompiler.y
* @brief Contains the yacc/bison code for parsing an initfile.
diff --git a/src/usr/hwpf/ifcompiler/initRpn.C b/src/usr/hwpf/ifcompiler/initRpn.C
index 66e0637c8..1679d38c6 100755
--- a/src/usr/hwpf/ifcompiler/initRpn.C
+++ b/src/usr/hwpf/ifcompiler/initRpn.C
@@ -45,7 +45,7 @@
// camvanng 06/15/12 Ability to do bitwise OR and AND operations
// camvanng 06/27/12 Improve error and debug tracing
// End Change Log *********************************************************************************
-
+// $Id: initRpn.C,v 1.11 2014/06/30 19:56:40 thi Exp $
/**
* @file initRpn.C
* @brief Definition of the initRpn class. Handles Reverse Polish Notation equations for initfiles
diff --git a/src/usr/hwpf/ifcompiler/initRpn.H b/src/usr/hwpf/ifcompiler/initRpn.H
index d3728a238..c63933a33 100755
--- a/src/usr/hwpf/ifcompiler/initRpn.H
+++ b/src/usr/hwpf/ifcompiler/initRpn.H
@@ -5,7 +5,9 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* COPYRIGHT International Business Machines Corp. 2010,2014 */
+/* Contributors Listed Below - COPYRIGHT 2011,2014 */
+/* [+] International Business Machines Corp. */
+/* */
/* */
/* Licensed under the Apache License, Version 2.0 (the "License"); */
/* you may not use this file except in compliance with the License. */
@@ -40,7 +42,7 @@
// SW146714 camvanng 06/08/12 Use two bytes to store row rpn sequence byte count
// camvanng 06/27/12 Delete push_attr_enum()
// End Change Log *********************************************************************************
-
+// $Id: initRpn.H,v 1.8 2014/06/30 19:56:53 thi Exp $
/**
* @file initRpn.H
* @brief Declaration of the initRpn class. Handles Reverse Polish Notation equations for initfiles
diff --git a/src/usr/hwpf/ifcompiler/initScom.C b/src/usr/hwpf/ifcompiler/initScom.C
index 4fc17459a..35b93812c 100755
--- a/src/usr/hwpf/ifcompiler/initScom.C
+++ b/src/usr/hwpf/ifcompiler/initScom.C
@@ -5,7 +5,9 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* COPYRIGHT International Business Machines Corp. 2010,2014 */
+/* Contributors Listed Below - COPYRIGHT 2011,2014 */
+/* [+] International Business Machines Corp. */
+/* */
/* */
/* Licensed under the Apache License, Version 2.0 (the "License"); */
/* you may not use this file except in compliance with the License. */
@@ -46,7 +48,7 @@
// Handle case where after row_optimize(), there's no Scom to write
// camvanng 06/27/12 Improve error and debug tracing
// End Change Log *********************************************************************************
-
+// $Id: initScom.C,v 1.11 2014/06/30 20:20:00 thi Exp $
/**
* @file initSpy.C
* @brief Definition of the initScom Class. Represents the information parsed from an initfile scom
diff --git a/src/usr/hwpf/ifcompiler/initScom.H b/src/usr/hwpf/ifcompiler/initScom.H
index cd556c239..5b342d5ad 100755
--- a/src/usr/hwpf/ifcompiler/initScom.H
+++ b/src/usr/hwpf/ifcompiler/initScom.H
@@ -5,7 +5,9 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* COPYRIGHT International Business Machines Corp. 2010,2014 */
+/* Contributors Listed Below - COPYRIGHT 2011,2014 */
+/* [+] International Business Machines Corp. */
+/* */
/* */
/* Licensed under the Apache License, Version 2.0 (the "License"); */
/* you may not use this file except in compliance with the License. */
@@ -43,7 +45,7 @@
// Delete obsolete code for defines support
// camvanng 06/27/12 Improve error and debug tracing
// End Change Log *********************************************************************************
-
+// $Id: initScom.H,v 1.9 2014/06/30 20:19:48 thi Exp $
/**
* @file initSpy.H
* @brief Declairation of the initSpy Class. Represents the information parsed from an initfile spy
diff --git a/src/usr/hwpf/ifcompiler/initSymbols.C b/src/usr/hwpf/ifcompiler/initSymbols.C
index bb4c11bf1..5ffbd013e 100755
--- a/src/usr/hwpf/ifcompiler/initSymbols.C
+++ b/src/usr/hwpf/ifcompiler/initSymbols.C
@@ -5,7 +5,9 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* COPYRIGHT International Business Machines Corp. 2010,2014 */
+/* Contributors Listed Below - COPYRIGHT 2011,2014 */
+/* [+] International Business Machines Corp. */
+/* */
/* */
/* Licensed under the Apache License, Version 2.0 (the "License"); */
/* you may not use this file except in compliance with the License. */
@@ -40,7 +42,7 @@
// camvanng 06/27/12 Improve error and debug tracing
// Add get_numeric_array_data()
// End Change Log *********************************************************************************
-
+// $Id: initSymbols.C,v 1.8 2014/06/30 20:27:49 thi Exp $
/**
* @file initSymbols.C
* @brief Definition of the initSymbols class. Handles all symbols for initfiles
diff --git a/src/usr/hwpf/ifcompiler/initSymbols.H b/src/usr/hwpf/ifcompiler/initSymbols.H
index 00472d144..f1653f2d3 100755
--- a/src/usr/hwpf/ifcompiler/initSymbols.H
+++ b/src/usr/hwpf/ifcompiler/initSymbols.H
@@ -5,7 +5,9 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* COPYRIGHT International Business Machines Corp. 2010,2014 */
+/* Contributors Listed Below - COPYRIGHT 2011,2014 */
+/* [+] International Business Machines Corp. */
+/* */
/* */
/* Licensed under the Apache License, Version 2.0 (the "License"); */
/* you may not use this file except in compliance with the License. */
@@ -40,7 +42,7 @@
// camvanng 05/07/12 Support for associated target attributes
// camvanng 06/27/12 Add get_numeric_array_data()
// End Change Log *********************************************************************************
-
+// $Id: initSymbols.H,v 1.7 2014/06/30 20:28:09 thi Exp $
/**
* @file initSymbols.H
* @brief Definition of the initSymbols class. Handles all symbols for initfiles
diff --git a/src/usr/hwpf/makefile b/src/usr/hwpf/makefile
index 9cbb5eacb..4bf12e074 100644
--- a/src/usr/hwpf/makefile
+++ b/src/usr/hwpf/makefile
@@ -389,7 +389,7 @@ $(GENDIR)/$(IF_CMP_FLEX_TARGET:.c=.host.o): \
$(GENDIR)/$(IF_CMP_FLEX_TARGET) $(IF_COMPILER_H_FILES) \
$(GENDIR)/$(IF_CMP_YACC_H_TARGET)
$(C2) " CXX $(notdir $<)"
- $(C1)$(CCACHE) $(HOST_PREFIX)g++ -O3 $< -I ifcompiler -I $(GENDIR) \
+ $(C1)$(CCACHE) $(HOST_PREFIX)g++ -O3 -DHOSTBOOT_COMPILE $< -I ifcompiler -I $(GENDIR) \
-I $(GENDIR)/$(IF_CMP_SUBDIR) \
-I $(ROOTPATH)/src/include/usr/hwpf/hwp -c -o $@
OpenPOWER on IntegriCloud