Added stpcpy and memccpy calc84maniac

Author: ZERICO2005

src/libc/include/string.h

@@ -5,72 +5,92 @@
 
 __BEGIN_DECLS
 
-extern void *memcpy(void *__restrict dest, const void *__restrict src,
-                    size_t n) __attribute__((nonnull(1, 2)));
+extern void *memcpy(void *__restrict dest, const void *__restrict src, size_t n)
+    __attribute__((nonnull(1, 2)));
 
 void *memmove(void *dest, const void *src, size_t n)
-              __attribute__((nonnull(1, 2)));
+    __attribute__((nonnull(1, 2)));
 
-void *memset(void *s, int c, size_t n) __attribute__((nonnull(1)));
+void *memset(void *s, int c, size_t n)
+    __attribute__((nonnull(1)));
 
 int memcmp(const void *s1, const void *s2, size_t n)
-           __attribute__((nonnull(1, 2)));
+    __attribute__((nonnull(1, 2)));
 
-void *memchr(const void *s, int c, size_t n) __attribute__((nonnull(1)));
+void *memchr(const void *s, int c, size_t n)
+    __attribute__((nonnull(1)));
+
+void* memccpy(void *__restrict dest, const void *__restrict src, int c, size_t n) __NOEXCEPT
+    __attribute__((nonnull(1, 2)));
 
 char *strcpy(char *__restrict dest, const char *__restrict src)
-             __attribute__((nonnull(1, 2)));
+    __attribute__((nonnull(1, 2)));
 
 char *strncpy(char *__restrict dest, const char *__restrict src, size_t n)
-              __attribute__((nonnull(1, 2)));
+    __attribute__((nonnull(1, 2)));
+
+char *stpcpy(char *__restrict dest, const char *__restrict src) __NOEXCEPT
+    __attribute__((nonnull(1, 2)));
+
+char *stpncpy(char *__restrict dest, const char *__restrict src, size_t n) __NOEXCEPT
+    __attribute__((nonnull(1, 2)));
+
+char *strlcpy(char *__restrict dest, const char *__restrict src, size_t n) __NOEXCEPT
+    __attribute__((nonnull(1, 2)));
 
 char *strcat(char *__restrict dest, const char *__restrict src)
-             __attribute__((nonnull(1, 2)));
+    __attribute__((nonnull(1, 2)));
 
 char *strncat(char *__restrict dest, const char *__restrict src, size_t n)
-              __attribute__((nonnull(1, 2)));
+    __attribute__((nonnull(1, 2)));
+
+char *strlcat(char *__restrict dest, const char *__restrict src, size_t n) __NOEXCEPT
+    __attribute__((nonnull(1, 2)));
 
-char *strchr(const char *s, int c) __attribute__((nonnull(1)));
+char *strchr(const char *s, int c)
+    __attribute__((nonnull(1)));
 
-char *strrchr(const char *s, int c) __attribute__((nonnull(1)));
+char *strrchr(const char *s, int c)
+    __attribute__((nonnull(1)));
 
-char *strpbrk(const char *s, const char *accept) __attribute__((nonnull(1, 2)));
+char *strpbrk(const char *s, const char *accept)
+    __attribute__((nonnull(1, 2)));
 
 char *strstr(const char *haystack, const char *needle)
-             __attribute__((nonnull(1, 2)));
+    __attribute__((nonnull(1, 2)));
 
 char *strtok(char *__restrict s, const char *__restrict delim)
-             __attribute__((nonnull(2)));
+    __attribute__((nonnull(2)));
 
 char *strdup(const char *s)
-             __attribute__ ((__malloc__)) __attribute__((nonnull(1)));
+    __attribute__((__malloc__)) __attribute__((nonnull(1)));
 
 char *strndup(const char *s, size_t n)
-              __attribute__ ((__malloc__)) __attribute__((nonnull(1)));
+    __attribute__((__malloc__)) __attribute__((nonnull(1)));
 
 size_t strcspn(const char *s, const char *reject)
-               __attribute__((nonnull(1, 2)));
+    __attribute__((nonnull(1, 2)));
 
 size_t strspn(const char *s, const char *accept)
-              __attribute__((nonnull(1, 2)));
+    __attribute__((nonnull(1, 2)));
 
 size_t strlen(const char *s)
-              __attribute__((nonnull(1)));
+    __attribute__((nonnull(1)));
 
 size_t strnlen(const char *s, size_t maxlen)
-               __attribute__((nonnull(1)));
+    __attribute__((nonnull(1)));
 
 int strcmp(const char *s1, const char *s2)
-           __attribute__((nonnull(1, 2)));
+    __attribute__((nonnull(1, 2)));
 
 int strncmp(const char *s1, const char *s2, size_t n)
-            __attribute__((nonnull(1, 2)));
+    __attribute__((nonnull(1, 2)));
 
-int strcasecmp(const char *s1, const char *s2)
-               __attribute__((nonnull(1, 2)));
+int strcasecmp(const char *s1, const char *s2) __NOEXCEPT
+    __attribute__((nonnull(1, 2))) __attribute__((__pure__));
 
-int strncasecmp(const char *s1, const char *s2, size_t n)
-                __attribute__((nonnull(1, 2)));
+int strncasecmp(const char *s1, const char *s2, size_t n) __NOEXCEPT
+    __attribute__((nonnull(1, 2))) __attribute__((__pure__));
 
 char* strerror(int errnum);
 

src/libc/memccpy.src

@@ -0,0 +1,30 @@
+	assume	adl=1
+
+	section	.text
+
+	public	_memccpy
+
+_memccpy:
+	ld	iy, 0
+	add	iy, sp
+	ld	bc, (iy + 12)
+	sbc	hl, hl
+	adc	hl, bc
+	ret	z
+	ld	de, (iy + 6)
+	push	de
+	sbc	hl, hl
+	sbc	hl, de
+	ex	de, hl
+	ld	a, (iy + 9)
+	cpir
+	add	hl, de
+	ex	(sp), hl
+	pop	bc
+	ld	de, (iy + 3)
+	ldir
+	ex	de, hl
+	ret	z
+	or	a, a
+	sbc	hl, hl
+	ret

src/libc/stpcpy.src

@@ -0,0 +1,24 @@
+	assume	adl=1
+
+	section	.text
+
+	public	_stpcpy
+
+_stpcpy:
+	pop	bc
+	pop	de
+	ex	(sp), hl
+	push	de
+	push	bc
+	xor	a, a
+	ld	bc, 0
+	push	hl
+	cpir
+	sbc	hl, hl
+	sbc	hl, bc
+	ex	(sp), hl
+	pop	bc
+	ldir
+	ex	de, hl
+	dec	hl
+	ret

src/libcxx/include/cstring

@@ -14,10 +14,15 @@ using ::memmove;
 using ::memset;
 using ::memcmp;
 using ::memchr;
+using ::memccpy;
 using ::strcpy;
 using ::strncpy;
+using ::stpcpy;
+using ::stpncpy;
+using ::strlcpy;
 using ::strcat;
 using ::strncat;
+using ::strlcat;
 using ::strchr;
 using ::strrchr;
 using ::strpbrk;