diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/build/beam/beam_parms.tcl | 15 | ||||
-rw-r--r-- | src/build/beam/hwas/deconfigGard.C | 23 | ||||
-rw-r--r-- | src/build/beam/hwp/mvpdRingFuncs.C | 24 | ||||
-rw-r--r-- | src/build/beam/targeting/targetservice.C | 24 | ||||
-rw-r--r-- | src/build/mkrules/beam.env.mk | 3 | ||||
-rw-r--r-- | src/include/assert.h | 4 | ||||
-rw-r--r-- | src/usr/diag/mdia/mdiasm.C | 2 | ||||
-rw-r--r-- | src/usr/errl/runtime/rt_errlmanager.C | 12 | ||||
-rw-r--r-- | src/usr/initservice/baseinitsvc/initservice.C | 1 | ||||
-rw-r--r-- | src/usr/targeting/common/util.C | 2 |
10 files changed, 96 insertions, 14 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 diff --git a/src/include/assert.h b/src/include/assert.h index 84cf1b7b0..2e64cab01 100644 --- a/src/include/assert.h +++ b/src/include/assert.h @@ -5,7 +5,7 @@ /* */ /* IBM CONFIDENTIAL */ /* */ -/* COPYRIGHT International Business Machines Corp. 2011,2013 */ +/* COPYRIGHT International Business Machines Corp. 2011,2014 */ /* */ /* p1 */ /* */ @@ -197,7 +197,7 @@ void __assert(AssertBehavior i_assertb, int i_line); * typedef char CHECKSIZEVAR[(EXPECTED_SIZE == sizeof(DATA)) -1] * */ -#define CPPASSERT(exp) typedef char compile_time_assert_failed[2*((exp)!=0)-1] +#define CPPASSERT(exp) typedef char compile_time_assert_failed[2*((exp)?1:0)-1] #ifdef __cplusplus diff --git a/src/usr/diag/mdia/mdiasm.C b/src/usr/diag/mdia/mdiasm.C index a2a5053fc..caca95ea1 100644 --- a/src/usr/diag/mdia/mdiasm.C +++ b/src/usr/diag/mdia/mdiasm.C @@ -684,6 +684,8 @@ bool StateMachine::executeWorkItem(WorkFlowProperties * i_wfp) mutex_unlock(&iv_mutex); + break; + case ANALYZE_IPL_MNFG_CE_STATS: { MDIA_FAST("Executing analyzeIplCEStats"); diff --git a/src/usr/errl/runtime/rt_errlmanager.C b/src/usr/errl/runtime/rt_errlmanager.C index 6fb120168..9586afb24 100644 --- a/src/usr/errl/runtime/rt_errlmanager.C +++ b/src/usr/errl/runtime/rt_errlmanager.C @@ -5,7 +5,7 @@ /* */ /* IBM CONFIDENTIAL */ /* */ -/* COPYRIGHT International Business Machines Corp. 2013 */ +/* COPYRIGHT International Business Machines Corp. 2013,2014 */ /* */ /* p1 */ /* */ @@ -123,12 +123,10 @@ void ErrlManager::sendMboxMsg ( errlHndl_t& io_err ) TRACFCOMP( g_trac_errl, ENTER_MRK"ErrlManager::sendToHypervisor" ); do { + uint32_t l_msgSize = io_err->flattenedSize(); - uint32_t l_msgSize = io_err->flattenedSize(); - - - void * temp_buff = malloc( l_msgSize ); - io_err->flatten ( temp_buff, l_msgSize ); + uint8_t * temp_buff = new uint8_t [l_msgSize ]; + io_err->flatten ( temp_buff, l_msgSize ); TRACDCOMP(g_trac_errl, INFO_MRK"Send msg to FSP for errlogId [0x%08x]", @@ -158,7 +156,7 @@ void ErrlManager::sendMboxMsg ( errlHndl_t& io_err ) ); } - delete (uint8_t *)temp_buff; + delete [] temp_buff; } while (0); diff --git a/src/usr/initservice/baseinitsvc/initservice.C b/src/usr/initservice/baseinitsvc/initservice.C index 3abdea1c5..ecfa47a3d 100644 --- a/src/usr/initservice/baseinitsvc/initservice.C +++ b/src/usr/initservice/baseinitsvc/initservice.C @@ -549,7 +549,6 @@ void InitService::init( void *io_ptr ) // Tell kernel to perform shutdown sequence INITSERVICE::doShutdown( l_shutdownStatus ); - printk( "InitService exit.\n" ); // return to _start() to exit the task. } diff --git a/src/usr/targeting/common/util.C b/src/usr/targeting/common/util.C index 4010c0e61..370e2c12a 100644 --- a/src/usr/targeting/common/util.C +++ b/src/usr/targeting/common/util.C @@ -144,7 +144,7 @@ bool is_phyp_load( ATTR_PAYLOAD_KIND_type* o_type ) assert(sys != NULL); // get the current payload kind - ATTR_PAYLOAD_KIND_type payload_kind = sys->getAttr<ATTR_PAYLOAD_KIND>(); + TARGETING::PAYLOAD_KIND payload_kind = sys->getAttr<ATTR_PAYLOAD_KIND>(); if( o_type ) { |