summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/build/beam/beam_parms.tcl4
-rw-r--r--src/build/beam/core/heapmgr.C23
-rw-r--r--src/build/beam/core/ptmgr.C24
-rw-r--r--src/build/beam/hwas/deconfigGard.C23
-rw-r--r--src/build/mkrules/beam.env.mk6
-rw-r--r--src/include/usr/intr/interrupt.H1
-rw-r--r--src/lib/syscall_task.C12
-rw-r--r--src/usr/mbox/mailboxsp.C4
-rw-r--r--src/usr/pnor/test/pnorrptest.H4
9 files changed, 21 insertions, 80 deletions
diff --git a/src/build/beam/beam_parms.tcl b/src/build/beam/beam_parms.tcl
index b3f7a63da..7a4eccdad 100644
--- a/src/build/beam/beam_parms.tcl
+++ b/src/build/beam/beam_parms.tcl
@@ -28,6 +28,10 @@ source beam_min_parms.tcl
set beam::max_time_per_kloc_in_sec "60"
+# Allow empty functions to be considered 'stubs' and not report 'no effect'
+# errors.
+set beam::stub_function_contents "return_constant"
+
set allocateAnchored {allocator (anchored,
return_index=return) }
diff --git a/src/build/beam/core/heapmgr.C b/src/build/beam/core/heapmgr.C
deleted file mode 100644
index 9a9cfb39f..000000000
--- a/src/build/beam/core/heapmgr.C
+++ /dev/null
@@ -1,23 +0,0 @@
-/* IBM_PROLOG_BEGIN_TAG */
-/* This is an automatically generated prolog. */
-/* */
-/* $Source: src/build/beam/core/heapmgr.C $ */
-/* */
-/* IBM CONFIDENTIAL */
-/* */
-/* COPYRIGHT International Business Machines Corp. 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__coalesce_4286eea91505
diff --git a/src/build/beam/core/ptmgr.C b/src/build/beam/core/ptmgr.C
deleted file mode 100644
index 96c9c64e9..000000000
--- a/src/build/beam/core/ptmgr.C
+++ /dev/null
@@ -1,24 +0,0 @@
-/* IBM_PROLOG_BEGIN_TAG */
-/* This is an automatically generated prolog. */
-/* */
-/* $Source: src/build/beam/core/ptmgr.C $ */
-/* */
-/* IBM CONFIDENTIAL */
-/* */
-/* COPYRIGHT International Business Machines Corp. 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_getAccessType_902999ce1505
->>>MISTAKE1_writePTE_70ad5a471505
diff --git a/src/build/beam/hwas/deconfigGard.C b/src/build/beam/hwas/deconfigGard.C
deleted file mode 100644
index 3c040f762..000000000
--- a/src/build/beam/hwas/deconfigGard.C
+++ /dev/null
@@ -1,23 +0,0 @@
-/* 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/mkrules/beam.env.mk b/src/build/mkrules/beam.env.mk
index 15c108130..dc0814dd1 100644
--- a/src/build/mkrules/beam.env.mk
+++ b/src/build/mkrules/beam.env.mk
@@ -25,8 +25,9 @@
# Description:
# Configuration of the BEAM settings.
+AFSCELL := austin
BEAMVER = beam-3.6.1
-BEAMPATH = /afs/rch/projects/esw/beam/$(BEAMVER)
+BEAMPATH = /afs/${AFSCELL}/projects/esw/beam/$(BEAMVER)
BEAMCMD = $(HOST_PREFIX)jail $(BEAMPATH)/bin/beam_compile
ifdef MODULE
@@ -44,7 +45,8 @@ BEAMFLAGS += --beam::source=$(ROOTPATH)/src/build/beam/compiler_c_config.tcl
BEAMFLAGS += --beam::source=$(ROOTPATH)/src/build/beam/compiler_cpp_config.tcl
## point to a directory that BEAM can use for its' working files.
-BEAMFLAGS += --beam::data=$(BEAMDIR)
+BEAMFLAGS += --beam::data=$(BEAMDIR)/..
+BEAMFLAGS += --beam::build_root=$(ROOTPATH)
## point BEAM to the potential innocent directory for a module.
BEAM_INNOCENT = $(ROOTPATH)/src/build/beam/$(BEAMMODULE)
diff --git a/src/include/usr/intr/interrupt.H b/src/include/usr/intr/interrupt.H
index b8ab621b2..d5067ccf2 100644
--- a/src/include/usr/intr/interrupt.H
+++ b/src/include/usr/intr/interrupt.H
@@ -55,6 +55,7 @@ namespace INTR
PIR_t(uint32_t i_nodeId, uint32_t i_chipId,
uint32_t i_coreId, uint32_t i_thread = 0) :
+ reserved(0),
nodeId(i_nodeId), chipId(i_chipId),
coreId(i_coreId), threadId(i_thread) {}
diff --git a/src/lib/syscall_task.C b/src/lib/syscall_task.C
index 27272ef2e..f5fd6d5ce 100644
--- a/src/lib/syscall_task.C
+++ b/src/lib/syscall_task.C
@@ -5,7 +5,7 @@
/* */
/* IBM CONFIDENTIAL */
/* */
-/* COPYRIGHT International Business Machines Corp. 2010,2013 */
+/* COPYRIGHT International Business Machines Corp. 2010,2014 */
/* */
/* p1 */
/* */
@@ -59,14 +59,14 @@ void task_end2(void* retval)
tid_t task_gettid()
{
- register task_t* task;
+ register task_t* task = NULL;
asm volatile("mr %0, 13" : "=r"(task));
return task->tid;
}
cpuid_t task_getcpuid()
{
- register task_t* task;
+ register task_t* task = NULL;
asm volatile("mr %0, 13" : "=r"(task));
return task->cpu->cpu;
}
@@ -121,7 +121,7 @@ tid_t task_exec(const char* file, void* ptr)
void task_affinity_pin()
{
// Get task structure.
- register task_t* task;
+ register task_t* task = NULL;
asm volatile("mr %0, 13" : "=r"(task));
// Increment pin count.
@@ -131,7 +131,7 @@ void task_affinity_pin()
void task_affinity_unpin()
{
// Get task structure.
- register task_t* task;
+ register task_t* task = NULL;
asm volatile("mr %0, 13" : "=r"(task));
// Decrement pin count.
@@ -146,7 +146,7 @@ void task_affinity_migrate_to_master()
void task_detach()
{
// Get task structure.
- register task_t* task;
+ register task_t* task = NULL;
asm volatile("mr %0, 13" : "=r"(task));
task->detached = true;
diff --git a/src/usr/mbox/mailboxsp.C b/src/usr/mbox/mailboxsp.C
index 28b6f4346..f36d167b3 100644
--- a/src/usr/mbox/mailboxsp.C
+++ b/src/usr/mbox/mailboxsp.C
@@ -904,12 +904,14 @@ void MailboxSp::recv_msg(mbox_msg_t & i_mbox_msg)
invalidMsgResponder(i_mbox_msg);
free(msg->extra_data); // toss this if it exists
msg->extra_data = NULL;
+ i_mbox_msg.msg_payload.extra_data = NULL;
}
msg_free(msg);
}
else // This is a bounce-back msg from the echo server - Ignore
{
free(msg->extra_data);
+ msg->extra_data = NULL;
msg_free(msg);
}
}
@@ -1155,6 +1157,8 @@ errlHndl_t MailboxSp::send(queue_id_t i_q_id,
0, //
true //Add HB Software Callout
);
+
+ msg_free(msg);
}
return err;
diff --git a/src/usr/pnor/test/pnorrptest.H b/src/usr/pnor/test/pnorrptest.H
index 32f3c1dc2..91aa4f209 100644
--- a/src/usr/pnor/test/pnorrptest.H
+++ b/src/usr/pnor/test/pnorrptest.H
@@ -297,7 +297,7 @@ class PnorRpTest : public CxxTest::TestSuite
* @brief PNOR RP test - Read/Write Page
* Use message interface to read and write individual pages
*/
- void test_messageReadWrite(void)
+ void _test_messageReadWrite(void)
{
return; //this fails with the new message ids
TRACFCOMP(g_trac_pnor, "PnorRpTest::test_messageReadWrite> Start" );
@@ -429,7 +429,7 @@ class PnorRpTest : public CxxTest::TestSuite
* @brief PNOR RP test - Read/Write Addresses
* do read/modify/write/read to different virtual addresses
*/
- void test_AddrReadWrite(void)
+ void _test_AddrReadWrite(void)
{
// Leaving disabled because a regular boot tests all of this anyway,
// but want to leave this here for possible future unit testing.
OpenPOWER on IntegriCloud