Make it compile on PPC
Added generic ffdesca code Added atomic ops for ppc
This commit is contained in:
parent
2cc649d073
commit
b19f4636d9
5 changed files with 111 additions and 2 deletions
2
Makefile
2
Makefile
|
@ -92,7 +92,9 @@ SRCS += src/cwc.c \
|
|||
src/krypt.c \
|
||||
src/ffdecsa/FFdecsa.c
|
||||
|
||||
ifneq ($(ARCH), ppc)
|
||||
${BUILDDIR}/src/ffdecsa/FFdecsa.o : CFLAGS = -mmmx
|
||||
endif
|
||||
LDFLAGS += -lcrypt
|
||||
|
||||
#
|
||||
|
|
7
configure
vendored
7
configure
vendored
|
@ -19,7 +19,11 @@ CPU=generic
|
|||
ARCH=`uname -m`
|
||||
OSENV="posix"
|
||||
PREFIX=/usr/local
|
||||
PARALLEL_MODE=PARALLEL_64_MMX
|
||||
if [ "$ARCH" = "ppc" ] ; then
|
||||
PARALLEL_MODE=PARALLEL_32_INT
|
||||
else
|
||||
PARALLEL_MODE=PARALLEL_64_MMX
|
||||
fi
|
||||
|
||||
show_help(){
|
||||
echo "Usage: configure [options]"
|
||||
|
@ -151,6 +155,7 @@ fi
|
|||
# Finalize
|
||||
#
|
||||
cat >> ${CONFIG_MAK} << EOF
|
||||
ARCH=$ARCH
|
||||
INSTALLPREFIX=$PREFIX
|
||||
LDFLAGS_cfg += -lpthread
|
||||
EOF
|
||||
|
|
20
src/atomic.h
20
src/atomic.h
|
@ -31,6 +31,24 @@ atomic_add(volatile int *ptr, int incr)
|
|||
"=r"(r), "=m"(*ptr) : "0" (incr), "m" (*ptr) : "memory");
|
||||
return r;
|
||||
}
|
||||
#endif
|
||||
#elif defined(__ppc__) || defined(__PPC__)
|
||||
|
||||
/* somewhat based on code from darwin gcc */
|
||||
static inline int
|
||||
atomic_add (volatile int *ptr, int incr)
|
||||
{
|
||||
int tmp, res;
|
||||
asm volatile("0:\n"
|
||||
"lwarx %1,0,%2\n"
|
||||
"add%I3 %0,%1,%3\n"
|
||||
"stwcx. %0,0,%2\n"
|
||||
"bne- 0b\n"
|
||||
: "=&r"(tmp), "=&b"(res)
|
||||
: "r" (ptr), "Ir"(incr)
|
||||
: "cr0", "memory");
|
||||
|
||||
return res;
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* HTSATOMIC_H__ */
|
||||
|
|
55
src/ffdecsa/parallel_032_int.h
Normal file
55
src/ffdecsa/parallel_032_int.h
Normal file
|
@ -0,0 +1,55 @@
|
|||
/* FFdecsa -- fast decsa algorithm
|
||||
*
|
||||
* Copyright (C) 2003-2004 fatih89r
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
|
||||
#include "parallel_std_def.h"
|
||||
|
||||
typedef unsigned int group;
|
||||
#define GROUP_PARALLELISM 32
|
||||
#define FF0() 0x0
|
||||
#define FF1() 0xffffffff
|
||||
|
||||
/* 64 rows of 32 bits */
|
||||
|
||||
void static inline FFTABLEIN(unsigned char *tab, int g, unsigned char *data){
|
||||
*(((int *)tab)+g)=*((int *)data);
|
||||
*(((int *)tab)+32+g)=*(((int *)data)+1);
|
||||
}
|
||||
|
||||
void static inline FFTABLEOUT(unsigned char *data, unsigned char *tab, int g){
|
||||
*((int *)data)=*(((int *)tab)+g);
|
||||
*(((int *)data)+1)=*(((int *)tab)+32+g);
|
||||
}
|
||||
|
||||
void static inline FFTABLEOUTXORNBY(int n, unsigned char *data, unsigned char *tab, int g){
|
||||
int j;
|
||||
for(j=0;j<n;j++){
|
||||
*(data+j)^=*(tab+4*(g+(j>=4?32-1:0))+j);
|
||||
}
|
||||
}
|
||||
|
||||
typedef unsigned int batch;
|
||||
#define BYTES_PER_BATCH 4
|
||||
#define B_FFN_ALL_29() 0x29292929
|
||||
#define B_FFN_ALL_02() 0x02020202
|
||||
#define B_FFN_ALL_04() 0x04040404
|
||||
#define B_FFN_ALL_10() 0x10101010
|
||||
#define B_FFN_ALL_40() 0x40404040
|
||||
#define B_FFN_ALL_80() 0x80808080
|
||||
|
||||
#define M_EMPTY()
|
29
src/ffdecsa/parallel_std_def.h
Normal file
29
src/ffdecsa/parallel_std_def.h
Normal file
|
@ -0,0 +1,29 @@
|
|||
/* FFdecsa -- fast decsa algorithm
|
||||
*
|
||||
* Copyright (C) 2003-2004 fatih89r
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
|
||||
#define FFXOR(a,b) ((a)^(b))
|
||||
#define FFAND(a,b) ((a)&(b))
|
||||
#define FFOR(a,b) ((a)|(b))
|
||||
#define FFNOT(a) (~(a))
|
||||
|
||||
#define B_FFAND(a,b) ((a)&(b))
|
||||
#define B_FFOR(a,b) ((a)|(b))
|
||||
#define B_FFXOR(a,b) ((a)^(b))
|
||||
#define B_FFSH8L(a,n) ((a)<<(n))
|
||||
#define B_FFSH8R(a,n) ((a)>>(n))
|
Loading…
Add table
Reference in a new issue