diff options
4 files changed, 3 insertions, 150 deletions
diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/dbgtool/hxassert.h b/amarok/src/engine/helix/helix-sp/helix-include/common/dbgtool/hxassert.h index acc6a0b4..8f10b910 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/dbgtool/hxassert.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/dbgtool/hxassert.h @@ -39,11 +39,7 @@ #ifndef ASSERT #if defined (DEBUG) || defined (_DEBUG) -#if defined (_OSF1) && defined (_NATIVE_COMPILER) -# define ASSERT(x) assert(((long)(x)) != 0L) -#else -# define ASSERT(x) assert(x) -#endif +# define ASSERT(x) assert(x) #else # define ASSERT(x) /* x */ #endif /* DEBUG */ @@ -68,14 +64,6 @@ extern "C" { #endif #endif -#if defined (_OSF1) && defined (_NATIVE_COMPILER) -#if defined __cplusplus -#define __inline inline -#else -#define __inline static -#endif /* __cplusplus */ -#endif - #ifdef _HPUX #if defined __cplusplus #define __inline inline diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/atomicbase.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/atomicbase.h index 89a94bf4..c06f3ac8 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/atomicbase.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/atomicbase.h @@ -805,138 +805,6 @@ extern "C" { /*********************************************************************** - * Tru64 (OSF1) / Alpha (Native compiler) - * - * Implementation Notes: - * - * The Alpha CPU provides instructions to load-lock a value, - * modify it, and attempt to write it back. If the value has - * been modified by someone else since the load-lock occurred, - * the write will fail and you can check the status code to - * know whether you need to retry or not. - * - */ -#elif defined (__alpha) - -#include <c_asm.h> - -/* Increment by 1 and return new value */ -inline INT32 -HXAtomicIncRetINT32(INT32* pNum) -{ - return asm ( - "10: ldl_l %t0, (%a0);" // Load-lock value into a register - " addl %t0, 1, %t0;" // Increment value - " or %t0, %zero, %v0;" // set new value for return. - " stl_c %t0, (%a0);" // Save new value into *pNum - " beq %t0, 10b;" // Retry if sequence failed - , pNum); -} - -/* Decrement by 1 and return new value */ -inline INT32 -HXAtomicDecRetINT32(INT32* pNum) -{ - return asm ( - "10: ldl_l %t0, (%a0);" // Load-lock value into a register - " subl %t0, 1, %t0;" // Decrement value - " or %t0, %zero, %v0;" // set new value for return. - " stl_c %t0, (%a0);" // Save new value into *pNum - " beq %t0, 10b;" // Retry if sequence failed - , pNum); -} - -/* Add n and return new value */ -inline INT32 -HXAtomicAddRetINT32(INT32* pNum, INT32 n) -{ - return asm ( - "10: ldl_l %t0, (%a0);" // Load-lock value into a register - " addl %t0, %a1, %t0;" // Add n to value - " or %t0, %zero, %v0;" // set new value for return. - " stl_c %t0, (%a0);" // Save new value into *pNum - " beq %t0, 10b;" // Retry if sequence failed - , pNum, n); -} - -/* Subtract n and return new value */ -inline INT32 -HXAtomicSubRetINT32(INT32* pNum, INT32 n) -{ - return asm ( - "10: ldl_l %t0, (%a0);" // Load-lock value into a register - " subl %t0, %a1, %t0;" // Subtract n from value - " or %t0, %zero, %v0;" // set new value for return. - " stl_c %t0, (%a0);" // Save new value into *pNum - " beq %t0, 10b;" // Retry if sequence failed - , pNum, n); -} - -/* Increment by 1 and return new value */ -inline UINT32 -HXAtomicIncRetUINT32(UINT32* pNum) -{ - return asm ( - "10: ldl_l %t0, (%a0);" // Load-lock value into a register - " addl %t0, 1, %t0;" // Increment value - " or %t0, %zero, %v0;" // set new value for return. - " stl_c %t0, (%a0);" // Save new value into *pNum - " beq %t0, 10b;" // Retry if sequence failed - , pNum); -} - -/* Decrement by 1 and return new value */ -inline UINT32 -HXAtomicDecRetUINT32(UINT32* pNum) -{ - return asm ( - "10: ldl_l %t0, (%a0);" // Load-lock value into a register - " subl %t0, 1, %t0;" // Decrement value - " or %t0, %zero, %v0;" // set new value for return. - " stl_c %t0, (%a0);" // Save new value into *pNum - " beq %t0, 10b;" // Retry if sequence failed - , pNum); -} - -/* Add n and return new value */ -inline UINT32 -HXAtomicAddRetUINT32(UINT32* pNum, UINT32 n) -{ - return asm ( - "10: ldl_l %t0, (%a0);" // Load-lock value into a register - " addl %t0, %a1, %t0;" // Add n to value - " or %t0, %zero, %v0;" // set new value for return. - " stl_c %t0, (%a0);" // Save new value into *pNum - " beq %t0, 10b;" // Retry if sequence failed - , pNum, n); -} - -/* Subtract n and return new value */ -inline UINT32 -HXAtomicSubRetUINT32(UINT32* pNum, UINT32 n) -{ - return asm ( - "10: ldl_l %t0, (%a0);" // Load-lock value into a register - " subl %t0, %a1, %t0;" // Subtract n from value - " or %t0, %zero, %v0;" // set new value for return. - " stl_c %t0, (%a0);" // Save new value into *pNum - " beq %t0, 10b;" // Retry if sequence failed - , pNum, n); -} - -#define HXAtomicIncINT32(p) HXAtomicIncRetINT32((p)) -#define HXAtomicDecINT32(p) HXAtomicDecRetINT32((p)) -#define HXAtomicAddINT32(p,n) HXAtomicAddRetINT32((p),(n)) -#define HXAtomicSubINT32(p,n) HXAtomicSubRetINT32((p),(n)) - -#define HXAtomicIncUINT32(p) HXAtomicIncRetUINT32((p)) -#define HXAtomicDecUINT32(p) HXAtomicDecRetUINT32((p)) -#define HXAtomicAddUINT32(p,n) HXAtomicAddRetUINT32((p),(n)) -#define HXAtomicSubUINT32(p,n) HXAtomicSubRetUINT32((p),(n)) - - - -/*********************************************************************** * AIX / PowerPC (Native compiler) * * Implementation Notes: diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxtypes.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxtypes.h index d7446aa1..9f279dd6 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxtypes.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxtypes.h @@ -63,7 +63,7 @@ typedef long int INT32; /* signed 32 bit value */ typedef unsigned long int UINT32; /* unsigned 32 bit value */ typedef unsigned int UINT; -# endif /* (defined _UNIX && (defined _ALPHA || OSF1)) */ +# endif # if (defined _UNIX && defined _IRIX) # ifdef __LONG_MAX__ @@ -641,7 +641,7 @@ typedef ULONG32 HXXIMAGE; #endif -#if defined _LONG_IS_64 && (defined _OSF1 || defined _SOLARIS || defined _HPUX) +#if defined _LONG_IS_64 && (defined _SOLARIS || defined _HPUX) typedef unsigned long PTR_INT; #else typedef unsigned int PTR_INT; diff --git a/config.h.in b/config.h.in index a04824ec..591c2aff 100644 --- a/config.h.in +++ b/config.h.in @@ -169,9 +169,6 @@ /* Define to 1 if you have the <systems.h> header file. */ #undef HAVE_SYSTEMS_H -/* Define to 1 if you have the <sys/bitypes.h> header file. */ -#undef HAVE_SYS_BITYPES_H - /* Define to 1 if you have the <sys/stat.h> header file. */ #undef HAVE_SYS_STAT_H |