diff options
author | Angelo Salese <salese_corp_ltd@email.it> | 2015-01-06 01:37:03 +0100 |
---|---|---|
committer | Angelo Salese <salese_corp_ltd@email.it> | 2015-01-06 01:37:03 +0100 |
commit | 0da897e9908c7e2c1828c6b6e4a06dab951815e1 (patch) | |
tree | 6be9c97f39b201b5f55bbfb05aa4e4392d1c720d | |
parent | 1206c176757580a37fdcc8d1292b25ad8244a5ac (diff) | |
parent | ecbe137ed90d6b5a07418db119c6bfbcacb6fb52 (diff) |
Merge branch 'master' of https://github.com/mamedev/mame
-rw-r--r-- | src/osd/windows/osinline.h | 20 | ||||
-rw-r--r-- | src/osd/windows/winwork.c | 24 |
2 files changed, 22 insertions, 22 deletions
diff --git a/src/osd/windows/osinline.h b/src/osd/windows/osinline.h index 8299cbe15ca..3e28c982cf3 100644 --- a/src/osd/windows/osinline.h +++ b/src/osd/windows/osinline.h @@ -19,26 +19,6 @@ #include "eivc.h" #endif -#if __GNUC__ && defined(__i386__) && !defined(__x86_64) -#undef YieldProcessor -#endif - -#ifndef YieldProcessor -#ifdef __GNUC__ -INLINE void osd_yield_processor(void) -{ - __asm__ __volatile__ ( "rep; nop" ); -} -#else -INLINE void osd_yield_processor(void) -{ - __asm { rep nop } -} -#endif -#else -#define osd_yield_processor YieldProcessor -#endif - INT32 win_compare_exchange32(INT32 volatile *ptr, INT32 compare, INT32 exchange); INT32 win_atomic_exchange32(INT32 volatile *ptr, INT32 exchange); INT32 win_atomic_add32(INT32 volatile *ptr, INT32 delta); diff --git a/src/osd/windows/winwork.c b/src/osd/windows/winwork.c index c55511a6446..8e1c8d1048e 100644 --- a/src/osd/windows/winwork.c +++ b/src/osd/windows/winwork.c @@ -25,8 +25,6 @@ #include "eminline.h" -#include "osinline.h" - //============================================================ // DEBUGGING @@ -59,6 +57,28 @@ #define end_timing(v) do { } while (0) #endif +#if __GNUC__ && defined(__i386__) && !defined(__x86_64) +#undef YieldProcessor +#endif + +#ifndef YieldProcessor +#ifdef __GNUC__ +INLINE void osd_yield_processor(void) +{ + __asm__ __volatile__ ( "rep; nop" ); +} +#else +INLINE void osd_yield_processor(void) +{ + __asm { rep nop } +} +#endif +#else +#define osd_yield_processor YieldProcessor +#endif + + + //============================================================ // TYPE DEFINITIONS //============================================================ |