summaryrefslogtreecommitdiffstats
path: root/src/build
diff options
context:
space:
mode:
authorBill Schwartz <whs@us.ibm.com>2014-03-11 11:03:11 -0500
committerA. Patrick Williams III <iawillia@us.ibm.com>2014-03-13 13:56:44 -0500
commit943cb5bf43a77725f161fa9ef761c23ddf70fc13 (patch)
treed91c4f453f3999ba2de2e251d11f9ec78ab10420 /src/build
parent6aed7e19917252fe8b7e4313c66b56928d1b428b (diff)
downloadtalos-hostboot-943cb5bf43a77725f161fa9ef761c23ddf70fc13.tar.gz
talos-hostboot-943cb5bf43a77725f161fa9ef761c23ddf70fc13.zip
BEAM fixes in errlm, targeting, initservice, mvpd accessors, hwas, and mdia
Partial updates for issues 94995 Errlm, 94996 targeting, 94998 istep/initservice 94999 VPD accessors, 95000 HWAS, and 95001 MDIA. Open issues require additional research: push_back memory leak, sync_cond_wait infinite loop, masterCpu uninitialized complaint, checkConstantsMatch template no effect, and shutdown has no effect. Issue will be updated with progress. Change-Id: If60fef67564a0c2cb2a10824100480095e896f17 RTC: 94995 Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/9492 Tested-by: Jenkins Server Reviewed-by: MIKE J. JONES <mjjones@us.ibm.com> Reviewed-by: STEPHEN M. CPREK <smcprek@us.ibm.com> Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/build')
-rw-r--r--src/build/beam/beam_parms.tcl15
-rw-r--r--src/build/beam/hwas/deconfigGard.C23
-rw-r--r--src/build/beam/hwp/mvpdRingFuncs.C24
-rw-r--r--src/build/beam/targeting/targetservice.C24
-rw-r--r--src/build/mkrules/beam.env.mk3
5 files changed, 86 insertions, 3 deletions
diff --git a/src/build/beam/beam_parms.tcl b/src/build/beam/beam_parms.tcl
index 89edae166..b3f7a63da 100644
--- a/src/build/beam/beam_parms.tcl
+++ b/src/build/beam/beam_parms.tcl
@@ -5,7 +5,7 @@
#
# IBM CONFIDENTIAL
#
-# COPYRIGHT International Business Machines Corp. 2013
+# COPYRIGHT International Business Machines Corp. 2013,2014
#
# p1
#
@@ -23,4 +23,17 @@
## Set maximum time to spend analyzing to 1 minute per 1000 lines of code.
## The default is 5 minutes; there are a few files in HB that take
## more than an hour with the default setting.
+
+source beam_min_parms.tcl
+
set beam::max_time_per_kloc_in_sec "60"
+
+set allocateAnchored {allocator (anchored,
+ return_index=return) }
+
+beam::function_attribute "$allocateAnchored" \
+ -names "ERRORLOG::ErrlUserDetails::reallocUsrBuf"
+
+# beam::function_attribute "anchor(index=1)" \
+# -names "std::vector::push_back,std::list::push_back"
+
diff --git a/src/build/beam/hwas/deconfigGard.C b/src/build/beam/hwas/deconfigGard.C
new file mode 100644
index 000000000..3c040f762
--- /dev/null
+++ b/src/build/beam/hwas/deconfigGard.C
@@ -0,0 +1,23 @@
+/* IBM_PROLOG_BEGIN_TAG */
+/* This is an automatically generated prolog. */
+/* */
+/* $Source: src/build/beam/hwas/deconfigGard.C $ */
+/* */
+/* IBM CONFIDENTIAL */
+/* */
+/* COPYRIGHT International Business Machines Corp. 2011,2014 */
+/* */
+/* p1 */
+/* */
+/* Object Code Only (OCO) source materials */
+/* Licensed Internal Code Source Materials */
+/* IBM HostBoot Licensed Internal Code */
+/* */
+/* The source code for this program is not published or otherwise */
+/* divested of its trade secrets, irrespective of what has been */
+/* deposited with the U.S. Copyright Office. */
+/* */
+/* Origin: 30 */
+/* */
+/* IBM_PROLOG_END_TAG */
+>>>MISTAKE1__deconfigureTarget_80f954241505
diff --git a/src/build/beam/hwp/mvpdRingFuncs.C b/src/build/beam/hwp/mvpdRingFuncs.C
new file mode 100644
index 000000000..045c67506
--- /dev/null
+++ b/src/build/beam/hwp/mvpdRingFuncs.C
@@ -0,0 +1,24 @@
+/* IBM_PROLOG_BEGIN_TAG */
+/* This is an automatically generated prolog. */
+/* */
+/* $Source: src/build/beam/hwp/mvpdRingFuncs.C $ */
+/* */
+/* IBM CONFIDENTIAL */
+/* */
+/* COPYRIGHT International Business Machines Corp. 2012,2014 */
+/* */
+/* p1 */
+/* */
+/* Object Code Only (OCO) source materials */
+/* Licensed Internal Code Source Materials */
+/* IBM HostBoot Licensed Internal Code */
+/* */
+/* The source code for this program is not published or otherwise */
+/* divested of its trade secrets, irrespective of what has been */
+/* deposited with the U.S. Copyright Office. */
+/* */
+/* Origin: 30 */
+/* */
+/* IBM_PROLOG_END_TAG */
+>>>MISTAKE17_mbvpdValidateRecordKeyword_d149f58f1505
+>>>MISTAKE5_mbvpdRingFunc_b48fca4f6c313e21
diff --git a/src/build/beam/targeting/targetservice.C b/src/build/beam/targeting/targetservice.C
new file mode 100644
index 000000000..53f23057a
--- /dev/null
+++ b/src/build/beam/targeting/targetservice.C
@@ -0,0 +1,24 @@
+/* IBM_PROLOG_BEGIN_TAG */
+/* This is an automatically generated prolog. */
+/* */
+/* $Source: src/build/beam/targeting/targetservice.C $ */
+/* */
+/* IBM CONFIDENTIAL */
+/* */
+/* COPYRIGHT International Business Machines Corp. 2011,2014 */
+/* */
+/* p1 */
+/* */
+/* Object Code Only (OCO) source materials */
+/* Licensed Internal Code Source Materials */
+/* IBM HostBoot Licensed Internal Code */
+/* */
+/* The source code for this program is not published or otherwise */
+/* divested of its trade secrets, irrespective of what has been */
+/* deposited with the U.S. Copyright Office. */
+/* */
+/* Origin: 30 */
+/* */
+/* IBM_PROLOG_END_TAG */
+>>>MISTAKE5_queryMasterProcChipTargetHandle_2745d8d11505
+>>>MISTAKE5_queryMasterProcChipTargetHandle_da38b67e1505
diff --git a/src/build/mkrules/beam.env.mk b/src/build/mkrules/beam.env.mk
index d5888903f..15c108130 100644
--- a/src/build/mkrules/beam.env.mk
+++ b/src/build/mkrules/beam.env.mk
@@ -39,8 +39,7 @@ endif
## Set BEAM source files.
## see the beamgen: target to generate these config files.
-BEAMFLAGS += --beam::parms=$(BEAMPATH)/tcl/beam_default_parms.tcl \
- $(ROOTPATH)/src/build/beam/beam_parms.tcl
+BEAMFLAGS += --beam::parms=$(ROOTPATH)/src/build/beam/beam_parms.tcl
BEAMFLAGS += --beam::source=$(ROOTPATH)/src/build/beam/compiler_c_config.tcl
BEAMFLAGS += --beam::source=$(ROOTPATH)/src/build/beam/compiler_cpp_config.tcl
OpenPOWER on IntegriCloud