diff options
author | Mike Baiocchi <baiocchi@us.ibm.com> | 2014-01-23 14:51:58 -0600 |
---|---|---|
committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2014-02-05 15:59:52 -0600 |
commit | c9e49a109f1f381d8bae380e925f7bb592cc977a (patch) | |
tree | 161a0885be196c13ee1f0df33ccc3a58325ee8c5 /src/lib | |
parent | d452684d349994e0effa03f140a6232f06db6537 (diff) | |
download | talos-hostboot-c9e49a109f1f381d8bae380e925f7bb592cc977a.tar.gz talos-hostboot-c9e49a109f1f381d8bae380e925f7bb592cc977a.zip |
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>
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/makefile | 4 | ||||
-rw-r--r-- | src/lib/utilmisc.C | 45 |
2 files changed, 47 insertions, 2 deletions
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; +} + +}; + |