Removed the ancient optimizations which make the latest gcc-generated code crash while playing the MIDI files using the SoundFont.

1 files changed, 0 insertions, 277 deletions

diff --git a/lib/timidity/timidity/optcode.h b/lib/timidity/timidity/optcode.h
index 3411cfd91d..34e07a1a4b 100644
--- a/lib/timidity/timidity/optcode.h
+++ b/lib/timidity/timidity/optcode.h
@@ -21,223 +21,6 @@
 #ifndef OPTCODE_H_INCLUDED
 #define OPTCODE_H_INCLUDED 1
 
-/* optimizing mode */
-/* 0: none         */
-/* 1: x86 asm      */
-#define OPT_MODE 1
-
-/* PowerPC's AltiVec enhancement */
-/* 0: none                       */
-/* 1: use altivec                */
-/*    (need -faltivec option)    */
-#ifndef USE_ALTIVEC
-#define USE_ALTIVEC 0
-#endif
-
-/*****************************************************************************/
-
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif/* <sys/param.h> */
-#ifdef HAVE_SYS_SYSCTL_H
-#include <sys/sysctl.h>
-#endif/* <sys/sysctl.h> */
-#ifdef STDC_HEADERS
-#include <string.h>
-#elif HAVE_STRINGS_H
-#include <strings.h>
-#endif/* <string.h> */
-
-#if __STDC_VERSION__ == 199901L
-# include <stdbool.h>
-#endif
-
-/*****************************************************************************/
-#if OPT_MODE == 1
-
-#ifdef LITTLE_ENDIAN
-#define iman_ 0
-#else
-#define iman_ 1
-#endif
-#define _double2fixmagic 68719476736.0 * 1.5
-
-#if defined(__GNUC__) && defined(__i386__)
-static inline int32 imuldiv8(int32 a, int32 b)
-{
-    int32 result;
-    __asm__("movl %1, %%eax\n\t"
-	    "movl %2, %%edx\n\t"
-	    "imull %%edx\n\t"
-	    "shr $8, %%eax\n\t"
-	    "shl $24, %%edx\n\t"
-	    "or %%edx, %%eax\n\t"
-	    "movl %%eax, %0\n\t"
-	    : "=g"(result)
-	    : "g"(a), "g"(b)
-	    : "eax", "edx");
-    return result;
-}
-
-static inline int32 imuldiv16(int32 a, int32 b)
-{
-    int32 result;
-    __asm__("movl %1, %%eax\n\t"
-	    "movl %2, %%edx\n\t"
-	    "imull %%edx\n\t"
-	    "shr $16, %%eax\n\t"
-	    "shl $16, %%edx\n\t"
-	    "or %%edx, %%eax\n\t"
-	    "movl %%eax, %0\n\t"
-	    : "=g"(result)
-	    : "g"(a), "g"(b)
-	    : "eax", "edx");
-    return result;
-}
-
-static inline int32 imuldiv24(int32 a, int32 b)
-{
-    int32 result;
-    __asm__("movl %1, %%eax\n\t"
-	    "movl %2, %%edx\n\t"
-	    "imull %%edx\n\t"
-	    "shr $24, %%eax\n\t"
-	    "shl $8, %%edx\n\t"
-	    "or %%edx, %%eax\n\t"
-	    "movl %%eax, %0\n\t"
-	    : "=g"(result)
-	    : "g"(a), "g"(b)
-	    : "eax", "edx");
-    return result;
-}
-
-static inline int32 imuldiv28(int32 a, int32 b)
-{
-    int32 result;
-    __asm__("movl %1, %%eax\n\t"
-	    "movl %2, %%edx\n\t"
-	    "imull %%edx\n\t"
-	    "shr $28, %%eax\n\t"
-	    "shl $4, %%edx\n\t"
-	    "or %%edx, %%eax\n\t"
-	    "movl %%eax, %0\n\t"
-	    : "=g"(result)
-	    : "g"(a), "g"(b)
-	    : "eax", "edx");
-    return result;
-}
-
-#elif _MSC_VER
-inline int32 imuldiv8(int32 a, int32 b) {
-	_asm {
-		mov eax, a
-		mov edx, b
-		imul edx
-		shr eax, 8
-		shl edx, 24
-		or  eax, edx
-	}
-}
-
-inline int32 imuldiv16(int32 a, int32 b) {
-	_asm {
-		mov eax, a
-		mov edx, b
-		imul edx
-		shr eax, 16
-		shl edx, 16
-		or  eax, edx
-	}
-}
-
-inline int32 imuldiv24(int32 a, int32 b) {
-	_asm {
-		mov eax, a
-		mov edx, b
-		imul edx
-		shr eax, 24
-		shl edx, 8
-		or  eax, edx
-	}
-}
-
-inline int32 imuldiv28(int32 a, int32 b) {
-	_asm {
-		mov eax, a
-		mov edx, b
-		imul edx
-		shr eax, 28
-		shl edx, 4
-		or  eax, edx
-	}
-}
-
-#elif defined(__GNUC__) && defined(__ppc__)
-static inline int32 imuldiv8(int32 a, int32 b)
-{
-    register int32 ret,rah,ral,rlh,rll;
-    __asm__ ("mulhw %0,%7,%8\n\t"
-	     "mullw %1,%7,%8\n\t"
-	     "rlwinm %2,%0,24,0,7\n\t"
-	     "rlwinm %3,%1,24,8,31\n\t"
-	     "or %4,%2,%3"
-	     :"=r"(rah),"=r"(ral),
-	      "=r"(rlh),"=r"(rll),
-	      "=r"(ret),
-	      "=r"(a),"=r"(b)
-	     :"5"(a),"6"(b));
-    return ret;
-}
-
-static inline int32 imuldiv16(int32 a, int32 b)
-{
-    register int32 ret,rah,ral,rlh,rll;
-    __asm__ ("mulhw %0,%7,%8\n\t"
-	     "mullw %1,%7,%8\n\t"
-	     "rlwinm %2,%0,16,0,15\n\t"
-	     "rlwinm %3,%1,16,16,31\n\t"
-	     "or %4,%2,%3"
-	     :"=r"(rah),"=r"(ral),
-	      "=r"(rlh),"=r"(rll),
-	      "=r"(ret),
-	      "=r"(a),"=r"(b)
-	     :"5"(a),"6"(b));
-    return ret;
-}
-
-static inline int32 imuldiv24(int32 a, int32 b)
-{
-    register int32 ret,rah,ral,rlh,rll;
-    __asm__ ("mulhw %0,%7,%8\n\t"
-	     "mullw %1,%7,%8\n\t"
-	     "rlwinm %2,%0,8,0,23\n\t"
-	     "rlwinm %3,%1,8,24,31\n\t"
-	     "or %4,%2,%3"
-	     :"=r"(rah),"=r"(ral),
-	      "=r"(rlh),"=r"(rll),
-	      "=r"(ret),
-	      "=r"(a),"=r"(b)
-	     :"5"(a),"6"(b));
-    return ret;
-}
-
-static inline int32 imuldiv28(int32 a, int32 b)
-{
-    register int32 ret,rah,ral,rlh,rll;
-    __asm__ ("mulhw %0,%7,%8\n\t"
-	     "mullw %1,%7,%8\n\t"
-	     "rlwinm %2,%0,4,0,27\n\t"
-	     "rlwinm %3,%1,4,28,31\n\t"
-	     "or %4,%2,%3"
-	     :"=r"(rah),"=r"(ral),
-	      "=r"(rlh),"=r"(rll),
-	      "=r"(ret),
-	      "=r"(a),"=r"(b)
-	     :"5"(a),"6"(b));
-    return ret;
-}
-
-#else
 /* Generic version of imuldiv. */
 #define imuldiv8(a, b) \
     (int32)(((int64)(a) * (int64)(b)) >> 8)
