Kill system memmove, ix86 asm and kvi_memmove stuff: modern gcc coupled to glibc can do better these times.

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5235 17fca916-40b9-46aa-a4ea-0a15b648b75c

14 files changed, 41 insertions, 41 deletions

diff --git a/src/modules/dcc/canvas.cpp b/src/modules/dcc/canvas.cpp
index 01bbf8e3b..4beb89436 100644
--- a/src/modules/dcc/canvas.cpp
+++ b/src/modules/dcc/canvas.cpp
@@ -45,7 +45,7 @@
 	#include "kvi_console.h"
 	#include "kvi_frame.h"
 	#include "KviMemory.h"
-	#include "kvi_memmove.h"
+	#include "KviMemory.h"
 	#include "KviThread.h"
 	#include "kvi_ircsocket.h"
 	#include "kvi_settings.h"
diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/chat.cpp
index 6ac90a686..f34a45579 100644
--- a/src/modules/dcc/chat.cpp
+++ b/src/modules/dcc/chat.cpp
@@ -43,7 +43,7 @@
 #include "kvi_console.h"
 #include "kvi_frame.h"
 #include "KviMemory.h"
-#include "kvi_memmove.h"
+#include "KviMemory.h"
 #include "KviThread.h"
 #include "kvi_ircsocket.h"
 #include "kvi_settings.h"
