From aba32804a6cbd6fb16e13e86364e643022a2941a Mon Sep 17 00:00:00 2001 From: Siddhesh Wani Date: Thu, 6 Aug 2015 01:10:39 +0530 Subject: Multiplication tested for new data types --- macros/CCodeGeneration/C_Type.bin | Bin 9600 -> 9600 bytes .../.fuse_hidden0000220800000001 | Bin 0 -> 404912 bytes macros/ToolInitialization/INIT_CreateDirs.bin | Bin 9600 -> 9600 bytes .../ToolInitialization/INIT_FillSCI2LibCDirs.bin | Bin 404912 -> 404912 bytes .../ToolInitialization/INIT_GenAnnFLFunctions.bin | Bin 9600 -> 9600 bytes macros/ToolInitialization/INIT_GenFileInfo.bin | Bin 13696 -> 13696 bytes macros/ToolInitialization/INIT_GenLibraries.bin | Bin 9600 -> 9600 bytes macros/ToolInitialization/INIT_GenSharedInfo.bin | Bin 13696 -> 13696 bytes macros/ToolInitialization/INIT_LoadLibraries.bin | Bin 9600 -> 9600 bytes macros/ToolInitialization/INIT_RemoveDirs.bin | Bin 13696 -> 13696 bytes macros/ToolInitialization/INIT_SCI2C.bin | Bin 21152 -> 21152 bytes macros/ToolInitialization/INIT_SharedInfoEqual.bin | Bin 9600 -> 9600 bytes macros/ToolInitialization/ManageNextConversion.bin | Bin 13696 -> 13696 bytes macros/ToolInitialization/UpdateSCI2CInfo.bin | Bin 30256 -> 30256 bytes macros/findDeps/getAllHeaders.bin | Bin 13696 -> 13696 bytes macros/findDeps/getAllInterfaces.bin | Bin 13696 -> 13696 bytes macros/findDeps/getAllSources.bin | Bin 86048 -> 86496 bytes macros/findDeps/getAllSources.sci | 28 ++++++++ src/c/elementaryFunctions/interfaces/int_int16.h | 8 +-- src/c/elementaryFunctions/interfaces/int_int8.h | 8 +-- src/c/elementaryFunctions/interfaces/int_uint16.h | 8 +-- src/c/operations/division/i16ldivs.c | 19 ++++++ src/c/operations/division/i16rdivs.c | 19 ++++++ src/c/operations/division/i8ldivs.c | 19 ++++++ src/c/operations/division/i8rdivs.c | 19 ++++++ src/c/operations/division/u16ldivs.c | 19 ++++++ src/c/operations/division/u16rdivs.c | 19 ++++++ src/c/operations/division/u8ldivs.c | 19 ++++++ src/c/operations/division/u8rdivs.c | 19 ++++++ src/c/operations/includes/division.h | 67 ++++++++++++++++++ src/c/operations/includes/multiplication.h | 70 +++++++++++++++++++ src/c/operations/interfaces/int_OpMinus.h | 10 ++- src/c/operations/interfaces/int_OpPlus.h | 2 +- src/c/operations/interfaces/int_OpSlash.h | 27 ++++++++ src/c/operations/interfaces/int_OpStar.h | 75 +++++++++++++++------ src/c/operations/multiplication/i16muls.c | 2 +- src/c/operations/multiplication/i16mulv.c | 6 +- src/c/operations/multiplication/i8muls.c | 2 +- src/c/operations/multiplication/i8mulv.c | 6 +- src/c/operations/multiplication/u16muls.c | 2 +- src/c/operations/multiplication/u16mulv.c | 6 +- src/c/operations/multiplication/u8muls.c | 2 +- src/c/operations/multiplication/u8mulv.c | 6 +- 43 files changed, 435 insertions(+), 52 deletions(-) create mode 100644 macros/ToolInitialization/.fuse_hidden0000220800000001 create mode 100644 src/c/operations/division/i16ldivs.c create mode 100644 src/c/operations/division/i16rdivs.c create mode 100644 src/c/operations/division/i8ldivs.c create mode 100644 src/c/operations/division/i8rdivs.c create mode 100644 src/c/operations/division/u16ldivs.c create mode 100644 src/c/operations/division/u16rdivs.c create mode 100644 src/c/operations/division/u8ldivs.c create mode 100644 src/c/operations/division/u8rdivs.c diff --git a/macros/CCodeGeneration/C_Type.bin b/macros/CCodeGeneration/C_Type.bin index 2141e15b..52bc7220 100644 Binary files a/macros/CCodeGeneration/C_Type.bin and b/macros/CCodeGeneration/C_Type.bin differ diff --git a/macros/ToolInitialization/.fuse_hidden0000220800000001 b/macros/ToolInitialization/.fuse_hidden0000220800000001 new file mode 100644 index 00000000..f4029868 Binary files /dev/null and b/macros/ToolInitialization/.fuse_hidden0000220800000001 differ diff --git a/macros/ToolInitialization/INIT_CreateDirs.bin b/macros/ToolInitialization/INIT_CreateDirs.bin index 8d91e5b6..398d6ff0 100644 Binary files a/macros/ToolInitialization/INIT_CreateDirs.bin and b/macros/ToolInitialization/INIT_CreateDirs.bin differ diff --git a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin index f4029868..e50798d1 100644 Binary files a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin and b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin differ diff --git a/macros/ToolInitialization/INIT_GenAnnFLFunctions.bin b/macros/ToolInitialization/INIT_GenAnnFLFunctions.bin index 834b3733..5d6b1cae 100644 Binary files a/macros/ToolInitialization/INIT_GenAnnFLFunctions.bin and b/macros/ToolInitialization/INIT_GenAnnFLFunctions.bin differ diff --git a/macros/ToolInitialization/INIT_GenFileInfo.bin b/macros/ToolInitialization/INIT_GenFileInfo.bin index 3ec972a0..782c9176 100644 Binary files a/macros/ToolInitialization/INIT_GenFileInfo.bin and b/macros/ToolInitialization/INIT_GenFileInfo.bin differ diff --git a/macros/ToolInitialization/INIT_GenLibraries.bin b/macros/ToolInitialization/INIT_GenLibraries.bin index 60d42c75..850ca7c2 100644 Binary files a/macros/ToolInitialization/INIT_GenLibraries.bin and b/macros/ToolInitialization/INIT_GenLibraries.bin differ diff --git a/macros/ToolInitialization/INIT_GenSharedInfo.bin b/macros/ToolInitialization/INIT_GenSharedInfo.bin index 5ec3e454..bc174bdc 100644 Binary files a/macros/ToolInitialization/INIT_GenSharedInfo.bin and b/macros/ToolInitialization/INIT_GenSharedInfo.bin differ diff --git a/macros/ToolInitialization/INIT_LoadLibraries.bin b/macros/ToolInitialization/INIT_LoadLibraries.bin index bfa46948..0be22bf9 100644 Binary files a/macros/ToolInitialization/INIT_LoadLibraries.bin and b/macros/ToolInitialization/INIT_LoadLibraries.bin differ diff --git a/macros/ToolInitialization/INIT_RemoveDirs.bin b/macros/ToolInitialization/INIT_RemoveDirs.bin index 98c77289..19a66a59 100644 Binary files a/macros/ToolInitialization/INIT_RemoveDirs.bin and b/macros/ToolInitialization/INIT_RemoveDirs.bin differ diff --git a/macros/ToolInitialization/INIT_SCI2C.bin b/macros/ToolInitialization/INIT_SCI2C.bin index 7823ed5a..3e596ba3 100644 Binary files a/macros/ToolInitialization/INIT_SCI2C.bin and b/macros/ToolInitialization/INIT_SCI2C.bin differ diff --git a/macros/ToolInitialization/INIT_SharedInfoEqual.bin b/macros/ToolInitialization/INIT_SharedInfoEqual.bin index d0015c25..11e91f43 100644 Binary files a/macros/ToolInitialization/INIT_SharedInfoEqual.bin and b/macros/ToolInitialization/INIT_SharedInfoEqual.bin differ diff --git a/macros/ToolInitialization/ManageNextConversion.bin b/macros/ToolInitialization/ManageNextConversion.bin index 30d836f0..45fdcc39 100644 Binary files a/macros/ToolInitialization/ManageNextConversion.bin and b/macros/ToolInitialization/ManageNextConversion.bin differ diff --git a/macros/ToolInitialization/UpdateSCI2CInfo.bin b/macros/ToolInitialization/UpdateSCI2CInfo.bin index ba8fa34f..fe3fb30f 100644 Binary files a/macros/ToolInitialization/UpdateSCI2CInfo.bin and b/macros/ToolInitialization/UpdateSCI2CInfo.bin differ diff --git a/macros/findDeps/getAllHeaders.bin b/macros/findDeps/getAllHeaders.bin index 93b73266..4437369c 100644 Binary files a/macros/findDeps/getAllHeaders.bin and b/macros/findDeps/getAllHeaders.bin differ diff --git a/macros/findDeps/getAllInterfaces.bin b/macros/findDeps/getAllInterfaces.bin index acefc1bd..6a9d2bac 100644 Binary files a/macros/findDeps/getAllInterfaces.bin and b/macros/findDeps/getAllInterfaces.bin differ diff --git a/macros/findDeps/getAllSources.bin b/macros/findDeps/getAllSources.bin index 45c2447c..d63b91a3 100644 Binary files a/macros/findDeps/getAllSources.bin and b/macros/findDeps/getAllSources.bin differ diff --git a/macros/findDeps/getAllSources.sci b/macros/findDeps/getAllSources.sci index 1c6899c9..3d1ff9b1 100644 --- a/macros/findDeps/getAllSources.sci +++ b/macros/findDeps/getAllSources.sci @@ -505,6 +505,14 @@ function allSources = getAllSources() "src/c/operations/multiplication/zmulv.c" "src/c/operations/multiplication/zmuldzv.c" "src/c/operations/multiplication/zmulzdv.c" + "src/c/operations/multiplication/u8muls.c" + "src/c/operations/multiplication/u8mulv.c" + "src/c/operations/multiplication/i8muls.c" + "src/c/operations/multiplication/i8mulv.c" + "src/c/operations/multiplication/u16muls.c" + "src/c/operations/multiplication/u16mulv.c" + "src/c/operations/multiplication/i16muls.c" + "src/c/operations/multiplication/i16mulv.c" "src/c/operations/division/drdiva.c" "src/c/operations/division/drdivs.c" "src/c/operations/division/srdiva.c" @@ -521,6 +529,14 @@ function allSources = getAllSources() "src/c/operations/division/crdivs.c" "src/c/operations/division/cldiva.c" "src/c/operations/division/cldivs.c" + "src/c/operations/division/u8ldivs.c" + "src/c/operations/division/u8rdivs.c" + "src/c/operations/division/i8ldivs.c" + "src/c/operations/division/i8rdivs.c" + "src/c/operations/division/u16ldivs.c" + "src/c/operations/division/u16rdivs.c" + "src/c/operations/division/i16ldivs.c" + "src/c/operations/division/i16rdivs.c" "src/c/operations/addition/sadda.c" "src/c/operations/addition/sadds.c" "src/c/operations/addition/zadda.c" @@ -531,6 +547,12 @@ function allSources = getAllSources() "src/c/operations/addition/dadds.c" "src/c/operations/addition/u8adds.c" "src/c/operations/addition/u8adda.c" + "src/c/operations/addition/i8adds.c" + "src/c/operations/addition/i8adda.c" + "src/c/operations/addition/u16adds.c" + "src/c/operations/addition/u16adda.c" + "src/c/operations/addition/i16adds.c" + "src/c/operations/addition/i16adda.c" "src/c/operations/subtraction/ddiffa.c" "src/c/operations/subtraction/ddiffs.c" "src/c/operations/subtraction/sdiffa.c" @@ -541,6 +563,12 @@ function allSources = getAllSources() "src/c/operations/subtraction/cdiffs.c" "src/c/operations/subtraction/u8diffs.c" "src/c/operations/subtraction/u8diffa.c" + "src/c/operations/subtraction/i8diffs.c" + "src/c/operations/subtraction/i8diffa.c" + "src/c/operations/subtraction/u16diffs.c" + "src/c/operations/subtraction/u16diffa.c" + "src/c/operations/subtraction/i16diffs.c" + "src/c/operations/subtraction/i16diffa.c" "src/c/string/disp/ddispa.c" "src/c/string/disp/ddisps.c" "src/c/string/disp/sdispa.c" diff --git a/src/c/elementaryFunctions/interfaces/int_int16.h b/src/c/elementaryFunctions/interfaces/int_int16.h index 759cb971..353890d5 100644 --- a/src/c/elementaryFunctions/interfaces/int_int16.h +++ b/src/c/elementaryFunctions/interfaces/int_int16.h @@ -15,12 +15,12 @@ #ifndef __INT_INT16_H__ #define __INT_INT16_H__ -#define s0int16u80(in) sint16s(in) +#define s0int16i160(in) sint16s(in) -#define d0int16u80(in) dint16s(in) +#define d0int16i160(in) dint16s(in) -#define s2int16u82(in,size,out) sint16a(in, size[0]*size[1], out) +#define s2int16i162(in,size,out) sint16a(in, size[0]*size[1], out) -#define d2int16u82(in,size,out) dint16a(in, size[0]*size[1], out) +#define d2int16i162(in,size,out) dint16a(in, size[0]*size[1], out) #endif /* !__INT_INT8_H__ */ diff --git a/src/c/elementaryFunctions/interfaces/int_int8.h b/src/c/elementaryFunctions/interfaces/int_int8.h index 5cf129eb..0f6dde24 100644 --- a/src/c/elementaryFunctions/interfaces/int_int8.h +++ b/src/c/elementaryFunctions/interfaces/int_int8.h @@ -15,12 +15,12 @@ #ifndef __INT_INT8_H__ #define __INT_INT8_H__ -#define s0int8u80(in) sint8s(in) +#define s0int8i80(in) sint8s(in) -#define d0int8u80(in) dint8s(in) +#define d0int8i80(in) dint8s(in) -#define s2int8u82(in,size,out) sint8a(in, size[0]*size[1], out) +#define s2int8i82(in,size,out) sint8a(in, size[0]*size[1], out) -#define d2int8u82(in,size,out) dint8a(in, size[0]*size[1], out) +#define d2int8i82(in,size,out) dint8a(in, size[0]*size[1], out) #endif /* !__INT_INT8_H__ */ diff --git a/src/c/elementaryFunctions/interfaces/int_uint16.h b/src/c/elementaryFunctions/interfaces/int_uint16.h index 0d558b30..7d362437 100644 --- a/src/c/elementaryFunctions/interfaces/int_uint16.h +++ b/src/c/elementaryFunctions/interfaces/int_uint16.h @@ -15,12 +15,12 @@ #ifndef __INT_UINT16_H__ #define __INT_UINT16_H__ -#define s0uint16u80(in) suint16s(in) +#define s0uint16u160(in) suint16s(in) -#define d0uint16u80(in) duint16s(in) +#define d0uint16u160(in) duint16s(in) -#define s2uint16u82(in,size,out) suint16a(in, size[0]*size[1], out) +#define s2uint16u162(in,size,out) suint16a(in, size[0]*size[1], out) -#define d2uint16u82(in,size,out) duint16a(in, size[0]*size[1], out) +#define d2uint16u162(in,size,out) duint16a(in, size[0]*size[1], out) #endif /* !__INT_UINT8_H__ */ diff --git a/src/c/operations/division/i16ldivs.c b/src/c/operations/division/i16ldivs.c new file mode 100644 index 00000000..b470b16a --- /dev/null +++ b/src/c/operations/division/i16ldivs.c @@ -0,0 +1,19 @@ +/* + * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab + * Copyright (C) 2008-2008 - INRIA - Arnaud TORSET + * + * This file must be used under the terms of the CeCILL. + * This source file is licensed as described in the file COPYING, which + * you should have received as part of this distribution. The terms + * are also available at + * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + * + */ + + +#include "division.h" + + +int16 i16ldivs (int16 in1, int16 in2){ + return in2/in1; +} diff --git a/src/c/operations/division/i16rdivs.c b/src/c/operations/division/i16rdivs.c new file mode 100644 index 00000000..e4d54823 --- /dev/null +++ b/src/c/operations/division/i16rdivs.c @@ -0,0 +1,19 @@ +/* + * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab + * Copyright (C) 2008-2008 - INRIA - Arnaud TORSET + * + * This file must be used under the terms of the CeCILL. + * This source file is licensed as described in the file COPYING, which + * you should have received as part of this distribution. The terms + * are also available at + * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + * + */ + + +#include "division.h" + + +int16 i16rdivs (int16 in1, int16 in2){ + return in1/in2; +} diff --git a/src/c/operations/division/i8ldivs.c b/src/c/operations/division/i8ldivs.c new file mode 100644 index 00000000..6bf0d266 --- /dev/null +++ b/src/c/operations/division/i8ldivs.c @@ -0,0 +1,19 @@ +/* + * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab + * Copyright (C) 2008-2008 - INRIA - Arnaud TORSET + * + * This file must be used under the terms of the CeCILL. + * This source file is licensed as described in the file COPYING, which + * you should have received as part of this distribution. The terms + * are also available at + * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + * + */ + + +#include "division.h" + + +int8 i8ldivs (int8 in1, int8 in2){ + return in2/in1; +} diff --git a/src/c/operations/division/i8rdivs.c b/src/c/operations/division/i8rdivs.c new file mode 100644 index 00000000..db8062fa --- /dev/null +++ b/src/c/operations/division/i8rdivs.c @@ -0,0 +1,19 @@ +/* + * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab + * Copyright (C) 2008-2008 - INRIA - Arnaud TORSET + * + * This file must be used under the terms of the CeCILL. + * This source file is licensed as described in the file COPYING, which + * you should have received as part of this distribution. The terms + * are also available at + * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + * + */ + + +#include "division.h" + + +int8 i8rdivs (int8 in1, int8 in2){ + return in1/in2; +} diff --git a/src/c/operations/division/u16ldivs.c b/src/c/operations/division/u16ldivs.c new file mode 100644 index 00000000..5383ebf4 --- /dev/null +++ b/src/c/operations/division/u16ldivs.c @@ -0,0 +1,19 @@ +/* + * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab + * Copyright (C) 2008-2008 - INRIA - Arnaud TORSET + * + * This file must be used under the terms of the CeCILL. + * This source file is licensed as described in the file COPYING, which + * you should have received as part of this distribution. The terms + * are also available at + * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + * + */ + + +#include "division.h" + + +uint16 u16ldivs (uint16 in1, uint16 in2){ + return in2/in1; +} diff --git a/src/c/operations/division/u16rdivs.c b/src/c/operations/division/u16rdivs.c new file mode 100644 index 00000000..68b998fd --- /dev/null +++ b/src/c/operations/division/u16rdivs.c @@ -0,0 +1,19 @@ +/* + * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab + * Copyright (C) 2008-2008 - INRIA - Arnaud TORSET + * + * This file must be used under the terms of the CeCILL. + * This source file is licensed as described in the file COPYING, which + * you should have received as part of this distribution. The terms + * are also available at + * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + * + */ + + +#include "division.h" + + +uint16 u16rdivs (uint16 in1, uint16 in2){ + return in1/in2; +} diff --git a/src/c/operations/division/u8ldivs.c b/src/c/operations/division/u8ldivs.c new file mode 100644 index 00000000..0694d5f0 --- /dev/null +++ b/src/c/operations/division/u8ldivs.c @@ -0,0 +1,19 @@ +/* + * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab + * Copyright (C) 2008-2008 - INRIA - Arnaud TORSET + * + * This file must be used under the terms of the CeCILL. + * This source file is licensed as described in the file COPYING, which + * you should have received as part of this distribution. The terms + * are also available at + * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + * + */ + + +#include "division.h" + + +uint8 u8ldivs (uint8 in1, uint8 in2){ + return in2/in1; +} diff --git a/src/c/operations/division/u8rdivs.c b/src/c/operations/division/u8rdivs.c new file mode 100644 index 00000000..e6364a86 --- /dev/null +++ b/src/c/operations/division/u8rdivs.c @@ -0,0 +1,19 @@ +/* + * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab + * Copyright (C) 2008-2008 - INRIA - Arnaud TORSET + * + * This file must be used under the terms of the CeCILL. + * This source file is licensed as described in the file COPYING, which + * you should have received as part of this distribution. The terms + * are also available at + * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + * + */ + + +#include "division.h" + + +uint8 u8rdivs (uint8 in1, uint8 in2){ + return in1/in2; +} diff --git a/src/c/operations/includes/division.h b/src/c/operations/includes/division.h index df4c5d2a..eedf4a3f 100644 --- a/src/c/operations/includes/division.h +++ b/src/c/operations/includes/division.h @@ -16,6 +16,7 @@ #include "dynlib_operations.h" #include "floatComplex.h" #include "doubleComplex.h" +#include "types.h" #ifdef __cplusplus extern "C" { @@ -101,6 +102,38 @@ EXTERN_OPERATIONS doubleComplex zrdivs (doubleComplex in1, doubleComplex in2); */ EXTERN_OPERATIONS void zrdiva(doubleComplex* in1, doubleComplex* in2, int size, doubleComplex* out ); +/* +** \brief Compute a right division for uint8. +** \param in1 : input uint8. +** \param in2 : input uint8. +** \return in1 / in2 = in1 ./ in2. +*/ +EXTERN_OPERATIONS uint8 u8rdivs (uint8 in1, uint8 in2); + +/* +** \brief Compute a right division for int8. +** \param in1 : input int8. +** \param in2 : input int8. +** \return in1 / in2 = in1 ./ in2. +*/ +EXTERN_OPERATIONS int8 i8rdivs (int8 in1, int8 in2); + +/* +** \brief Compute a right division for uint16. +** \param in1 : input uint16. +** \param in2 : input uint16. +** \return in1 / in2 = in1 ./ in2. +*/ +EXTERN_OPERATIONS uint16 u16rdivs (uint16 in1, uint16 in2); + +/* +** \brief Compute a right division for int16. +** \param in1 : input int16. +** \param in2 : input int16. +** \return in1 / in2 = in1 ./ in2. +*/ +EXTERN_OPERATIONS int16 i16rdivs (int16 in1, int16 in2); + /* ** LEFT DIVISION */ @@ -173,6 +206,40 @@ EXTERN_OPERATIONS doubleComplex zldivs (doubleComplex in1, doubleComplex in2); */ EXTERN_OPERATIONS void zldiva(doubleComplex* in1, doubleComplex* in2, int size, doubleComplex* out ); +/* +** \brief Compute a right division for uint8. +** \param in1 : input uint8. +** \param in2 : input uint8. +** \return in1 / in2 = in1 ./ in2. +*/ +EXTERN_OPERATIONS uint8 u8ldivs (uint8 in1, uint8 in2); + +/* +** \brief Compute a right division for int8. +** \param in1 : input int8. +** \param in2 : input int8. +** \return in1 / in2 = in1 ./ in2. +*/ +EXTERN_OPERATIONS int8 i8ldivs (int8 in1, int8 in2); + +/* +** \brief Compute a right division for uint16. +** \param in1 : input uint16. +** \param in2 : input uint16. +** \return in1 / in2 = in1 ./ in2. +*/ +EXTERN_OPERATIONS uint16 u16ldivs (uint16 in1, uint16 in2); + +/* +** \brief Compute a right division for int16. +** \param in1 : input int16. +** \param in2 : input int16. +** \return in1 / in2 = in1 ./ in2. +*/ +EXTERN_OPERATIONS int16 i16ldivs (int16 in1, int16 in2); + + + #ifdef __cplusplus } /* extern "C" */ #endif diff --git a/src/c/operations/includes/multiplication.h b/src/c/operations/includes/multiplication.h index 9931a9a9..8b08d6df 100644 --- a/src/c/operations/includes/multiplication.h +++ b/src/c/operations/includes/multiplication.h @@ -16,6 +16,7 @@ #include "dynlib_operations.h" #include "floatComplex.h" #include "doubleComplex.h" +#include "types.h" #ifdef __cplusplus extern "C" { @@ -140,6 +141,75 @@ EXTERN_OPERATIONS doubleComplex zmulzdv(doubleComplex *in1, double *in2, int siz EXTERN_OPERATIONS doubleComplex zmuldzv(double *in1, doubleComplex *in2, int size2); +/* +** \brief Compute a multiplication with uint8. +** \param in1 : input uint8. +** \param in2 : input uint8. +** \return : in1 * in 2 = in1 .* in2. +*/ +EXTERN_OPERATIONS uint8 u8muls(uint8 in1, uint8 in2); + +/* +** \brief Compute a multiplication for uint8 arrays. +** \param in1 : input array. +** \param in2 : input array. +** \param size : size of in2 array. +** \return : scalar that contains the multiplication of the two vectors = in1 .* in2. +*/ +EXTERN_OPERATIONS uint8 u8mulv(uint8 *in1, uint8 *in2, int size2); + +/* +** \brief Compute a multiplication with int8. +** \param in1 : input int8. +** \param in2 : input int8. +** \return : in1 * in 2 = in1 .* in2. +*/ +EXTERN_OPERATIONS int8 i8muls(int8 in1, int8 in2); + +/* +** \brief Compute a multiplication for int8 arrays. +** \param in1 : input array. +** \param in2 : input array. +** \param size : size of in2 array. +** \return : scalar that contains the multiplication of the two vectors = in1 .* in2. +*/ +EXTERN_OPERATIONS int8 i8mulv(int8 *in1, int8 *in2, int size2); + +/* +** \brief Compute a multiplication with uint16. +** \param in1 : input uint16. +** \param in2 : input uint16. +** \return : in1 * in 2 = in1 .* in2. +*/ +EXTERN_OPERATIONS uint16 u16muls(uint16 in1, uint16 in2); + +/* +** \brief Compute a multiplication for uint16 arrays. +** \param in1 : input array. +** \param in2 : input array. +** \param size : size of in2 array. +** \return : scalar that contains the multiplication of the two vectors = in1 .* in2. +*/ +EXTERN_OPERATIONS uint16 u16mulv(uint16 *in1, uint16 *in2, int size2); + +/* +** \brief Compute a multiplication with int16. +** \param in1 : input int16. +** \param in2 : input int16. +** \return : in1 * in 2 = in1 .* in2. +*/ +EXTERN_OPERATIONS int16 i16muls(int16 in1, int16 in2); + +/* +** \brief Compute a multiplication for int16 arrays. +** \param in1 : input array. +** \param in2 : input array. +** \param size : size of in2 array. +** \return : scalar that contains the multiplication of the two vectors = in1 .* in2. +*/ +EXTERN_OPERATIONS int16 i16mulv(int16 *in1, int16 *in2, int size2); + + #ifdef __cplusplus } /* extern "C" */ #endif diff --git a/src/c/operations/interfaces/int_OpMinus.h b/src/c/operations/interfaces/int_OpMinus.h index b96328ed..2ea8a521 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 "-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 fd8dda28..635fe2bf 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