X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Flib.c;h=472351cb164bb7f75caeec92de019be2619cce62;hb=d48818efad07523eba505813b60a82d13b35499a;hp=5f277b8b7365fbda5fa4f8927b33c000f0f376f8;hpb=22621d0f86a4b3ca5038e470f105d941fbbd7c62;p=tpg%2Facess2.git

diff --git a/Kernel/lib.c b/Kernel/lib.c
index 5f277b8b..472351cb 100644
--- a/Kernel/lib.c
+++ b/Kernel/lib.c
@@ -62,6 +62,8 @@ EXPORT(ByteSum);
 EXPORT(strlen);
 EXPORT(strcpy);
 EXPORT(strncpy);
+EXPORT(strcat);
+EXPORT(strncat);
 EXPORT(strcmp);
 EXPORT(strncmp);
 //EXPORT(strdup);
@@ -77,6 +79,9 @@ EXPORT(CheckMem);
 EXPORT(ModUtil_LookupString);
 EXPORT(ModUtil_SetIdent);
 EXPORT(UnHex);
+EXPORT(SwapEndian16);
+EXPORT(SwapEndian32);
+EXPORT(memmove);
 
 // === CODE ===
 /**
@@ -155,6 +160,7 @@ void itoa(char *buf, Uint64 num, int base, int minLength, char pad)
 {
 	char	tmpBuf[64+1];
 	 int	pos=0, i;
+	Uint64	rem;
 
 	// Sanity check
 	if(!buf)	return;
@@ -167,11 +173,11 @@ void itoa(char *buf, Uint64 num, int base, int minLength, char pad)
 	
 	// Convert 
 	while(num > base-1) {
-		tmpBuf[pos] = cUCDIGITS[ num % base ];
-		num /= (Uint)base;		// Shift `num` right 1 digit
+		num = DivMod64U(num, base, &rem);	// Shift `num` and get remainder
+		tmpBuf[pos] = cUCDIGITS[ rem ];
 		pos++;
 	}
-	tmpBuf[pos++] = cUCDIGITS[ num % base ];		// Last digit of `num`
+	tmpBuf[pos++] = cUCDIGITS[ num ];		// Last digit of `num`
 	
 	// Put in reverse
 	i = 0;
@@ -260,7 +266,7 @@ int vsnprintf(char *__s, size_t __maxlen, const char *__format, va_list args)
 			}
 		}
 		else
-			minSize = 1;
+			minSize = 0;
 		
 		// - Precision
 		precision = -1;
@@ -311,22 +317,29 @@ int vsnprintf(char *__s, size_t __maxlen, const char *__format, va_list args)
 			}
 			itoa(tmpBuf, val, 10, minSize, pad);
 			goto printString;
-		case 'u':
+		case 'u':	// Unsigned
 			GETVAL();
 			itoa(tmpBuf, val, 10, minSize, pad);
 			goto printString;
-		case 'X':
+		case 'P':	// Physical Address
+			PUTCH('0');
+			PUTCH('x');
+			if(sizeof(tPAddr) > 4)	isLongLong = 1;
+			GETVAL();
+			itoa(tmpBuf, val, 16, minSize, pad);
+			goto printString;
+		case 'X':	// Hex
 			if(BITS == 64)
 				isLongLong = 1;	// TODO: Handle non-x86 64-bit archs
 			GETVAL();
 			itoa(tmpBuf, val, 16, minSize, pad);
 			goto printString;
 			
-		case 'x':
+		case 'x':	// Lower case hex
 			GETVAL();
 			itoa(tmpBuf, val, 16, minSize, pad);
 			goto printString;
-		case 'o':
+		case 'o':	// Octal
 			GETVAL();
 			itoa(tmpBuf, val, 8, minSize, pad);
 			goto printString;
@@ -344,7 +357,7 @@ int vsnprintf(char *__s, size_t __maxlen, const char *__format, va_list args)
 		// String - Null Terminated Array
 		case 's':
 			p = va_arg(args, char*);	// Get Argument
-			if( !CheckString(p) )	p = "(inval)";	// Avoid #PFs  
+			if( !p || !CheckString(p) )	p = "(inval)";	// Avoid #PFs  
 		printString:
 			if(!p)		p = "(null)";
 			len = strlen(p);
@@ -462,7 +475,6 @@ size_t strlen(const char *__str)
 }
 
 /**
- * \fn char *strcpy(char *__str1, const char *__str2)
  * \brief Copy a string to a new location
  */
 char *strcpy(char *__str1, const char *__str2)
@@ -474,8 +486,8 @@ char *strcpy(char *__str1, const char *__str2)
 }
 
 /**
- * \fn char *strncpy(char *__str1, const char *__str2, size_t max)
  * \brief Copy a string to a new location
+ * \note Copies at most `max` chars
  */
 char *strncpy(char *__str1, const char *__str2, size_t max)
 {
@@ -486,6 +498,32 @@ char *strncpy(char *__str1, const char *__str2, size_t max)
 	return __str1;
 }
 
+/**
+ * \brief Append a string to another
+ */
+char *strcat(char *__dest, const char *__src)
+{
+	while(*__dest++);
+	__dest--;
+	while(*__src)
+		*__dest++ = *__src++;
+	*__dest = '\0';
+	return __dest;
+}
+
+/**
+ * \brief Append at most \a n chars to a string from another
+ * \note At most n+1 chars are written (the dest is always zero terminated)
+ */
+char *strncat(char *__dest, const char *__src, size_t n)
+{
+	while(*__dest++);
+	while(*__src && n-- >= 1)
+		*__dest++ = *__src++;
+	*__dest = '\0';
+	return __dest;
+}
+
 /**
  * \fn int strcmp(const char *str1, const char *str2)
  * \brief Compare two strings return the difference between
@@ -872,7 +910,7 @@ int ModUtil_SetIdent(char *Dest, const char *Value)
 /**
  * \brief Convert a string of hexadecimal digits into a byte stream
  */
-int	UnHex(Uint8 *Dest, size_t DestSize, const char *SourceString)
+int UnHex(Uint8 *Dest, size_t DestSize, const char *SourceString)
 {
 	 int	i;
 	
@@ -902,3 +940,44 @@ int	UnHex(Uint8 *Dest, size_t DestSize, const char *SourceString)
 	}
 	return i/2;
 }
+
+Uint16 SwapEndian16(Uint16 Val)
+{
+	return ((Val&0xFF)<<8) | ((Val>>8)&0xFF);
+}
+Uint32 SwapEndian32(Uint32 Val)
+{
+	return ((Val&0xFF)<<24) | ((Val&0xFF00)<<8) | ((Val>>8)&0xFF00) | ((Val>>24)&0xFF);
+}
+
+void *memmove(void *__dest, const void *__src, size_t len)
+{
+	size_t	block_size;
+	char	*dest = __dest;
+	const char	*src = __src;
+	void	*ret = __dest;
+	
+	if( (tVAddr)dest > (tVAddr)src + len )
+		return memcpy(dest, src, len);
+	if( (tVAddr)dest + len < (tVAddr)src )
+		return memcpy(dest, src, len);
+	
+	if( (tVAddr)dest < (tVAddr)src )
+		block_size = (tVAddr)src - (tVAddr)dest;
+	else
+		block_size = (tVAddr)dest - (tVAddr)src;
+	
+	block_size &= ~0xF;
+	
+	while(len >= block_size)
+	{
+		memcpy(dest, src, block_size);
+		len -= block_size;
+		dest += block_size;
+		src += block_size;
+	}
+	memcpy(dest, src, len);
+	return ret;
+	
+}
+