From 33dd6d603830640766aa1a5fe70137c856e2c145 Mon Sep 17 00:00:00 2001
From: musil <tmusil@users.sourceforge.net>
Date: Thu, 6 Sep 2012 15:54:46 +0000
Subject: other variable names, t_float to t_sample change, array access 64 bit

svn path=/trunk/externals/iemlib/; revision=16193
---
 iemlib1/src/iem_sqrt4~.c | 57 ++++++++++++++++++++----------------------------
 1 file changed, 24 insertions(+), 33 deletions(-)

(limited to 'iemlib1/src/iem_sqrt4~.c')

diff --git a/iemlib1/src/iem_sqrt4~.c b/iemlib1/src/iem_sqrt4~.c
index f721b20..0b4049d 100644
--- a/iemlib1/src/iem_sqrt4~.c
+++ b/iemlib1/src/iem_sqrt4~.c
@@ -1,7 +1,7 @@
 /* For information on usage and redistribution, and for a DISCLAIMER OF ALL
 * WARRANTIES, see the file, "LICENSE.txt," in this distribution.
 
-iemlib1 written by Thomas Musil, Copyright (c) IEM KUG Graz Austria 2000 - 2006 */
+iemlib1 written by Thomas Musil, Copyright (c) IEM KUG Graz Austria 2000 - 2012 */
 
 #include "m_pd.h"
 #include "iemlib.h"
@@ -12,40 +12,40 @@ iemlib1 written by Thomas Musil, Copyright (c) IEM KUG Graz Austria 2000 - 2006
 
 /* ------------------------ iem_sqrt4~ ----------------------------- */
 
-static t_float *iem_sqrt4_tilde_exptab=(t_float *)0L;
-static t_float *iem_sqrt4_tilde_mantissatab=(t_float *)0L;
+static t_float iem_rsqrt4_tilde_exptab[IEMSQRT4TAB1SIZE];
+static t_float iem_rsqrt4_tilde_mantissatab[IEMSQRT4TAB2SIZE];
 
 static t_class *iem_sqrt4_tilde_class;
 
 typedef struct _iem_sqrt4_tilde
 {
   t_object  x_obj;
-  t_float   x_msi;
+  t_float   x_float_sig_in;
 } t_iem_sqrt4_tilde;
 
 static t_int *iem_sqrt4_tilde_perform(t_int *w)
 {
-  t_float *in = (t_float *)(w[1]);
-  t_float *out = (t_float *)(w[2]);
+  t_sample *in = (t_sample *)(w[1]);
+  t_sample *out = (t_sample *)(w[2]);
   t_int n = (t_int)(w[3])/4;
   
   while(n--)
   {
-    t_float f = *in;
-    t_float g, h;
+    t_sample f = *in;
+    t_sample g, h;
     union tabfudge_f tf;
     
-    if(f < 0.0f)
+    if(f <= 0.0)
     {
-      *out++ = 0.0f;
-      *out++ = 0.0f;
-      *out++ = 0.0f;
-      *out++ = 0.0f;
+      *out++ = 0.0;
+      *out++ = 0.0;
+      *out++ = 0.0;
+      *out++ = 0.0;
     }
     else
     {
       tf.tf_f = f;
-      g = iem_sqrt4_tilde_exptab[((tf.tf_l) >> 23) & 0xff] * iem_sqrt4_tilde_mantissatab[((tf.tf_l) >> 13) & 0x3ff];
+      g = iem_rsqrt4_tilde_exptab[((tf.tf_l) >> 23) & 0xff] * iem_rsqrt4_tilde_mantissatab[((tf.tf_l) >> 13) & 0x3ff];
       h = f * (1.5f * g - 0.5f * g * g * g * f);
       *out++ = h;
       *out++ = h;
@@ -62,29 +62,21 @@ static void iem_sqrt4_tilde_dsp(t_iem_sqrt4_tilde *x, t_signal **sp)
   dsp_add(iem_sqrt4_tilde_perform, 3, sp[0]->s_vec, sp[1]->s_vec, sp[0]->s_n);
 }
 
-static void iem_sqrt4_tilde_maketable(void)
+static void iem_sqrt4_tilde_init(void)
 {
   int i;
   t_float f;
   union tabfudge_f tf;
   
-  if(!iem_sqrt4_tilde_exptab)
+  for(i=0; i<IEMSQRT4TAB1SIZE; i++)
   {
-    iem_sqrt4_tilde_exptab = (t_float *)getbytes(sizeof(t_float) * IEMSQRT4TAB1SIZE);
-    for(i=0; i<IEMSQRT4TAB1SIZE; i++)
-    {
-      tf.tf_l = (i ? (i == IEMSQRT4TAB1SIZE-1 ? IEMSQRT4TAB1SIZE-2 : i) : 1)<< 23;
-      iem_sqrt4_tilde_exptab[i] = 1.0f/sqrt(tf.tf_f); 
-    }
+    tf.tf_l = (i ? (i == IEMSQRT4TAB1SIZE-1 ? IEMSQRT4TAB1SIZE-2 : i) : 1)<< 23;
+    iem_rsqrt4_tilde_exptab[i] = 1.0/sqrt(tf.tf_f); 
   }
-  if(!iem_sqrt4_tilde_mantissatab)
+  for(i=0; i<IEMSQRT4TAB2SIZE; i++)
   {
-    iem_sqrt4_tilde_mantissatab = (t_float *)getbytes(sizeof(t_float) * IEMSQRT4TAB2SIZE);
-    for(i=0; i<IEMSQRT4TAB2SIZE; i++)
-    {
-      f = 1.0f + (1.0f/(t_float)IEMSQRT4TAB2SIZE) * (t_float)i;
-      iem_sqrt4_tilde_mantissatab[i] = 1.0f/sqrt(f);  
-    }
+    f = 1.0 + (1.0/(t_float)IEMSQRT4TAB2SIZE) * (t_float)i;
+    iem_rsqrt4_tilde_mantissatab[i] = 1.0/sqrt(f);  
   }
 }
 
@@ -93,16 +85,15 @@ static void *iem_sqrt4_tilde_new(void)
   t_iem_sqrt4_tilde *x = (t_iem_sqrt4_tilde *)pd_new(iem_sqrt4_tilde_class);
   
   outlet_new(&x->x_obj, gensym("signal"));
-  x->x_msi = 0;
+  x->x_float_sig_in = 0;
   return (x);
 }
 
 void iem_sqrt4_tilde_setup(void)
 {
+  iem_sqrt4_tilde_init();
   iem_sqrt4_tilde_class = class_new(gensym("iem_sqrt4~"), (t_newmethod)iem_sqrt4_tilde_new, 0,
     sizeof(t_iem_sqrt4_tilde), 0, 0);
-  CLASS_MAINSIGNALIN(iem_sqrt4_tilde_class, t_iem_sqrt4_tilde, x_msi);
+  CLASS_MAINSIGNALIN(iem_sqrt4_tilde_class, t_iem_sqrt4_tilde, x_float_sig_in);
   class_addmethod(iem_sqrt4_tilde_class, (t_method)iem_sqrt4_tilde_dsp, gensym("dsp"), 0);
-  iem_sqrt4_tilde_maketable();
-//  class_sethelpsymbol(iem_sqrt4_tilde_class, gensym("iemhelp/help-iem_sqrt4~"));
 }
-- 
cgit v1.2.1