@@ -751,7 +751,7 @@ bool KviDccChatThread::handleIncomingData(KviDccThreadIncomingData * data,bool b
 			{
 				// memmove the remaining part to the beginning
 				// aux points after \n or \0
-				kvi_memmove(data->buffer,aux,data->iLen);
+				KviMemory::move(data->buffer,aux,data->iLen);
 				data->buffer = (char *)KviMemory::reallocate(data->buffer,data->iLen);
 				end = data->buffer + data->iLen;
 				aux = data->buffer;
diff --git a/src/modules/dcc/marshal.cpp b/src/modules/dcc/marshal.cpp
index 8464c94a7..843eb1d83 100644
--- a/src/modules/dcc/marshal.cpp
+++ b/src/modules/dcc/marshal.cpp
@@ -29,7 +29,7 @@
 #include "kvi_error.h"
 #include "kvi_options.h"
 #include "KviLocale.h"
-#include "kvi_memmove.h"
+#include "KviMemory.h"
 #include "kvi_socket.h"
 #include "KviFileUtils.h"
 
diff --git a/src/modules/dcc/send.cpp b/src/modules/dcc/send.cpp
index bbad7d198..9aa155b74 100644
--- a/src/modules/dcc/send.cpp
+++ b/src/modules/dcc/send.cpp
@@ -42,7 +42,7 @@
 #include "kvi_console.h"
 #include "kvi_frame.h"
 #include "KviMemory.h"
-#include "kvi_memmove.h"
+#include "KviMemory.h"
 #include "KviThread.h"
 #include "kvi_ircsocket.h"
 #include "KviMediaType.h"
diff --git a/src/modules/dcc/thread.cpp b/src/modules/dcc/thread.cpp
index 09f0b49dc..61cb2f1eb 100644
--- a/src/modules/dcc/thread.cpp
+++ b/src/modules/dcc/thread.cpp
@@ -27,7 +27,7 @@
 #include "kvi_debug.h"
 #include "kvi_window.h"
 #include "kvi_error.h"
-#include "kvi_memmove.h"
+#include "KviMemory.h"
 #include "KviMemory.h"
 #include "KviNetUtils.h"
 #include "kvi_socket.h"
diff --git a/src/modules/dcc/video.cpp b/src/modules/dcc/video.cpp
index 896d7b98b..d7cb7e65b 100644
--- a/src/modules/dcc/video.cpp
+++ b/src/modules/dcc/video.cpp
@@ -266,7 +266,7 @@ bool KviDccVideoThread::handleIncomingData(KviDccThreadIncomingData * data,bool
 			{
 				// memmove the remaining part to the beginning
 				// aux points after \n or \0
-				kvi_memmove(data->buffer,aux,data->iLen);
+				KviMemory::move(data->buffer,aux,data->iLen);
 				data->buffer = (char *)KviMemory::reallocate(data->buffer,data->iLen);
 				end = data->buffer + data->iLen;
 				aux = data->buffer;
diff --git a/src/modules/lamerizer/libkvilamerizer.cpp b/src/modules/lamerizer/libkvilamerizer.cpp
index 3b40d625a..53ad9bda2 100644
--- a/src/modules/lamerizer/libkvilamerizer.cpp
+++ b/src/modules/lamerizer/libkvilamerizer.cpp
@@ -47,7 +47,7 @@
 
 #ifdef COMPILE_CRYPT_SUPPORT
 	
-	#include "kvi_memmove.h"
+	#include "KviMemory.h"
 	#include "KviMemory.h"
 
 	#include "KviPointerList.h"
diff --git a/src/modules/objects/class_socket.cpp b/src/modules/objects/class_socket.cpp
index a22082902..6ef5cf3ea 100644
--- a/src/modules/objects/class_socket.cpp
+++ b/src/modules/objects/class_socket.cpp
@@ -41,7 +41,7 @@
 #include "kvi_error.h"
 #include "kvi_socket.h"
 #include "KviMemory.h"
-#include "kvi_memmove.h"
+#include "KviMemory.h"
 #include "KviDataBuffer.h"
 
 #include <QByteArray>
@@ -417,7 +417,7 @@ KVSO_CLASS_FUNCTION(socket,read)
 			QByteArray *pBuffer=((KviKvsObject_memorybuffer *)pObject)->pBuffer();
 			int oldsize=pBuffer->size();
 			pBuffer->resize(oldsize+uLen);
-			kvi_memmove(pBuffer->data()+oldsize,m_pInBuffer,uLen);
+			KviMemory::move(pBuffer->data()+oldsize,m_pInBuffer,uLen);
 
 		} else if(pObject->inheritsClass("file"))
 		{
@@ -1171,7 +1171,7 @@ void KviKvsObject_socket::eatInData(unsigned int uLen)
 
 	if(m_uInDataLen > 0)
 	{
-		kvi_memmove(m_pInBuffer,m_pInBuffer + uLen,m_uInDataLen);
+		KviMemory::move(m_pInBuffer,m_pInBuffer + uLen,m_uInDataLen);
 	}
 
 	unsigned int uSpace = m_uInBufferLen - m_uInDataLen;
diff --git a/src/modules/rijndael/ablowfish.cpp b/src/modules/rijndael/ablowfish.cpp
index 91820baf3..1c829f3b0 100644
--- a/src/modules/rijndael/ablowfish.cpp
+++ b/src/modules/rijndael/ablowfish.cpp
@@ -23,7 +23,7 @@
 //=============================================================================
 
 #include "ablowfish.h"
-#include "kvi_memmove.h"
+#include "KviMemory.h"
 
 #ifdef COMPILE_CRYPT_SUPPORT
 
@@ -318,11 +318,11 @@ BlowFish::BlowFish(unsigned char* ucKey, unsigned int keysize, const SBlock& roC
 		keysize = 56;
 	unsigned char aucLocalKey[56];
 	unsigned int i, j;
-	kvi_fastmove(aucLocalKey, ucKey, keysize);
+	KviMemory::copy(aucLocalKey, ucKey, keysize);
 	//Reflexive Initialization of the Blowfish.
 	//Generating the Subkeys from the Key flood P and S boxes with PI
-	kvi_fastmove(m_auiP, scm_auiInitP, sizeof(m_auiP));
-	kvi_fastmove(m_auiS, scm_auiInitS, sizeof(m_auiS));
+	KviMemory::copy(m_auiP, scm_auiInitP, sizeof(m_auiP));
+	KviMemory::copy(m_auiS, scm_auiInitS, sizeof(m_auiS));
 	//Load P boxes with key bytes
 	const unsigned char* p = aucLocalKey;
 	unsigned int x=0;
diff --git a/src/modules/rijndael/libkvirijndael.cpp b/src/modules/rijndael/libkvirijndael.cpp
index 3a9013c2d..14fa267a2 100644
--- a/src/modules/rijndael/libkvirijndael.cpp
+++ b/src/modules/rijndael/libkvirijndael.cpp
@@ -62,7 +62,7 @@
 
 
 #if defined(COMPILE_CRYPT_SUPPORT) || defined(Q_MOC_RUN)
-	#include "kvi_memmove.h"
+	#include "KviMemory.h"
 	#include "KviMemory.h"
 	#include "KviPointerList.h"
 
@@ -123,12 +123,12 @@
 		char * decryptKey = (char *)KviMemory::allocate(defLen);
 
 		if(encKeyLen > defLen)encKeyLen = defLen;
-		kvi_memmove(encryptKey,encKey,encKeyLen);
-		if(encKeyLen < defLen)kvi_memset(encryptKey + encKeyLen,'0',defLen - encKeyLen);
+		KviMemory::move(encryptKey,encKey,encKeyLen);
+		if(encKeyLen < defLen)KviMemory::set(encryptKey + encKeyLen,'0',defLen - encKeyLen);
 
 		if(decKeyLen > defLen)decKeyLen = defLen;
-		kvi_memmove(decryptKey,decKey,decKeyLen);
-		if(decKeyLen < defLen)kvi_memset(decryptKey + decKeyLen,'0',defLen - decKeyLen);
+		KviMemory::move(decryptKey,decKey,decKeyLen);
+		if(decKeyLen < defLen)KviMemory::set(decryptKey + decKeyLen,'0',defLen - decKeyLen);
 
 		m_pEncryptCipher = new Rijndael();
 		int retVal = m_pEncryptCipher->init(Rijndael::CBC,Rijndael::Encrypt,(unsigned char *)encryptKey,getKeyLenId());
@@ -277,7 +277,7 @@
 			if(len > 0)
 			{
 				*outBuffer = (char *)KviMemory::allocate(*len);
-				kvi_memmove(*outBuffer,tmpBuf,*len);
+				KviMemory::move(*outBuffer,tmpBuf,*len);
 				KviCString::freeBuffer(tmpBuf);
 			}
 		}
@@ -303,7 +303,7 @@
 			if(len > 0)
 			{
 				*outBuffer = (char *)KviMemory::allocate(*len);
-				kvi_memmove(*outBuffer,tmpBuf,*len);
+				KviMemory::move(*outBuffer,tmpBuf,*len);
 				KviCString::freeBuffer(tmpBuf);
 			}
 		}
@@ -633,7 +633,7 @@
 
 		for(int i=0;i<8;i++)in[i] = (unsigned char)(rand() % 256);
 
-		kvi_fastmove(in+8,plain.ptr(),plain.len());
+		KviMemory::copy(in+8,plain.ptr(),plain.len());
 
 		// encrypt
 		unsigned char * out = (unsigned char *)KviMemory::allocate(ll);
diff --git a/src/modules/rijndael/rijndael.cpp b/src/modules/rijndael/rijndael.cpp
index 9546f4cfa..def26034f 100644
--- a/src/modules/rijndael/rijndael.cpp
+++ b/src/modules/rijndael/rijndael.cpp
@@ -59,7 +59,7 @@
 
 #include "rijndael.h"
 
-#include "kvi_memmove.h"
+#include "KviMemory.h"
 
 //#include <stdio.h>
 //#include <stdlib.h>
@@ -1103,7 +1103,7 @@ int Rijndael::blockEncrypt(const UINT8 *input,int inputLen,UINT8 *outBuffer)
 		break;
 		case CFB1:
 #if STRICT_ALIGN
-			kvi_memmove(iv,m_initVector,16);
+			KviMemory::move(iv,m_initVector,16);
 #else  /* !STRICT_ALIGN */
 			*((UINT32*)iv[0]) = *((UINT32*)(m_initVector   ));
 			*((UINT32*)iv[1]) = *((UINT32*)(m_initVector + 4));
@@ -1170,8 +1170,8 @@ int Rijndael::padEncrypt(const UINT8 *input, int inputOctets, UINT8 *outBuffer)
 			}
 			padLen = 16 - (inputOctets - 16*numBlocks);
 //			assert(padLen > 0 && padLen <= 16);
-			kvi_memmove(block, input, 16 - padLen);
-			kvi_memset(block + 16 - padLen, padLen, padLen);
+			KviMemory::move(block, input, 16 - padLen);
+			KviMemory::set(block + 16 - padLen, padLen, padLen);
 			encrypt(block,outBuffer);
 		break;
 		case CBC:
@@ -1229,7 +1229,7 @@ int Rijndael::blockDecrypt(const UINT8 *input, int inputLen, UINT8 *outBuffer)
 		break;
 		case CBC:
 #if STRICT_ALIGN
-			kvi_memmove(iv,m_initVector,16);
+			KviMemory::move(iv,m_initVector,16);
 #else
 			*((UINT32*)iv[0]) = *((UINT32*)(m_initVector  ));
 			*((UINT32*)iv[1]) = *((UINT32*)(m_initVector+ 4));
@@ -1244,8 +1244,8 @@ int Rijndael::blockDecrypt(const UINT8 *input, int inputLen, UINT8 *outBuffer)
 				((UINT32*)block)[2] ^= *((UINT32*)iv[2]);
 				((UINT32*)block)[3] ^= *((UINT32*)iv[3]);
 #if STRICT_ALIGN
-				kvi_memmove(iv, input, 16);
-				kvi_memmove(outBuf, block, 16);
+				KviMemory::move(iv, input, 16);
+				KviMemory::move(outBuf, block, 16);
 #else
 				*((UINT32*)iv[0]) = ((UINT32*)input)[0]; ((UINT32*)outBuffer)[0] = ((UINT32*)block)[0];
 				*((UINT32*)iv[1]) = ((UINT32*)input)[1]; ((UINT32*)outBuffer)[1] = ((UINT32*)block)[1];
@@ -1258,7 +1258,7 @@ int Rijndael::blockDecrypt(const UINT8 *input, int inputLen, UINT8 *outBuffer)
 			break;
 		case CFB1:
 #if STRICT_ALIGN
-			kvi_memmove(iv, m_initVector, 16);
+			KviMemory::move(iv, m_initVector, 16);
 #else
 			*((UINT32*)iv[0]) = *((UINT32*)(m_initVector));
 			*((UINT32*)iv[1]) = *((UINT32*)(m_initVector+ 4));
@@ -1333,10 +1333,10 @@ int Rijndael::padDecrypt(const UINT8 *input, int inputOctets, UINT8 *outBuffer)
 			{
 				if(block[i] != padLen)return RIJNDAEL_CORRUPTED_DATA;
 			}
-			kvi_memmove(outBuffer, block, 16 - padLen);
+			KviMemory::move(outBuffer, block, 16 - padLen);
 		break;
 		case CBC:
-			kvi_memmove(iv, m_initVector, 16);
+			KviMemory::move(iv, m_initVector, 16);
 			/* all blocks but last */
 			for (i = numBlocks - 1; i > 0; i--)
 			{
@@ -1345,8 +1345,8 @@ int Rijndael::padDecrypt(const UINT8 *input, int inputOctets, UINT8 *outBuffer)
 				((UINT32*)block)[1] ^= iv[1];
 				((UINT32*)block)[2] ^= iv[2];
 				((UINT32*)block)[3] ^= iv[3];
-				kvi_memmove(iv, input, 16);
-				kvi_memmove(outBuffer, block, 16);
+				KviMemory::move(iv, input, 16);
+				KviMemory::move(outBuffer, block, 16);
 				input += 16;
 				outBuffer += 16;
 			}
@@ -1362,7 +1362,7 @@ int Rijndael::padDecrypt(const UINT8 *input, int inputOctets, UINT8 *outBuffer)
 			{
 				if(block[i] != padLen)return RIJNDAEL_CORRUPTED_DATA;
 			}
-			kvi_memmove(outBuffer, block, 16 - padLen);
+			KviMemory::move(outBuffer, block, 16 - padLen);
 			break;
 
 		default:
diff --git a/src/modules/rot13/libkvirot13.cpp b/src/modules/rot13/libkvirot13.cpp
index 556ef957d..6929223eb 100644
--- a/src/modules/rot13/libkvirot13.cpp
+++ b/src/modules/rot13/libkvirot13.cpp
@@ -47,7 +47,7 @@
 
 #ifdef COMPILE_CRYPT_SUPPORT
 
-	#include "kvi_memmove.h"
+	#include "KviMemory.h"
 	#include "KviMemory.h"
 
 	#include "KviPointerList.h"
diff --git a/src/modules/trayicon/libkvitrayicon.cpp b/src/modules/trayicon/libkvitrayicon.cpp
index c11d6bda8..aa2e68b5c 100644
--- a/src/modules/trayicon/libkvitrayicon.cpp
+++ b/src/modules/trayicon/libkvitrayicon.cpp
@@ -30,7 +30,7 @@
 #include "kvi_app.h"
 #include "kvi_module.h"
 #include "KviLocale.h"
-#include "kvi_memmove.h"
+#include "KviMemory.h"
 #include "kvi_windowlist.h"
 #include "kvi_window.h"
 #include "kvi_dynamictooltip.h"
diff --git a/src/modules/window/libkviwindow.cpp b/src/modules/window/libkviwindow.cpp
index 0a585fb01..5b7bf103c 100644
--- a/src/modules/window/libkviwindow.cpp
+++ b/src/modules/window/libkviwindow.cpp
@@ -36,7 +36,7 @@
 #include "kvi_input.h"
 #include "kvi_iconmanager.h"
 #include "kvi_modulemanager.h"
-#include "kvi_memmove.h"
+#include "KviMemory.h"
 #include "KviMemory.h"
 #include "kvi_mdichild.h"
 #include "kvi_channel.h"
@@ -1494,7 +1494,7 @@ static bool initializeCryptEngine(KviCryptEngine * eng,KviCString &szEncryptKey,
 	if(encKeyLen > 0)
 	{
 		encKey = (char *)KviMemory::allocate(encKeyLen);
-		kvi_memmove(encKey,tmpKey,encKeyLen);
+		KviMemory::move(encKey,tmpKey,encKeyLen);
 		KviCString::freeBuffer(tmpKey);
 	} else {
 		szError = __tr2qs("The encrypt key wasn't a valid hexadecimal string");
@@ -1508,7 +1508,7 @@ static bool initializeCryptEngine(KviCryptEngine * eng,KviCString &szEncryptKey,
 	if(decKeyLen > 0)
 	{
 		decKey = (char *)KviMemory::allocate(decKeyLen);
-		kvi_memmove(decKey,tmpKey,decKeyLen);
+		KviMemory::move(decKey,tmpKey,decKeyLen);
 		KviCString::freeBuffer(tmpKey);
 	} else {
 		szError = __tr2qs("The decrypt key wasn't a valid hexadecimal string");