summaryrefslogtreecommitdiff
path: root/indra/llcommon/llfasttimer.h
diff options
context:
space:
mode:
authorRichard Nelson <richard@lindenlab.com>2009-10-15 02:31:50 +0000
committerRichard Nelson <richard@lindenlab.com>2009-10-15 02:31:50 +0000
commit0051f6bc6d421b8f973d801189b9495c311a647b (patch)
treec3a5f8a36c1cb506b4237255630beb4fb9afb28c /indra/llcommon/llfasttimer.h
parent76a9e26ba7cf02077b80fd7635fef7bf1a0dae41 (diff)
forgot to shift timing values by 8 bits on mac
fixed fast timer values being multiplied by 256
Diffstat (limited to 'indra/llcommon/llfasttimer.h')
-rw-r--r--indra/llcommon/llfasttimer.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llfasttimer.h b/indra/llcommon/llfasttimer.h
index b900be925b..576e45d2ae 100644
--- a/indra/llcommon/llfasttimer.h
+++ b/indra/llcommon/llfasttimer.h
@@ -79,14 +79,14 @@ inline U32 get_cpu_clock_count_32()
{
U64 x;
__asm__ volatile (".byte 0x0f, 0x31": "=A"(x));
- return (U32)x;
+ return (U32)x >> 8;
}
inline U32 get_cpu_clock_count_64()
{
U64 x;
__asm__ volatile (".byte 0x0f, 0x31": "=A"(x));
- return x;
+ return x >> 8;
}
#endif