Move isSimicsRunning() check into a util function

Moves the existing isSimicsRunning() support in kernel/timemgr.C to
a new utility function.

Change-Id: I522b1ab9967a3c3c894fba0525d2e6ffb95cded9
RTC: 94883
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/8281
Tested-by: Jenkins Server
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

5 files changed, 92 insertions, 15 deletions

diff --git a/src/include/util/misc.H b/src/include/util/misc.H
new file mode 100644
index 000000000..aa0225632
--- /dev/null
+++ b/src/include/util/misc.H
@@ -0,0 +1,40 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/include/util/misc.H $                                     */
+/*                                                                        */
+/* 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                                                     */
+#ifndef __UTIL_MISC_H
+#define __UTIL_MISC_H
+
+
+namespace Util
+{
+    /**
+     * @brief Determines if code is running in a simics environment
+     *
+     * @param[in] void
+     *
+     * @return bool         true if running in simics; otherwise false
+     */
+    bool isSimicsRunning( void );
+};
+
+#endif
+
diff --git a/src/kernel/timemgr.C b/src/kernel/timemgr.C
index 03f9aee79..39cb4b807 100644
--- a/src/kernel/timemgr.C
+++ b/src/kernel/timemgr.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2010,2013              */
+/* COPYRIGHT International Business Machines Corp. 2010,2014              */
 /*                                                                        */
 /* p1                                                                     */
 /*                                                                        */
@@ -25,19 +25,11 @@
 #include <util/singleton.H>
 #include <kernel/task.H>
 #include <kernel/cpumgr.H>
+#include <util/misc.H>
 
 uint64_t TimeManager::iv_timebaseFreq = 0xFFFFFFFF;
 
-bool isSimicsRunning() __attribute__((alias("__isSimicsRunning")));
-extern "C" void __isSimicsRunning() NEVER_INLINE;
-
-void __isSimicsRunning()
-{
-    asm volatile("li 3, 0");
-    MAGIC_INSTRUCTION(MAGIC_SIMICS_CHECK);
-}
-
-bool TimeManager::cv_isSimicsRunning = isSimicsRunning();
+bool TimeManager::cv_isSimicsRunning = Util::isSimicsRunning();
 
 void TimeManager::init()
 {
diff --git a/src/lib/makefile b/src/lib/makefile
index 42571c341..c376c325e 100644
--- a/src/lib/makefile
+++ b/src/lib/makefile
@@ -5,7 +5,7 @@
 #
 # IBM CONFIDENTIAL
 #
-# COPYRIGHT International Business Machines Corp. 2010,2013
+# COPYRIGHT International Business Machines Corp. 2010,2014
 #
 # p1
 #
@@ -25,7 +25,7 @@ ROOTPATH = ../..
 OBJS = string.o string_ext.o stdlib.o ctype.o assert.o stdio.o math.o sprintf.o
 OBJS += syscall_stub.o syscall_task.o syscall_msg.o
 OBJS += syscall_mmio.o syscall_time.o sync.o syscall_misc.o
-OBJS += syscall_mm.o splaytree.o cxxtest_data.o crc32.o
+OBJS += syscall_mm.o splaytree.o cxxtest_data.o crc32.o utilmisc.o
 
 ifdef HOSTBOOT_MEMORY_LEAKS
 COMMONFLAGS += -DHOSTBOOT_MEMORY_LEAKS=1
diff --git a/src/lib/utilmisc.C b/src/lib/utilmisc.C
new file mode 100644
index 000000000..3c0ea95bf
--- /dev/null
+++ b/src/lib/utilmisc.C
@@ -0,0 +1,45 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/lib/utilmisc.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                                                     */
+#include <util/misc.H>
+#include <arch/ppc.H>
+
+namespace Util
+{
+
+bool isSimics() __attribute__((alias("__isSimicsRunning")));
+extern "C" void __isSimicsRunning() NEVER_INLINE;
+
+void __isSimicsRunning()
+{
+    asm volatile("li 3, 0");
+    MAGIC_INSTRUCTION(MAGIC_SIMICS_CHECK);
+}
+
+bool isSimicsRunning()
+{
+    static bool simics = isSimics();
+    return simics;
+}
+
+};
+
diff --git a/src/makefile b/src/makefile
index 8f3425948..c975fb31a 100644
--- a/src/makefile
+++ b/src/makefile
@@ -5,7 +5,7 @@
 #
 # IBM CONFIDENTIAL
 #
-# COPYRIGHT International Business Machines Corp. 2010,2013
+# COPYRIGHT International Business Machines Corp. 2010,2014
 #
 # p1
 #
@@ -27,7 +27,7 @@ SUBDIRS = kernel.d lib.d libc++.d sys.d usr.d build.d runtime.d
 IMGS = hbicore hbicore_test hbirt hbirt_test
 
 BASE_OBJECTS = string.o string_ext.o ctype.o math.o builtins.o stdio.o \
-	       splaytree.o cxxtest_data.o sprintf.o crc32.o
+	       splaytree.o cxxtest_data.o sprintf.o crc32.o utilmisc.o
 
 ifdef HOSTBOOT_PROFILE
 BASE_OBJECTS += gcov.o