summaryrefslogtreecommitdiff
path: root/src/c/operations/interfaces
diff options
context:
space:
mode:
Diffstat (limited to 'src/c/operations/interfaces')
-rw-r--r--src/c/operations/interfaces/int_OpMinus.h10
-rw-r--r--src/c/operations/interfaces/int_OpPlus.h2
-rw-r--r--src/c/operations/interfaces/int_OpSlash.h27
-rw-r--r--src/c/operations/interfaces/int_OpStar.h75
4 files changed, 90 insertions, 24 deletions
diff --git a/src/c/operations/interfaces/int_OpMinus.h b/src/c/operations/interfaces/int_OpMinus.h
index b96328e..2ea8a52 100644
--- a/src/c/operations/interfaces/int_OpMinus.h
+++ b/src/c/operations/interfaces/int_OpMinus.h
@@ -56,7 +56,7 @@
}
-#define u82OpMinusu82(in, size, out) {int i=0; \
+#define i82OpMinusi82(in, size, out) {int i=0; \
for (i=0;i<size[0]*size[1];i++) out[i] = -in[i]; \
}
@@ -65,6 +65,12 @@
for (i=0;i<size[0]*size[1];i++) out[i] = -(int16)in[i]; \
}
+
+#define i162OpMinui162(in, size, out) {int i=0; \
+ for (i=0;i<size[0]*size[1];i++) out[i] = -(int16)in[i]; \
+ }
+
+
/* Scalar - Scalar */
#define s0s0OpMinuss0(in1,in2) sdiffs(in1,in2)
@@ -237,6 +243,6 @@
#define u162u162OpMinusu162(in1,size1,in2,size2,out) u16diffa(in1, size1[0]*size1[1], in2, size2[0]*size2[1], out)
-#define i162i162OpMinusu162(in1,size1,in2,size2,out) i16diffa(in1, size1[0]*size1[1], in2, size2[0]*size2[1], out)
+#define i162i162OpMinusi162(in1,size1,in2,size2,out) i16diffa(in1, size1[0]*size1[1], in2, size2[0]*size2[1], out)
#endif /* !__INT_OPMINUS_H__ */
diff --git a/src/c/operations/interfaces/int_OpPlus.h b/src/c/operations/interfaces/int_OpPlus.h
index 9684d25..a5731d4 100644
--- a/src/c/operations/interfaces/int_OpPlus.h
+++ b/src/c/operations/interfaces/int_OpPlus.h
@@ -173,7 +173,7 @@
#define u162u162OpPlusu162(in1,size1,in2,size2,out) u16adda(in1, size1[0]*size1[1], in2, size2[0]*size2[1], out)
-#define i162i162OpPlusu162(in1,size1,in2,size2,out) i16adda(in1, size1[0]*size1[1], in2, size2[0]*size2[1], out)
+#define i162i162OpPlusi162(in1,size1,in2,size2,out) i16adda(in1, size1[0]*size1[1], in2, size2[0]*size2[1], out)
/* Strings */
/* RNU: size1[1]-1 -> "-1" because '\0' of the first string must be removed. */
#define g2g2OpPlusg2(in1,size1,in2,size2,out) {int i = 0, j = 0; \
diff --git a/src/c/operations/interfaces/int_OpSlash.h b/src/c/operations/interfaces/int_OpSlash.h
index fd8dda2..635fe2b 100644
--- a/src/c/operations/interfaces/int_OpSlash.h
+++ b/src/c/operations/interfaces/int_OpSlash.h
@@ -33,6 +33,13 @@
#define z0d0OpSlashz0(in1,in2) zrdivs(in1,DoubleComplex(in2,0))
+#define u80u80OpSlashu80(in1,in2) u8rdivs(in1,in2)
+
+#define i80i80OpSlashi80(in1,in2) i8rdivs(in1,in2)
+
+#define u160u160OpSlashu160(in1,in2) u16rdivs(in1,in2)
+
+#define i160i160OpSlashi160(in1,in2) i16rdivs(in1,in2)
/* Scalar / Matrix */
@@ -76,6 +83,17 @@
dinverma(in2,temp,size[0]);\
for (i=0;i<size[0]*size[1];i++) out[i]=zmuls(in1,DoubleComplex(temp[i],0));}
+#define u80u82OpSlashu82(in1,in2,size,out) {int i=0;\
+ for (i=0;i<size[0]*size[1];i++) out[i]=in1/in2[i];}
+
+#define i80i82OpSlashi82(in1,in2,size,out) {int i=0;\
+ for (i=0;i<size[0]*size[1];i++) out[i]=in1/in2[i];}
+
+#define u160u162OpSlashu162(in1,in2,size,out) {int i=0;\
+ for (i=0;i<size[0]*size[1];i++) out[i]=in1/in2[i];}
+
+#define i160i162OpSlashi162(in1,in2,size,out) {int i=0;\
+ for (i=0;i<size[0]*size[1];i++) out[i]=in1/in2[i];}
/* Matrix / Scalar */
@@ -110,8 +128,17 @@
#define z2d0OpSlashz2(in1,size,in2,out) z2z0OpSlashz2(in1,size,DoubleComplex(in2,0),out)
+#define u82u80OpSlashu82(in1,size,in2,out) {int i=0;\
+ for (i=0;i<size[0]*size[1];i++) out[i]=in1[i]/in2;}
+#define i82i80OpSlashi82(in1,size,in2,out) {int i=0;\
+ for (i=0;i<size[0]*size[1];i++) out[i]=in1[i]/in2;}
+#define u162u160OpSlashu162(in1,size,in2,out) {int i=0;\
+ for (i=0;i<size[0]*size[1];i++) out[i]=in1[i]/in2;}
+
+#define i162i160OpSlashi162(in1,size,in2,out) {int i=0;\
+ for (i=0;i<size[0]*size[1];i++) out[i]=in1[i]/in2;}
/* Matrix / Matrix */
diff --git a/src/c/operations/interfaces/int_OpStar.h b/src/c/operations/interfaces/int_OpStar.h
index 0dbd079..53f39e8 100644
--- a/src/c/operations/interfaces/int_OpStar.h
+++ b/src/c/operations/interfaces/int_OpStar.h
@@ -33,49 +33,48 @@
#define z0d0OpStarz0(in1,in2) zmuls(in1,DoubleComplex(in2,0))
-#define u80u80OpStaru80(in1,in2) (uint8)(in1 * in2)
+#define u80u80OpStaru80(in1,in2) u8muls(in1, in2)
-#define u80u80OpStaru160(in1,in2) (uint16)(in1 * in2)
+//#define u80u80OpStaru160(in1,in2) (uint16)(in1 * in2)
-#define u80i80OpStari80(in1,in2) (int8)(in1 * in2)
+//#define u80i80OpStari80(in1,in2) (int8)(in1 * in2)
-#define u80u80OpStari160(in1,in2) (int16)(in1 * in2)
+//#define u80i80OpStari160(in1,in2) (int16)(in1 * in2)
-#define u80u160OpStaru160(in1,in2) (uint16)(in1 * in2)
+//#define u80u160OpStaru160(in1,in2) (uint16)(in1 * in2)
-#define u80i160OpStari160(in1,in2) (int16)(in1 * in2)
+//#define u80i160OpStari160(in1,in2) (int16)(in1 * in2)
-#define i80u80OpStari80(in1,in2) (int8)(in1 * in2)
+//#define i80u80OpStari80(in1,in2) (int8)(in1 * in2)
-#define i80u80OpStari160(in1,in2) (int16)(in1 * in2)
+//#define i80u80OpStari160(in1,in2) (int16)(in1 * in2)
-#define i80i80OpStari80(in1,in2) (int8)(in1 * in2)
+#define i80i80OpStari80(in1,in2) (int8)(in1 , in2)
-#define i80i80OpStari160(in1,in2) (int16)(in1 * in2)
+//#define i80i80OpStari160(in1,in2) (int16)(in1 * in2)
+//#define i80u160OpStari160(in1,in2) (int16)(in1 * in2)
-#define i80u160OpStari160(in1,in2) (int16)(in1 * in2)
+//#define i80i160OpStari160(in1,in2) (int16)(in1 * in2)
-#define i80i160OpStari160(in1,in2) (int16)(in1 * in2)
+//#define u160u80OpStaru160(in1,in2) (uint16)(in1 * in2)
-#define u160u80OpStaru160(in1,in2) (uint16)(in1 * in2)
+//#define u160i80OpStari160(in1,in2) (int16)(in1 * in2)
-#define u160i80OpStari160(in1,in2) (int16)(in1 * in2)
+#define u160u160OpStaru160(in1,in2) u16muls(in1 , in2)
-#define u160u160OpStaru160(in1,in2) (uint16)(in1 * in2)
+//#define u160i160OpStari160(in1,in2) (int16)(in1 * in2)
-#define u160i160OpStari160(in1,in2) (int16)(in1 * in2)
+//#define i160u80OpStari160(in1,in2) (int16)(in1 * in2)
-#define i160u80OpStari160(in1,in2) (int16)(in1 * in2)
+//#define i160i80OpStari160(in1,in2) (int16)(in1 * in2)
-#define i160i80OpStari160(in1,in2) (int16)(in1 * in2)
+//#define i160u160OpStari160(in1,in2) (int16)(in1 * in2)
-#define i160u160OpStari160(in1,in2) (int16)(in1 * in2)
+#define i160i160OpStari160(in1,in2) i16muls(in1 , in2)
-#define i160i160OpStari160(in1,in2) (int16)(in1 * in2)
/* Scalar * Matrix */
-
#define s0s2OpStars2(in1,in2,size,out) {int i=0;\
for (i=0;i<size[0]*size[1];i++) out[i]=in1*in2[i];}
@@ -104,6 +103,18 @@
for (i=0;i<size[0]*size[1];i++) out[i]=zmuls(in1,DoubleComplex(in2[i],0));}
+#define u80u82OpStaru82(in1,in2,size,out) {int i=0;\
+ for (i=0;i<size[0]*size[1];i++) out[i]=in1*(uint8)in2[i];}
+
+#define i80i82OpStari82(in1,in2,size,out) {int i=0;\
+ for (i=0;i<size[0]*size[1];i++) out[i]=in1*in2[i];}
+
+#define u160u162OpStaru162(in1,in2,size,out) {int i=0;\
+ for (i=0;i<size[0]*size[1];i++) out[i]=in1*in2[i];}
+
+#define i160162OpStari162(in1,in2,size,out) {int i=0;\
+ for (i=0;i<size[0]*size[1];i++) out[i]=in1*in2[i];}
+
/* Matrix * Scalar */
@@ -135,6 +146,20 @@
#define z2d0OpStarz2(in1,size,in2,out) z2z0OpStarz2(in1,size,DoubleComplex(in2,0),out)
+
+#define u82u80OpStaru82(in1,size,in2,out) {int i=0;\
+ for (i=0;i<size[0]*size[1];i++) out[i]=in1[i]*in2;}
+
+#define i82i80OpStari82(in1,size,in2,out) {int i=0;\
+ for (i=0;i<size[0]*size[1];i++) out[i]=in1[i]*in2;}
+
+#define u162u160OpStaru162(in1,size,in2,out) {int i=0;\
+ for (i=0;i<size[0]*size[1];i++) out[i]=in1[i]*in2;}
+
+#define i162160OpStari162(in1,size,in2,out) {int i=0;\
+ for (i=0;i<size[0]*size[1];i++) out[i]=in1[i]*in2;}
+
+
/* Matrix * Matrix */
#define s2s2OpStars2(in1,size1,in2,size2,out) smulma(in1,size1[0],size1[1],in2,size2[0],size2[1],out)
@@ -187,4 +212,12 @@
#define z2z2OpStarz0(in1, size1, in2, size2) zmulv( in1, in2, MAX(MAX(size1[0], size1[1]), MAX(size2[0], size2[1])))
+#define u82u82OpStaru80(in1, size1, in2, size2) u8mulv( in1, in2, MAX(MAX(size1[0], size1[1]), MAX(size2[0], size2[1])))
+
+#define i82i82OpStari80(in1, size1, in2, size2) i8mulv( in1, in2, MAX(MAX(size1[0], size1[1]), MAX(size2[0], size2[1])))
+
+#define u162u162OpStaru160(in1, size1, in2, size2) u16mulv( in1, in2, MAX(MAX(size1[0], size1[1]), MAX(size2[0], size2[1])))
+
+#define i162i162OpStari160(in1, size1, in2, size2) i16mulv( in1, in2, MAX(MAX(size1[0], size1[1]), MAX(size2[0], size2[1])))
+
#endif /* !__INT_OPSTAR_H__ */
generated by cgit (git 2.34.1) at 2025-02-03 03:18:47 +0000