diff options
-rw-r--r-- | src/makefile | 2 | ||||
-rw-r--r-- | src/usr/diag/prdf/common/prdf_common_fsp_and_hb.mk | 24 | ||||
-rwxr-xr-x | src/usr/diag/prdf/common/rule/iipTemplates.C (renamed from src/usr/diag/prdf/common/framework/rule/iipTemplates.C) | 6 | ||||
-rwxr-xr-x | src/usr/diag/prdf/common/rule/prdfGroup.C (renamed from src/usr/diag/prdf/common/framework/rule/prdfGroup.C) | 4 | ||||
-rwxr-xr-x | src/usr/diag/prdf/common/rule/prdfGroup.H (renamed from src/usr/diag/prdf/common/framework/rule/prdfGroup.H) | 4 | ||||
-rwxr-xr-x | src/usr/diag/prdf/common/rule/prdfPluginDef.H (renamed from src/usr/diag/prdf/common/framework/rule/prdfPluginDef.H) | 4 | ||||
-rwxr-xr-x | src/usr/diag/prdf/common/rule/prdfPluginMap.C (renamed from src/usr/diag/prdf/common/framework/rule/prdfPluginMap.C) | 6 | ||||
-rwxr-xr-x | src/usr/diag/prdf/common/rule/prdfPluginMap.H (renamed from src/usr/diag/prdf/common/framework/rule/prdfPluginMap.H) | 6 | ||||
-rw-r--r--[-rwxr-xr-x] | src/usr/diag/prdf/common/rule/prdfRuleChip.C (renamed from src/usr/diag/prdf/common/framework/rule/prdfRuleChip.C) | 4 | ||||
-rw-r--r--[-rwxr-xr-x] | src/usr/diag/prdf/common/rule/prdfRuleChip.H (renamed from src/usr/diag/prdf/common/framework/rule/prdfRuleChip.H) | 4 | ||||
-rwxr-xr-x | src/usr/diag/prdf/common/rule/prdfRuleFiles.C (renamed from src/usr/diag/prdf/common/framework/rule/prdfRuleFiles.C) | 4 | ||||
-rwxr-xr-x | src/usr/diag/prdf/common/rule/prdfRuleFiles.H (renamed from src/usr/diag/prdf/common/framework/rule/prdfRuleFiles.H) | 4 | ||||
-rw-r--r-- | src/usr/diag/prdf/common/rule/prdfRuleMetaData.C (renamed from src/usr/diag/prdf/common/framework/rule/prdfRuleMetaData.C) | 4 | ||||
-rw-r--r-- | src/usr/diag/prdf/common/rule/prdfRuleMetaData.H (renamed from src/usr/diag/prdf/common/framework/rule/prdfRuleMetaData.H) | 6 | ||||
-rw-r--r-- | src/usr/diag/prdf/common/rule/prdf_rule.mk (renamed from src/usr/diag/prdf/common/framework/rule/prdf_rule.mk) | 4 | ||||
-rwxr-xr-x | src/usr/diag/prdf/common/rule/prdrChip.H (renamed from src/usr/diag/prdf/common/framework/rule/prdrChip.H) | 6 | ||||
-rwxr-xr-x | src/usr/diag/prdf/common/rule/prdrCommon.H (renamed from src/usr/diag/prdf/common/framework/rule/prdrCommon.H) | 4 | ||||
-rw-r--r--[-rwxr-xr-x] | src/usr/diag/prdf/common/rule/prdrCompile.C (renamed from src/usr/diag/prdf/common/framework/rule/prdrCompile.C) | 4 | ||||
-rwxr-xr-x | src/usr/diag/prdf/common/rule/prdrCompile.lex (renamed from src/usr/diag/prdf/common/framework/rule/prdrCompile.lex) | 4 | ||||
-rw-r--r--[-rwxr-xr-x] | src/usr/diag/prdf/common/rule/prdrCompile.y (renamed from src/usr/diag/prdf/common/framework/rule/prdrCompile.y) | 4 | ||||
-rwxr-xr-x | src/usr/diag/prdf/common/rule/prdrExpr.H (renamed from src/usr/diag/prdf/common/framework/rule/prdrExpr.H) | 4 | ||||
-rwxr-xr-x | src/usr/diag/prdf/common/rule/prdrGroup.H (renamed from src/usr/diag/prdf/common/framework/rule/prdrGroup.H) | 4 | ||||
-rw-r--r--[-rwxr-xr-x] | src/usr/diag/prdf/common/rule/prdrLoadChip.C (renamed from src/usr/diag/prdf/common/framework/rule/prdrLoadChip.C) | 6 | ||||
-rwxr-xr-x | src/usr/diag/prdf/common/rule/prdrLoadChip.H (renamed from src/usr/diag/prdf/common/framework/rule/prdrLoadChip.H) | 4 | ||||
-rw-r--r--[-rwxr-xr-x] | src/usr/diag/prdf/common/rule/prdrLoadChipCache.C (renamed from src/usr/diag/prdf/common/framework/rule/prdrLoadChipCache.C) | 4 | ||||
-rwxr-xr-x | src/usr/diag/prdf/common/rule/prdrLoadChipCache.H (renamed from src/usr/diag/prdf/common/framework/rule/prdrLoadChipCache.H) | 6 | ||||
-rwxr-xr-x | src/usr/diag/prdf/common/rule/prdrRegister.H (renamed from src/usr/diag/prdf/common/framework/rule/prdrRegister.H) | 4 | ||||
-rwxr-xr-x | src/usr/diag/prdf/common/rule/prdrSignatures.H (renamed from src/usr/diag/prdf/common/framework/rule/prdrSignatures.H) | 6 | ||||
-rwxr-xr-x | src/usr/diag/prdf/common/rule/prdrToken.H (renamed from src/usr/diag/prdf/common/framework/rule/prdrToken.H) | 6 | ||||
-rwxr-xr-x | src/usr/diag/prdf/common/rule/prdrpp (renamed from src/usr/diag/prdf/common/framework/rule/prdrpp) | 6 | ||||
-rwxr-xr-x | src/usr/diag/prdf/common/rule/tables.mk (renamed from src/usr/diag/prdf/common/framework/rule/tables.mk) | 4 | ||||
-rwxr-xr-x | src/usr/diag/prdf/framework/makefile | 29 | ||||
-rwxr-xr-x | src/usr/diag/prdf/makefile | 9 | ||||
-rwxr-xr-x | src/usr/diag/prdf/rule/makefile (renamed from src/usr/diag/prdf/framework/rule/makefile) | 28 | ||||
-rwxr-xr-x | src/usr/diag/prdf/test/prdf_hb_common_test.mk | 2 |
35 files changed, 107 insertions, 123 deletions
diff --git a/src/makefile b/src/makefile index 811443a1c..63e233780 100644 --- a/src/makefile +++ b/src/makefile @@ -295,7 +295,7 @@ hbicore_EXTENDED_MODULES += ${EXTENDED_MODULES} hbicore_LDFILE = kernel.ld # for PRDR_RULE_TABLE_TARGETS -include ${ROOTPATH}/src/usr/diag/prdf/common/framework/rule/prdf_rule.mk +include ${ROOTPATH}/src/usr/diag/prdf/common/rule/prdf_rule.mk hbicore_test_OBJECTS += ${hbicore_OBJECTS} hbicore_test_MODULES += ${hbicore_MODULES} diff --git a/src/usr/diag/prdf/common/prdf_common_fsp_and_hb.mk b/src/usr/diag/prdf/common/prdf_common_fsp_and_hb.mk index 3d654a425..a46f966c4 100644 --- a/src/usr/diag/prdf/common/prdf_common_fsp_and_hb.mk +++ b/src/usr/diag/prdf/common/prdf_common_fsp_and_hb.mk @@ -34,12 +34,12 @@ prd_vpath += ${PRD_SRC_PATH}/common/include prd_vpath += ${PRD_SRC_PATH}/common/framework/config prd_vpath += ${PRD_SRC_PATH}/common/framework/register prd_vpath += ${PRD_SRC_PATH}/common/framework/resolution -prd_vpath += ${PRD_SRC_PATH}/common/framework/rule prd_vpath += ${PRD_SRC_PATH}/common/framework/service prd_vpath += ${PRD_SRC_PATH}/common/mnfgtools prd_vpath += ${PRD_SRC_PATH}/common/plat prd_vpath += ${PRD_SRC_PATH}/common/plat/pegasus prd_vpath += ${PRD_SRC_PATH}/common/plugins +prd_vpath += ${PRD_SRC_PATH}/common/rule prd_vpath += ${PRD_SRC_PATH}/common/runtime prd_vpath += ${PRD_SRC_PATH}/common/util @@ -47,12 +47,12 @@ prd_incpath += ${PRD_SRC_PATH}/common prd_incpath += ${PRD_SRC_PATH}/common/framework/config prd_incpath += ${PRD_SRC_PATH}/common/framework/register prd_incpath += ${PRD_SRC_PATH}/common/framework/resolution -prd_incpath += ${PRD_SRC_PATH}/common/framework/rule prd_incpath += ${PRD_SRC_PATH}/common/framework/service prd_incpath += ${PRD_SRC_PATH}/common/mnfgtools prd_incpath += ${PRD_SRC_PATH}/common/plat prd_incpath += ${PRD_SRC_PATH}/common/plat/pegasus prd_incpath += ${PRD_SRC_PATH}/common/plugins +prd_incpath += ${PRD_SRC_PATH}/common/rule prd_incpath += ${PRD_SRC_PATH}/common/runtime prd_incpath += ${PRD_SRC_PATH}/common/util @@ -95,16 +95,6 @@ prd_obj += prdfResolutionMap.o prd_obj += prdfThresholdResolutions.o prd_obj += xspprdFlagResolution.o -# common/framework/rule/ -prd_obj += iipTemplates.o -prd_obj += prdfGroup.o -prd_obj += prdfPluginMap.o -prd_obj += prdfRuleChip.o -prd_obj += prdfRuleFiles.o -prd_obj += prdfRuleMetaData.o -prd_obj += prdrLoadChip.o -prd_obj += prdrLoadChipCache.o - # common/framework/service/ prd_obj_no_sim += prdfPlatServices_common.o prd_obj += prdfRasServices_common.o @@ -155,6 +145,16 @@ prd_obj += prdfLineDelete.o # common/plugins/ (errl plugin related) prd_obj += prdfParserUtils.o +# common/rule/ +prd_obj += iipTemplates.o +prd_obj += prdfGroup.o +prd_obj += prdfPluginMap.o +prd_obj += prdfRuleChip.o +prd_obj += prdfRuleFiles.o +prd_obj += prdfRuleMetaData.o +prd_obj += prdrLoadChip.o +prd_obj += prdrLoadChipCache.o + # common/util/ prd_obj += iipdgtb.o prd_obj += iipdigit.o diff --git a/src/usr/diag/prdf/common/framework/rule/iipTemplates.C b/src/usr/diag/prdf/common/rule/iipTemplates.C index ef42dc412..d629c06e3 100755 --- a/src/usr/diag/prdf/common/framework/rule/iipTemplates.C +++ b/src/usr/diag/prdf/common/rule/iipTemplates.C @@ -1,11 +1,13 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/prdf/common/framework/rule/iipTemplates.C $ */ +/* $Source: src/usr/diag/prdf/common/rule/iipTemplates.C $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 1996,2014 */ +/* Contributors Listed Below - COPYRIGHT 2016 */ +/* [+] 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. */ diff --git a/src/usr/diag/prdf/common/framework/rule/prdfGroup.C b/src/usr/diag/prdf/common/rule/prdfGroup.C index 61043540a..fd5651f17 100755 --- a/src/usr/diag/prdf/common/framework/rule/prdfGroup.C +++ b/src/usr/diag/prdf/common/rule/prdfGroup.C @@ -1,11 +1,11 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/prdf/common/framework/rule/prdfGroup.C $ */ +/* $Source: src/usr/diag/prdf/common/rule/prdfGroup.C $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2015 */ +/* Contributors Listed Below - COPYRIGHT 2016 */ /* [+] International Business Machines Corp. */ /* */ /* */ diff --git a/src/usr/diag/prdf/common/framework/rule/prdfGroup.H b/src/usr/diag/prdf/common/rule/prdfGroup.H index de859c960..1bc843999 100755 --- a/src/usr/diag/prdf/common/framework/rule/prdfGroup.H +++ b/src/usr/diag/prdf/common/rule/prdfGroup.H @@ -1,11 +1,11 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/prdf/common/framework/rule/prdfGroup.H $ */ +/* $Source: src/usr/diag/prdf/common/rule/prdfGroup.H $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2015 */ +/* Contributors Listed Below - COPYRIGHT 2016 */ /* [+] International Business Machines Corp. */ /* */ /* */ diff --git a/src/usr/diag/prdf/common/framework/rule/prdfPluginDef.H b/src/usr/diag/prdf/common/rule/prdfPluginDef.H index a3c1f7164..2dce1b221 100755 --- a/src/usr/diag/prdf/common/framework/rule/prdfPluginDef.H +++ b/src/usr/diag/prdf/common/rule/prdfPluginDef.H @@ -1,11 +1,11 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/prdf/common/framework/rule/prdfPluginDef.H $ */ +/* $Source: src/usr/diag/prdf/common/rule/prdfPluginDef.H $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2015 */ +/* Contributors Listed Below - COPYRIGHT 2016 */ /* [+] International Business Machines Corp. */ /* */ /* */ diff --git a/src/usr/diag/prdf/common/framework/rule/prdfPluginMap.C b/src/usr/diag/prdf/common/rule/prdfPluginMap.C index aeeed3ca3..130b1cce8 100755 --- a/src/usr/diag/prdf/common/framework/rule/prdfPluginMap.C +++ b/src/usr/diag/prdf/common/rule/prdfPluginMap.C @@ -1,11 +1,13 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/prdf/common/framework/rule/prdfPluginMap.C $ */ +/* $Source: src/usr/diag/prdf/common/rule/prdfPluginMap.C $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2005,2014 */ +/* Contributors Listed Below - COPYRIGHT 2016 */ +/* [+] 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. */ diff --git a/src/usr/diag/prdf/common/framework/rule/prdfPluginMap.H b/src/usr/diag/prdf/common/rule/prdfPluginMap.H index 0f88048f9..3d8c2b5d2 100755 --- a/src/usr/diag/prdf/common/framework/rule/prdfPluginMap.H +++ b/src/usr/diag/prdf/common/rule/prdfPluginMap.H @@ -1,11 +1,13 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/prdf/common/framework/rule/prdfPluginMap.H $ */ +/* $Source: src/usr/diag/prdf/common/rule/prdfPluginMap.H $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2005,2014 */ +/* Contributors Listed Below - COPYRIGHT 2016 */ +/* [+] 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. */ diff --git a/src/usr/diag/prdf/common/framework/rule/prdfRuleChip.C b/src/usr/diag/prdf/common/rule/prdfRuleChip.C index 21825b065..f12b99e92 100755..100644 --- a/src/usr/diag/prdf/common/framework/rule/prdfRuleChip.C +++ b/src/usr/diag/prdf/common/rule/prdfRuleChip.C @@ -1,11 +1,11 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/prdf/common/framework/rule/prdfRuleChip.C $ */ +/* $Source: src/usr/diag/prdf/common/rule/prdfRuleChip.C $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2015 */ +/* Contributors Listed Below - COPYRIGHT 2016 */ /* [+] International Business Machines Corp. */ /* */ /* */ diff --git a/src/usr/diag/prdf/common/framework/rule/prdfRuleChip.H b/src/usr/diag/prdf/common/rule/prdfRuleChip.H index 5eb661925..a6502c241 100755..100644 --- a/src/usr/diag/prdf/common/framework/rule/prdfRuleChip.H +++ b/src/usr/diag/prdf/common/rule/prdfRuleChip.H @@ -1,11 +1,11 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/prdf/common/framework/rule/prdfRuleChip.H $ */ +/* $Source: src/usr/diag/prdf/common/rule/prdfRuleChip.H $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2015 */ +/* Contributors Listed Below - COPYRIGHT 2016 */ /* [+] International Business Machines Corp. */ /* */ /* */ diff --git a/src/usr/diag/prdf/common/framework/rule/prdfRuleFiles.C b/src/usr/diag/prdf/common/rule/prdfRuleFiles.C index dfe079d0b..36830a723 100755 --- a/src/usr/diag/prdf/common/framework/rule/prdfRuleFiles.C +++ b/src/usr/diag/prdf/common/rule/prdfRuleFiles.C @@ -1,11 +1,11 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/prdf/common/framework/rule/prdfRuleFiles.C $ */ +/* $Source: src/usr/diag/prdf/common/rule/prdfRuleFiles.C $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2015 */ +/* Contributors Listed Below - COPYRIGHT 2016 */ /* [+] International Business Machines Corp. */ /* */ /* */ diff --git a/src/usr/diag/prdf/common/framework/rule/prdfRuleFiles.H b/src/usr/diag/prdf/common/rule/prdfRuleFiles.H index a30aad875..f60c88e84 100755 --- a/src/usr/diag/prdf/common/framework/rule/prdfRuleFiles.H +++ b/src/usr/diag/prdf/common/rule/prdfRuleFiles.H @@ -1,11 +1,11 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/prdf/common/framework/rule/prdfRuleFiles.H $ */ +/* $Source: src/usr/diag/prdf/common/rule/prdfRuleFiles.H $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2015 */ +/* Contributors Listed Below - COPYRIGHT 2016 */ /* [+] International Business Machines Corp. */ /* */ /* */ diff --git a/src/usr/diag/prdf/common/framework/rule/prdfRuleMetaData.C b/src/usr/diag/prdf/common/rule/prdfRuleMetaData.C index 5b69db665..3e20d2c9d 100644 --- a/src/usr/diag/prdf/common/framework/rule/prdfRuleMetaData.C +++ b/src/usr/diag/prdf/common/rule/prdfRuleMetaData.C @@ -1,11 +1,11 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/prdf/common/framework/rule/prdfRuleMetaData.C $ */ +/* $Source: src/usr/diag/prdf/common/rule/prdfRuleMetaData.C $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2013,2015 */ +/* Contributors Listed Below - COPYRIGHT 2016 */ /* [+] International Business Machines Corp. */ /* */ /* */ diff --git a/src/usr/diag/prdf/common/framework/rule/prdfRuleMetaData.H b/src/usr/diag/prdf/common/rule/prdfRuleMetaData.H index daa02e848..c6383c2df 100644 --- a/src/usr/diag/prdf/common/framework/rule/prdfRuleMetaData.H +++ b/src/usr/diag/prdf/common/rule/prdfRuleMetaData.H @@ -1,11 +1,13 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/prdf/common/framework/rule/prdfRuleMetaData.H $ */ +/* $Source: src/usr/diag/prdf/common/rule/prdfRuleMetaData.H $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2004,2014 */ +/* Contributors Listed Below - COPYRIGHT 2016 */ +/* [+] 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. */ diff --git a/src/usr/diag/prdf/common/framework/rule/prdf_rule.mk b/src/usr/diag/prdf/common/rule/prdf_rule.mk index 72e92ce53..3b80b3eb3 100644 --- a/src/usr/diag/prdf/common/framework/rule/prdf_rule.mk +++ b/src/usr/diag/prdf/common/rule/prdf_rule.mk @@ -1,11 +1,11 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/usr/diag/prdf/common/framework/rule/prdf_rule.mk $ +# $Source: src/usr/diag/prdf/common/rule/prdf_rule.mk $ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2014,2015 +# Contributors Listed Below - COPYRIGHT 2016 # [+] International Business Machines Corp. # # diff --git a/src/usr/diag/prdf/common/framework/rule/prdrChip.H b/src/usr/diag/prdf/common/rule/prdrChip.H index 8cd91acba..0a087c6a2 100755 --- a/src/usr/diag/prdf/common/framework/rule/prdrChip.H +++ b/src/usr/diag/prdf/common/rule/prdrChip.H @@ -1,11 +1,13 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/prdf/common/framework/rule/prdrChip.H $ */ +/* $Source: src/usr/diag/prdf/common/rule/prdrChip.H $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2004,2014 */ +/* Contributors Listed Below - COPYRIGHT 2016 */ +/* [+] 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. */ diff --git a/src/usr/diag/prdf/common/framework/rule/prdrCommon.H b/src/usr/diag/prdf/common/rule/prdrCommon.H index 9d1656ad0..a6560bb46 100755 --- a/src/usr/diag/prdf/common/framework/rule/prdrCommon.H +++ b/src/usr/diag/prdf/common/rule/prdrCommon.H @@ -1,11 +1,11 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/prdf/common/framework/rule/prdrCommon.H $ */ +/* $Source: src/usr/diag/prdf/common/rule/prdrCommon.H $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2015 */ +/* Contributors Listed Below - COPYRIGHT 2016 */ /* [+] International Business Machines Corp. */ /* */ /* */ diff --git a/src/usr/diag/prdf/common/framework/rule/prdrCompile.C b/src/usr/diag/prdf/common/rule/prdrCompile.C index 1aa356f19..67f417fbf 100755..100644 --- a/src/usr/diag/prdf/common/framework/rule/prdrCompile.C +++ b/src/usr/diag/prdf/common/rule/prdrCompile.C @@ -1,11 +1,11 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/prdf/common/framework/rule/prdrCompile.C $ */ +/* $Source: src/usr/diag/prdf/common/rule/prdrCompile.C $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2015 */ +/* Contributors Listed Below - COPYRIGHT 2016 */ /* [+] International Business Machines Corp. */ /* */ /* */ diff --git a/src/usr/diag/prdf/common/framework/rule/prdrCompile.lex b/src/usr/diag/prdf/common/rule/prdrCompile.lex index 27678df71..8ce3182ff 100755 --- a/src/usr/diag/prdf/common/framework/rule/prdrCompile.lex +++ b/src/usr/diag/prdf/common/rule/prdrCompile.lex @@ -1,11 +1,11 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/prdf/common/framework/rule/prdrCompile.lex $ */ +/* $Source: src/usr/diag/prdf/common/rule/prdrCompile.lex $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2015 */ +/* Contributors Listed Below - COPYRIGHT 2016 */ /* [+] International Business Machines Corp. */ /* */ /* */ diff --git a/src/usr/diag/prdf/common/framework/rule/prdrCompile.y b/src/usr/diag/prdf/common/rule/prdrCompile.y index 2087d6c4d..48120ec4b 100755..100644 --- a/src/usr/diag/prdf/common/framework/rule/prdrCompile.y +++ b/src/usr/diag/prdf/common/rule/prdrCompile.y @@ -1,11 +1,11 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/prdf/common/framework/rule/prdrCompile.y $ */ +/* $Source: src/usr/diag/prdf/common/rule/prdrCompile.y $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2015 */ +/* Contributors Listed Below - COPYRIGHT 2016 */ /* [+] International Business Machines Corp. */ /* */ /* */ diff --git a/src/usr/diag/prdf/common/framework/rule/prdrExpr.H b/src/usr/diag/prdf/common/rule/prdrExpr.H index 6393da915..ceb97e758 100755 --- a/src/usr/diag/prdf/common/framework/rule/prdrExpr.H +++ b/src/usr/diag/prdf/common/rule/prdrExpr.H @@ -1,11 +1,11 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/prdf/common/framework/rule/prdrExpr.H $ */ +/* $Source: src/usr/diag/prdf/common/rule/prdrExpr.H $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2015 */ +/* Contributors Listed Below - COPYRIGHT 2016 */ /* [+] International Business Machines Corp. */ /* */ /* */ diff --git a/src/usr/diag/prdf/common/framework/rule/prdrGroup.H b/src/usr/diag/prdf/common/rule/prdrGroup.H index b0cb90afb..567b222a6 100755 --- a/src/usr/diag/prdf/common/framework/rule/prdrGroup.H +++ b/src/usr/diag/prdf/common/rule/prdrGroup.H @@ -1,11 +1,11 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/prdf/common/framework/rule/prdrGroup.H $ */ +/* $Source: src/usr/diag/prdf/common/rule/prdrGroup.H $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2016 */ /* [+] International Business Machines Corp. */ /* */ /* */ diff --git a/src/usr/diag/prdf/common/framework/rule/prdrLoadChip.C b/src/usr/diag/prdf/common/rule/prdrLoadChip.C index 8fca69624..b035b7571 100755..100644 --- a/src/usr/diag/prdf/common/framework/rule/prdrLoadChip.C +++ b/src/usr/diag/prdf/common/rule/prdrLoadChip.C @@ -1,11 +1,11 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/prdf/common/framework/rule/prdrLoadChip.C $ */ +/* $Source: src/usr/diag/prdf/common/rule/prdrLoadChip.C $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2015 */ +/* Contributors Listed Below - COPYRIGHT 2016 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -397,7 +397,7 @@ void ReadExpr(UtilStream & i_stream, Expr & o_expr) cv_mnfgDefault.interval; // The syntax of thresholds in rule file is // op field_threshold field_intervale - // optional fields (mnfg_threshold, mnfg_interval } + // optional fields (mnfg_threshold, mnfg_interval } // | mnfg_ilr_threshold | maskid i_stream >> l_tmpChar; l_tmpBool = (0x40 == (0x40 & l_tmpChar)); diff --git a/src/usr/diag/prdf/common/framework/rule/prdrLoadChip.H b/src/usr/diag/prdf/common/rule/prdrLoadChip.H index 44feebfbb..8024866cb 100755 --- a/src/usr/diag/prdf/common/framework/rule/prdrLoadChip.H +++ b/src/usr/diag/prdf/common/rule/prdrLoadChip.H @@ -1,11 +1,11 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/prdf/common/framework/rule/prdrLoadChip.H $ */ +/* $Source: src/usr/diag/prdf/common/rule/prdrLoadChip.H $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2015 */ +/* Contributors Listed Below - COPYRIGHT 2016 */ /* [+] International Business Machines Corp. */ /* */ /* */ diff --git a/src/usr/diag/prdf/common/framework/rule/prdrLoadChipCache.C b/src/usr/diag/prdf/common/rule/prdrLoadChipCache.C index ebe77878d..7ffd65603 100755..100644 --- a/src/usr/diag/prdf/common/framework/rule/prdrLoadChipCache.C +++ b/src/usr/diag/prdf/common/rule/prdrLoadChipCache.C @@ -1,11 +1,11 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/prdf/common/framework/rule/prdrLoadChipCache.C $ */ +/* $Source: src/usr/diag/prdf/common/rule/prdrLoadChipCache.C $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2015 */ +/* Contributors Listed Below - COPYRIGHT 2016 */ /* [+] International Business Machines Corp. */ /* */ /* */ diff --git a/src/usr/diag/prdf/common/framework/rule/prdrLoadChipCache.H b/src/usr/diag/prdf/common/rule/prdrLoadChipCache.H index bd75948d1..e0c243e99 100755 --- a/src/usr/diag/prdf/common/framework/rule/prdrLoadChipCache.H +++ b/src/usr/diag/prdf/common/rule/prdrLoadChipCache.H @@ -1,11 +1,13 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/prdf/common/framework/rule/prdrLoadChipCache.H $ */ +/* $Source: src/usr/diag/prdf/common/rule/prdrLoadChipCache.H $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2006,2014 */ +/* Contributors Listed Below - COPYRIGHT 2016 */ +/* [+] 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. */ diff --git a/src/usr/diag/prdf/common/framework/rule/prdrRegister.H b/src/usr/diag/prdf/common/rule/prdrRegister.H index 746427591..c9e028790 100755 --- a/src/usr/diag/prdf/common/framework/rule/prdrRegister.H +++ b/src/usr/diag/prdf/common/rule/prdrRegister.H @@ -1,11 +1,11 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/prdf/common/framework/rule/prdrRegister.H $ */ +/* $Source: src/usr/diag/prdf/common/rule/prdrRegister.H $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2016 */ /* [+] International Business Machines Corp. */ /* */ /* */ diff --git a/src/usr/diag/prdf/common/framework/rule/prdrSignatures.H b/src/usr/diag/prdf/common/rule/prdrSignatures.H index 332ceb6ff..3938faddb 100755 --- a/src/usr/diag/prdf/common/framework/rule/prdrSignatures.H +++ b/src/usr/diag/prdf/common/rule/prdrSignatures.H @@ -1,11 +1,13 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/prdf/common/framework/rule/prdrSignatures.H $ */ +/* $Source: src/usr/diag/prdf/common/rule/prdrSignatures.H $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2007,2014 */ +/* Contributors Listed Below - COPYRIGHT 2016 */ +/* [+] 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. */ diff --git a/src/usr/diag/prdf/common/framework/rule/prdrToken.H b/src/usr/diag/prdf/common/rule/prdrToken.H index a6bf29ade..0217193b4 100755 --- a/src/usr/diag/prdf/common/framework/rule/prdrToken.H +++ b/src/usr/diag/prdf/common/rule/prdrToken.H @@ -1,11 +1,13 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/prdf/common/framework/rule/prdrToken.H $ */ +/* $Source: src/usr/diag/prdf/common/rule/prdrToken.H $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2004,2014 */ +/* Contributors Listed Below - COPYRIGHT 2016 */ +/* [+] 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. */ diff --git a/src/usr/diag/prdf/common/framework/rule/prdrpp b/src/usr/diag/prdf/common/rule/prdrpp index 77aa55aa3..1fb30d91d 100755 --- a/src/usr/diag/prdf/common/framework/rule/prdrpp +++ b/src/usr/diag/prdf/common/rule/prdrpp @@ -2,11 +2,13 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/usr/diag/prdf/common/framework/rule/prdrpp $ +# $Source: src/usr/diag/prdf/common/rule/prdrpp $ # # OpenPOWER HostBoot Project # -# COPYRIGHT International Business Machines Corp. 2004,2014 +# Contributors Listed Below - COPYRIGHT 2016 +# [+] 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. diff --git a/src/usr/diag/prdf/common/framework/rule/tables.mk b/src/usr/diag/prdf/common/rule/tables.mk index 225449dc3..201d1b5a3 100755 --- a/src/usr/diag/prdf/common/framework/rule/tables.mk +++ b/src/usr/diag/prdf/common/rule/tables.mk @@ -1,11 +1,11 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/usr/diag/prdf/common/framework/rule/tables.mk $ +# $Source: src/usr/diag/prdf/common/rule/tables.mk $ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2012,2015 +# Contributors Listed Below - COPYRIGHT 2016 # [+] International Business Machines Corp. # # diff --git a/src/usr/diag/prdf/framework/makefile b/src/usr/diag/prdf/framework/makefile deleted file mode 100755 index 597a92309..000000000 --- a/src/usr/diag/prdf/framework/makefile +++ /dev/null @@ -1,29 +0,0 @@ -# IBM_PROLOG_BEGIN_TAG -# This is an automatically generated prolog. -# -# $Source: src/usr/diag/prdf/framework/makefile $ -# -# OpenPOWER HostBoot Project -# -# COPYRIGHT International Business Machines Corp. 2012,2014 -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. See the License for the specific language governing -# permissions and limitations under the License. -# -# IBM_PROLOG_END_TAG - -ROOTPATH = ../../../../.. - -SUBDIRS += rule.d - -include ${ROOTPATH}/config.mk - diff --git a/src/usr/diag/prdf/makefile b/src/usr/diag/prdf/makefile index 088af87a0..7bea465eb 100755 --- a/src/usr/diag/prdf/makefile +++ b/src/usr/diag/prdf/makefile @@ -5,7 +5,7 @@ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2012,2015 +# Contributors Listed Below - COPYRIGHT 2012,2016 # [+] International Business Machines Corp. # # @@ -26,12 +26,7 @@ ROOTPATH = ../../../.. MODULE = prdf -SUBDIRS += framework.d # This will eventually compile the rule code. This only - # needs to be done once and not for both IPL and RT - # compiles. This is because compiling the rule code only - # generates .prf files, which are compiler independent, - # and a few .C files needed for the error log parser, - # which is compiled elsewhere. +SUBDIRS += rule.d SUBDIRS += runtime.d SUBDIRS += test.d diff --git a/src/usr/diag/prdf/framework/rule/makefile b/src/usr/diag/prdf/rule/makefile index 39b3e5a09..19a380c4f 100755 --- a/src/usr/diag/prdf/framework/rule/makefile +++ b/src/usr/diag/prdf/rule/makefile @@ -1,11 +1,11 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/usr/diag/prdf/framework/rule/makefile $ +# $Source: src/usr/diag/prdf/rule/makefile $ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2012,2014 +# Contributors Listed Below - COPYRIGHT 2016 # [+] International Business Machines Corp. # # @@ -24,10 +24,10 @@ # IBM_PROLOG_END_TAG # Relative path to root from this makefile -ROOTPATH = ../../../../../.. +ROOTPATH = ../../../../.. # Relative path to root from OBJ_RULE -OBJ_PLUG_LINK_PATH = ../../../.. +OBJ_PLUG_LINK_PATH = ../../.. OBJ_RULE = obj/modules/prdf/rule OBJ_PLUG = obj/genfiles/plugins/prdf @@ -40,9 +40,9 @@ SRC_USR_DIR = ${ROOTPATH}/${SRC_USR} OBJ_RULE_LINK_DIR = ${OBJ_PLUG_LINK_PATH}/${OBJ_RULE} -VPATH = ${SRC_USR_DIR}/common/framework/rule +VPATH = ${SRC_USR_DIR}/common/rule -include ../../common/framework/rule/prdf_rule.mk +include ../common/rule/prdf_rule.mk #------------------------------------------------------------------------------ # Generated files @@ -84,8 +84,8 @@ SOURCE_PLUGIN_DIRS += ${SRC_USR}/common/plugins SOURCE_PLUGIN_DIRS += ${SRC_USR}/plugins # Individual source files to link. -SOURCE_PLUGIN_FILES += ${SRC_USR}/common/framework/rule/prdf_rule.mk -SOURCE_PLUGIN_FILES += ${SRC_USR}/common/framework/rule/tables.mk +SOURCE_PLUGIN_FILES += ${SRC_USR}/common/rule/prdf_rule.mk +SOURCE_PLUGIN_FILES += ${SRC_USR}/common/rule/tables.mk SOURCE_PLUGIN_FILES += ${SRC_USR}/common/util/UtilHash.H SOURCE_PLUGIN_FILES += ${SRC_USR}/common/plat/pegasus/prdfCenConst.H SOURCE_PLUGIN_FILES += ${SRC_USR}/common/iipconst.h @@ -161,21 +161,21 @@ USERDEFINES = -D__HOSTBOOT_MODULE -O3 -pipe ${PRDR_CMP_YACC_o_PATH}: ${PRDR_CMP_YACC_C_PATH} ${PRDR_CMP_YACC_H_PATH} ${PRD_OUT_MAKE} $(C1)$(CCACHE) $(HOST_PREFIX)g++ -c $(USERDEFINES) $< \ - -I ${SRC_USR_DIR}/common/framework/rule \ + -I ${SRC_USR_DIR}/common/rule \ -I ${SRC_USR_DIR}/common/util -I ${OBJ_RULE_DIR} \ -o $@ ${PRDR_CMP_FLEX_o_PATH}: ${PRDR_CMP_FLEX_C_PATH} ${PRDR_CMP_YACC_H_PATH} ${PRD_OUT_MAKE} $(C1)$(CCACHE) $(HOST_PREFIX)g++ -c $(USERDEFINES) $< \ - -I ${SRC_USR_DIR}/common/framework/rule \ + -I ${SRC_USR_DIR}/common/rule \ -I ${SRC_USR_DIR}/common/util -I ${OBJ_RULE_DIR} \ -o $@ ${PRDR_CMP_o_PATH}: ${PRDR_CMP_C} | ${OBJ_RULE_DIR} ${PRD_OUT_MAKE} $(C1)$(CCACHE) $(HOST_PREFIX)g++ -c $(USERDEFINES) $< \ - -I ${SRC_USR_DIR}/common/framework/rule \ + -I ${SRC_USR_DIR}/common/rule \ -I ${SRC_USR_DIR}/common \ -I ${SRC_USR_DIR}/common/plugins \ -I ${SRC_USR_DIR}/common/util \ @@ -195,14 +195,14 @@ ${PRDR_CMP_PATH}: ${PRDR_CMP_YACC_o_PATH} ${PRDR_CMP_FLEX_o_PATH} \ # Build the *.prf, *.err.C, and *.reg.C files #------------------------------------------------------------------------------ -vpath %.rule ../../common/plat/pegasus -PRDRPP_SEARCHDIRS = -I../../common/plat/pegasus +vpath %.rule ../common/plat/pegasus +PRDRPP_SEARCHDIRS = -I../common/plat/pegasus ${OBJ_RULE_DIR}/%.prf \ ${OBJ_RULE_DIR}/%.prf.err.C \ ${OBJ_RULE_DIR}/%.prf.reg.C : %.rule ${PRDR_CMP_PATH} ${PRD_OUT_MAKE} - $(C1)cat $< | ${SRC_USR_DIR}/common/framework/rule/prdrpp \ + $(C1)cat $< | ${SRC_USR_DIR}/common/rule/prdrpp \ ${PRDRPP_SEARCHDIRS} | $(JAILCMD) ${PRDR_CMP_PATH} $@ # Copy all .prf files from ${OBJ_RULE_DIR} to ${IMGDIR} diff --git a/src/usr/diag/prdf/test/prdf_hb_common_test.mk b/src/usr/diag/prdf/test/prdf_hb_common_test.mk index f145f4e84..2b61a820b 100755 --- a/src/usr/diag/prdf/test/prdf_hb_common_test.mk +++ b/src/usr/diag/prdf/test/prdf_hb_common_test.mk @@ -41,7 +41,7 @@ EXTRAINCDIR += ${PRD_USR_PATH}/common/framework/service EXTRAINCDIR += ${PRD_USR_PATH}/common/framework/register EXTRAINCDIR += ${PRD_USR_PATH}/common/framework/resolution EXTRAINCDIR += ${PRD_USR_PATH}/common/framework/config -EXTRAINCDIR += ${PRD_USR_PATH}/common/framework/rule +EXTRAINCDIR += ${PRD_USR_PATH}/common/rule EXTRAINCDIR += ${PRD_USR_PATH}/common/plat EXTRAINCDIR += ${PRD_USR_PATH}/common/plat/pegasus EXTRAINCDIR += ${PRD_USR_PATH}/common/mnfgtools |