@@ -251,64 +34,4 @@ static inline int32 imuldiv28(int32 a, int32 b)
 #define imuldiv28(a, b) \
     (int32)(((int64)(a) * (int64)(b)) >> 28)
 
-#endif /* architectures */
-
-static inline int32 signlong(int32 a)
-{
-	return ((a | 0x7fffffff) >> 30);
-}
-#endif /* OPT_MODE != 0 */
-
-/*****************************************************************************/
-#if USE_ALTIVEC
-
-#ifndef __bool_true_false_are_defined
-#define bool _Bool
-typedef enum { false = 0, true = 1 } bool;
-#endif /* C99 Hack */
-
-/* typedefs */
-typedef vector signed int  vint32;
-typedef vector signed char vint8;
-
-/* prototypes */
-void v_memset(void* dest, int c, size_t len);
-void v_memzero(void* dest, size_t len);
-void v_set_dry_signal(void* dest, const int32* buf, int32 n);
-
-/* inline functions */
-extern inline bool is_altivec_available(void)
-{
-  int sel[2] = { CTL_HW, HW_VECTORUNIT };
-  int has_altivec = false;
-  size_t len = sizeof(has_altivec);
-  int error = sysctl(sel, 2, &has_altivec, &len, NULL, 0);
-  if(!error) {
-    return (bool)!!has_altivec;
-  } else {
-    return false;
-  }
-}
-
-extern inline void libc_memset(void* destp, int c, size_t len)
-{
-    memset(destp,c,len);
-}
-
-static inline void* switch_memset(void* destp, int c, size_t len)
-{
-    void* keepdestp = destp;
-    if(!is_altivec_available()) {
-        libc_memset(destp,c,len);
-    } else if (c) {
-        v_memset(destp,c,len);
-    } else {
-        v_memzero(destp,len);
-    }
-    return keepdestp;
-}
-
-#define memset switch_memset
-#endif /* altivec */
-
 #endif /* OPTCODE_H_INCLUDED */