Changeset 20873 for branches/eam_branch_20081124/Ohana/src/opihi/lib.shell/stack_math.c

Timestamp:

Dec 2, 2008, 6:24:28 PM (18 years ago)

Author:

eugene

Message:

fixes for interger-type vectors; finish imextract upgrade

File:

• branches/eam_branch_20081124/Ohana/src/opihi/lib.shell/stack_math.c (modified) (4 diffs)

branches/eam_branch_20081124/Ohana/src/opihi/lib.shell/stack_math.c

@@ -819 +819 @@
     }                                           \
     if ((FTYPE == 's') && (V1->type == 's')) {  \
-      opihi_int M1  = V1[0].FltValue;           \
+      opihi_int M1  = V1[0].IntValue;           \
       OUT[0].type = 's';                        \
       OUT[0].IntValue = OP;                     \
@@ -855 +855 @@
   if (!strcmp (op, "rnd"))    S_FUNC(M1*0.0 + drand48(), 'S');
   if (!strcmp (op, "not"))    S_FUNC(!(M1), 's');
-  if (!strcmp (op, "--"))     S_FUNC(-(M1), 's');
+  if (!strcmp (op, "--"))     S_FUNC(-1*M1, 's'); // NOTE: opihi_int is signed, 
   if (!strcmp (op, "isinf"))  S_FUNC(!finite(M1), 'S'); // XXX modify in future 
   if (!strcmp (op, "isnan"))  S_FUNC(isnan(M1), 'S'); // XXX modify in future   
@@ -939 +939 @@
   if (!strcmp (op, "zero"))   V_FUNC(0, 's');
   if (!strcmp (op, "not"))    V_FUNC(!(*M1), 's');
-  if (!strcmp (op, "--"))     V_FUNC(-(*M1), 's');
+  if (!strcmp (op, "--"))     V_FUNC(-1*(*M1), 's'); // NOTE: opihi_int is signed
   if (!strcmp (op, "isinf"))  V_FUNC(!finite(*M1), 'S');
   if (!strcmp (op, "isnan"))  V_FUNC(isnan(*M1), 'S');
@@ -980 +980 @@
   if (!strcmp (op, "="))     { }
   if (!strcmp (op, "abs"))   { for (i = 0; i < Nx*Ny; i++, out++, M1++) { *out = fabs(*M1);         }}
-  if (!strcmp (op, "int"))   { for (i = 0; i < Nx*Ny; i++, out++, M1++) { *out = (float)(int)(*M1); }}
+  if (!strcmp (op, "int"))   { for (i = 0; i < Nx*Ny; i++, out++, M1++) { *out = (opihi_flt)(int)(*M1); }}
   if (!strcmp (op, "exp"))   { for (i = 0; i < Nx*Ny; i++, out++, M1++) { *out = exp(*M1);          }}
   if (!strcmp (op, "ten"))   { for (i = 0; i < Nx*Ny; i++, out++, M1++) { *out = pow(10.0,*M1);     }}