freebsd-ports/comms/libfec/files/patch-viterbi39__av.c
Diane Bruce a46dd1ab7a Altivec support probably wasn't maintained for years. Fix it to compile
on powerpc64.

Tested also on amd64.

Hardware sponsored by IntegriCloud.

PR:		ports/235560
Submitted by:	Piotr Kubaj <pkubaj@anongoth.pl>
2019-02-06 23:49:11 +00:00

46 lines
1.9 KiB
C

--- viterbi39_av.c.orig 2019-02-05 19:31:24 UTC
+++ viterbi39_av.c
@@ -3,6 +3,7 @@
* Copyright Aug 2006, Phil Karn, KA9Q
* May be used under the terms of the GNU Lesser General Public License (LGPL)
*/
+#include <altivec.h>
#include <stdio.h>
#include <stdlib.h>
#include <memory.h>
@@ -30,7 +31,7 @@ int init_viterbi39_av(void *p,int starting_state){
int i;
for(i=0;i<32;i++)
- vp->metrics1.v[i] = (vector unsigned short)(1000);
+ vp->metrics1.v[i] = (vector unsigned short){1000};
vp->old_metrics = &vp->metrics1;
vp->new_metrics = &vp->metrics2;
@@ -111,7 +112,7 @@ int update_viterbi39_blk_av(void *p,unsigned char *sym
struct v39 *vp = p;
decision_t *d = (decision_t *)vp->dp;
int path_metric = 0;
- vector unsigned char decisions = (vector unsigned char)(0);
+ vector unsigned char decisions = (vector unsigned char){0};
while(nbits--){
vector unsigned short symv,sym0v,sym1v,sym2v;
@@ -122,7 +123,7 @@ int update_viterbi39_blk_av(void *p,unsigned char *sym
/* Splat the 0th symbol across sym0v, the 1st symbol across sym1v, etc */
s = (vector unsigned char)vec_perm(vec_ld(0,syms),vec_ld(5,syms),vec_lvsl(0,syms));
- symv = (vector unsigned short)vec_mergeh((vector unsigned char)(0),s); /* Unsigned byte->word unpack */
+ symv = (vector unsigned short)vec_mergeh((vector unsigned char){0},s); /* Unsigned byte->word unpack */
sym0v = vec_splat(symv,0);
sym1v = vec_splat(symv,1);
sym2v = vec_splat(symv,2);
@@ -140,7 +141,7 @@ int update_viterbi39_blk_av(void *p,unsigned char *sym
m0 = vec_add(vec_xor(Branchtab39[0].v[i],sym0v),vec_xor(Branchtab39[1].v[i],sym1v));
m1 = vec_xor(Branchtab39[2].v[i],sym2v);
metric = vec_add(m0,m1);
- m_metric = vec_sub((vector unsigned short)(765),metric);
+ m_metric = vec_sub((vector unsigned short){765},metric);
/* Add branch metrics to path metrics */
m0 = vec_adds(vp->old_metrics->v[i],metric);