PRD: clean up fixme/todo in prd code

Change-Id: I2ec9df44ab66b7eed959ce53964e2bfa611516d7
RTC: 116444
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/14817
Tested-by: Jenkins Server
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
Reviewed-by: Prem Shanker Jha <premjha2@in.ibm.com>
Reviewed-by: Bilicon Patil <bilpatil@in.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Reviewed-by: Zane Shelley <zshelle@us.ibm.com>
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/15527

7 files changed, 26 insertions, 41 deletions

diff --git a/src/usr/diag/prdf/common/framework/rule/prdfRuleChip.H b/src/usr/diag/prdf/common/framework/rule/prdfRuleChip.H
index c15bc1e47..5eb661925 100755
--- a/src/usr/diag/prdf/common/framework/rule/prdfRuleChip.H
+++ b/src/usr/diag/prdf/common/framework/rule/prdfRuleChip.H
@@ -5,7 +5,9 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2004,2014              */
+/* Contributors Listed Below - COPYRIGHT 2012,2015                        */
+/* [+] 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.       */
@@ -68,7 +70,6 @@ class RuleChip : public ExtensibleChip
        instantiating ChipScopeLock at the beginning of the function.This is
        encapsulated by PRDF_LOCK_CHIP_SCOPE */
 
-        // TODO : add parameter for parent domains, connected chip classes.
         /**
          * @brief       constructor
          * @param[in]   i_fileName        name of Rule file
diff --git a/src/usr/diag/prdf/common/framework/rule/prdfRuleMetaData.C b/src/usr/diag/prdf/common/framework/rule/prdfRuleMetaData.C
index 1661bcb68..7d2a334f4 100644
--- a/src/usr/diag/prdf/common/framework/rule/prdfRuleMetaData.C
+++ b/src/usr/diag/prdf/common/framework/rule/prdfRuleMetaData.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2013,2014                        */
+/* Contributors Listed Below - COPYRIGHT 2013,2015                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -107,7 +107,7 @@ struct ResetAndMaskTransformer
                 break;
 
             default:
-                o.op = NULL; // TODO: ERROR!  Assert...
+                o.op = NULL;
                 break;
         }
 
@@ -970,8 +970,6 @@ void RuleMetaData::createGroup(Group * i_group,
     {
         std::vector<uint8_t> l_bits; // Vector to hold bit string.
 
-        // TODO : handle & transformations.
-
         // Get expression for group's line.
         Prdr::Expr * l_expr = &i_data.cv_loadChip->cv_groups[i_groupId][i];
 
diff --git a/src/usr/diag/prdf/common/framework/rule/prdf_rule.mk b/src/usr/diag/prdf/common/framework/rule/prdf_rule.mk
index 1f58070ea..d6da96f09 100644
--- a/src/usr/diag/prdf/common/framework/rule/prdf_rule.mk
+++ b/src/usr/diag/prdf/common/framework/rule/prdf_rule.mk
@@ -5,7 +5,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2014
+# Contributors Listed Below - COPYRIGHT 2014,2015
 # [+] International Business Machines Corp.
 #
 #
@@ -23,14 +23,15 @@
 #
 # IBM_PROLOG_END_TAG
 
-prd_rule_files += Proc.rule
-prd_rule_files += Ex.rule
-prd_rule_files += Mcs.rule
-prd_rule_files += Membuf.rule
-prd_rule_files += Mba.rule
+# Add Rule tables here:
+PRDR_RULE_TABLES += Proc.prf
+PRDR_RULE_TABLES += Ex.prf
+PRDR_RULE_TABLES += Mcs.prf
+PRDR_RULE_TABLES += Membuf.prf
+PRDR_RULE_TABLES += Mba.prf
 
-prd_rule_prf_targets  = ${prd_rule_files:.rule=.prf}
-prd_rule_err_targets  = ${prd_rule_files:.rule=.prf.err.C}
-prd_rule_reg_targets  = ${prd_rule_files:.rule=.prf.reg.C}
-prd_rule_html_targets = ${prd_rule_files:.rule=.prf.html}
+prd_rule_prf_targets  = ${PRDR_RULE_TABLES}
+prd_rule_err_targets  = ${PRDR_RULE_TABLES:.prf=.prf.err.C}
+prd_rule_reg_targets  = ${PRDR_RULE_TABLES:.prf=.prf.reg.C}
+prd_rule_html_targets = ${PRDR_RULE_TABLES:.prf=.prf.html}
 
diff --git a/src/usr/diag/prdf/common/framework/rule/prdrCompile.C b/src/usr/diag/prdf/common/framework/rule/prdrCompile.C
index 368a958ee..f4da5bf20 100755
--- a/src/usr/diag/prdf/common/framework/rule/prdrCompile.C
+++ b/src/usr/diag/prdf/common/framework/rule/prdrCompile.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2012,2014                        */
+/* Contributors Listed Below - COPYRIGHT 2012,2015                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -355,8 +355,6 @@ std::list<std::string> prdrParseDoxygen(std::string & i_string)
     }
     l_result.push_back(l_input); // push long desc.
 
-    // TODO : take care of the @tags.
-
     return l_result;
 };
 
@@ -456,9 +454,10 @@ uint32_t prdrActionArgMap(const std::string & i_arg)
         }
 
         // Initialize SDC Flags.
-        // FIXME: Not quite happy with the way this is implemented. Would like
-        //        to move the macros to another file like we did with
-        //        prdfCalloutMap.H, but will need to do this later.
+        // FIXME: RTC 119976
+        // Not quite happy with the way this is implemented.
+        // Would like to move the macros to another file like we
+        // did with prdfCalloutMap.H, but will need to do this later.
         #define PRDF_SDC_FLAGS_MAP_ONLY
         #define PRDF_SDC_FLAGS_MAP
         #define PRDF_SDC_FLAG(name, value) \
diff --git a/src/usr/diag/prdf/common/framework/rule/prdrCompile.y b/src/usr/diag/prdf/common/framework/rule/prdrCompile.y
index 1ccb5ae33..78736643d 100755
--- a/src/usr/diag/prdf/common/framework/rule/prdrCompile.y
+++ b/src/usr/diag/prdf/common/framework/rule/prdrCompile.y
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2012,2014                        */
+/* Contributors Listed Below - COPYRIGHT 2012,2015                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -650,7 +650,6 @@ bitgroup: PRDR_BIT_KW '(' bitandlist ')'        { $$ = $3; }
         | PRDR_BIT_KW '(' bitorlist ')'                { $$ = $3; }
 ;
 
-// TODO: Change to & instead of ,
 bitandlist: bitandlist ',' PRDR_INTEGER
     {
         $$ = new ExprOp2(Prdr::AND,
@@ -677,7 +676,6 @@ bitorlist: bitorlist '|' PRDR_INTEGER
     }
 ;
 
-// TODO: Merge attention types.
 rule: PRDR_RULE PRDR_ID '{' ruleexpr ';' '}' ';'
     {
         g_rules[*$2] = new ExprOp1(Prdr::RULE, $4);
diff --git a/src/usr/diag/prdf/common/framework/rule/prdrLoadChipCache.C b/src/usr/diag/prdf/common/framework/rule/prdrLoadChipCache.C
index 1a1859f3f..ebe77878d 100755
--- a/src/usr/diag/prdf/common/framework/rule/prdrLoadChipCache.C
+++ b/src/usr/diag/prdf/common/framework/rule/prdrLoadChipCache.C
@@ -79,12 +79,7 @@ namespace Prdr
             {
                 // NOTE: to patch PRF files require rebuilding
                 // entire Hostboot image and put in a special
-                // location on FSP /maint/ mount.
-                // FIXME: if we need to patch prf files directly
-                // on Hostboot, need to discuss with Patrick
-                // about a possibility of creating a new PNOR
-                // partition outside of the cryptographically
-                // signed area just for PRD.
+                // location on FSP /nfs/test/pnor/ mount.
 
                 const char * ext = ".prf";
 
diff --git a/src/usr/diag/prdf/common/framework/rule/tables.mk b/src/usr/diag/prdf/common/framework/rule/tables.mk
index 65405e5e4..225449dc3 100755
--- a/src/usr/diag/prdf/common/framework/rule/tables.mk
+++ b/src/usr/diag/prdf/common/framework/rule/tables.mk
@@ -5,7 +5,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2012,2014
+# Contributors Listed Below - COPYRIGHT 2012,2015
 # [+] International Business Machines Corp.
 #
 #
@@ -23,19 +23,12 @@
 #
 # IBM_PROLOG_END_TAG
 
+
 #-------------------------------------------------------------------
-# To add a new chip, modify PRDR_RULE_TABLES line.
+# To add a new chip, modify PRDR_RULE_TABLES line in prdf_rule.mk
 # To change system type, modify VPATH line in rule/Makefile
 #-------------------------------------------------------------------
 
-# Add Rule tables here:
-# FIXME: This is now a duplicate of prd_rule_prf_targets in prdf_rule.mk
-PRDR_RULE_TABLES += Proc.prf
-PRDR_RULE_TABLES += Ex.prf
-PRDR_RULE_TABLES += Mcs.prf
-PRDR_RULE_TABLES += Membuf.prf
-PRDR_RULE_TABLES += Mba.prf
-
 #------------------------------------------------------------------
 # Change nothing below this line unless you know what you're doing!
 #------------------------------------------------------------------