added memmem

Author: ZERICO2005

src/libc/memmem.src

@@ -0,0 +1,77 @@
+	assume	adl=1
+
+	section	.text
+
+	public	_memmem
+
+; void *memmem(const void *haystack, size_t haystack_len, const void *needle, size_t needle_len)
+haystack     := iy + 3
+haystack_len := iy + 6
+needle       := iy + 9
+needle_len   := iy + 12
+_memmem:
+	ld	iy, 0
+	add	iy, sp
+	ld	hl, (haystack_len)
+	ld	bc, (needle_len)
+	sbc	hl, bc
+	jr	c, .ret_null	; (haystack_len < needle_len)
+	; (haystack_len >= needle_len)
+
+	push	hl
+	scf
+	sbc	hl, hl
+	add	hl, bc
+	pop	bc
+	ld	hl, (haystack)
+	ret	nc		; return haystack if needle_len is zero
+	inc	bc
+	; BC = (haystack_len - needle_len + 1) = search_len
+	; haystack_len >= needle_len && needle_len != 0, therefore haystack_len >= 1
+	call	.begin_loop
+	jr	nz, .ret_null
+	; test for a match at the last possible position
+	dec	hl
+	push	hl
+	call	_memcmp_fast
+	pop	hl
+	ret	z
+.ret_null:
+	or	a, a
+	sbc	hl, hl
+	ret
+
+.loop:
+	pop	bc
+.begin_loop:
+	ld	de, (needle)
+	ld	a, (de)
+	cpir			; search for the start of the string
+	ret	po		; end of search_len
+	push	bc
+	push	hl
+	dec	hl
+	call	_memcmp_fast
+	pop	hl
+	jr	nz, .loop
+	; pop	bc
+	ld	sp, iy
+	dec	hl
+	ret
+
+_memcmp_fast:
+	; Input:
+	; HL = haystack
+	; DE = needle
+	; A = (DE)
+	; Output:
+	; Z = match
+	; NZ = no match
+	ld	bc, (needle_len)
+.loop:
+	cpi
+	ret	po
+	inc	de
+	ld	a, (de)
+	jr	z, .loop
+	ret

test/standalone/asprintf_fprintf/src/main.c

@@ -53,6 +53,9 @@ void *T_mempcpy(void *__restrict dest, const void *__restrict src, size_t n)
 void *T_memrchr(const void *s, int c, size_t n)
     __attribute__((nonnull(1)));
 
+void *T_memmem(const void *haystack, size_t haystack_len, const void *needle, size_t needle_len)
+    __attribute__((nonnull(1, 3)));
+
 char *T_stpcpy(char *__restrict dest, const char *__restrict src)
     __attribute__((nonnull(1, 2)));
 
@@ -82,6 +85,7 @@ void T_bzero(void* s, size_t n);
 #define T_memccpy memccpy
 #define T_mempcpy mempcpy
 #define T_memrchr memrchr
+#define T_memmem memmem
 #define T_stpcpy stpcpy
 #define T_stpncpy stpncpy
 #define T_strlcat strlcat
@@ -700,6 +704,80 @@ int stpncpy_test(void) {
     return 0;
 }
 
+int memmem_test(void) {
+    const char str1[] = "abcdef123\0aababc123";
+
+    /* Test NULL */
+
+    C(T_memmem(NULL_ptr, 0, NULL_ptr, 0) == NULL_ptr);
+    C(T_memmem(NULL_ptr, 0, SINK, 0) == NULL_ptr);
+    C(T_memmem(NULL_ptr, 0, SINK, 1) == NULL_ptr);
+    C(T_memmem(NULL_ptr, 0, SINK, 2) == NULL_ptr);
+    C(T_memmem(SINK, 0, NULL_ptr, 0) == SINK);
+    C(T_memmem(SINK, 1, NULL_ptr, 0) == SINK);
+    C(T_memmem(SINK, 2, NULL_ptr, 0) == SINK);
+
+    /* Test same */
+
+    C(T_memmem(SINK, 0, SINK, 0) == SINK);
+    C(T_memmem(SINK, 1, SINK, 0) == SINK);
+    C(T_memmem(SINK, 2, SINK, 0) == SINK);
+    C(T_memmem(SINK, 0, SINK, 1) == NULL);
+    C(T_memmem(SINK, 1, SINK, 1) == SINK);
+    C(T_memmem(SINK, 2, SINK, 1) == SINK);
+    C(T_memmem(SINK, 0, SINK, 2) == NULL);
+    C(T_memmem(SINK, 1, SINK, 2) == NULL);
+    C(T_memmem(SINK, 2, SINK, 2) == SINK);
+
+    C(T_memmem(SINK, 300, SINK, 300) == SINK);
+    C(T_memmem(SINK, 300, SINK, 301) == NULL);
+    C(T_memmem(SINK, 300, SINK, 299) == SINK);
+    C(T_memmem(SINK, 300, SINK, 30 ) == SINK);
+    C(T_memmem(SINK,  30, SINK, 300) == NULL);
+
+    C(T_memmem(SINK + 30, 60, SINK +  0, 60) == SINK + 30);
+    C(T_memmem(SINK +  0, 60, SINK + 30, 60) == SINK +  0);
+    C(T_memmem(SINK + 30, 60, SINK +  0, 59) == SINK + 30);
+    C(T_memmem(SINK +  0, 60, SINK + 30, 59) == SINK +  0);
+
+    C(T_memmem(str1, 20, str1,  0) == str1);
+    C(T_memmem(str1, 20, str1,  1) == str1);
+    C(T_memmem(str1, 20, str1,  2) == str1);
+    C(T_memmem(str1, 20, str1,  3) == str1);
+    C(T_memmem(str1, 20, str1,  9) == str1);
+    C(T_memmem(str1, 20, str1, 10) == str1);
+    C(T_memmem(str1, 20, str1, 20) == str1);
+
+    /* Test different */
+
+    C(T_memmem(str1, 0, SINK, 0) == str1);
+    C(T_memmem(str1, 1, SINK, 0) == str1);
+    C(T_memmem(str1, 2, SINK, 0) == str1);
+    C(T_memmem(str1, 0, SINK, 1) == NULL);
+    C(T_memmem(str1, 1, SINK, 1) == NULL);
+    C(T_memmem(str1, 2, SINK, 1) == NULL);
+    C(T_memmem(str1, 0, SINK, 2) == NULL);
+    C(T_memmem(str1, 1, SINK, 2) == NULL);
+    C(T_memmem(str1, 2, SINK, 2) == NULL);
+
+    /* Other tests */
+
+    C(T_memmem(str1 +  1, 19, "abc", 3) == str1 + 13);
+    C(T_memmem(str1 +  0, 20, "123", 4) == str1 +  6);
+    C(T_memmem(str1 +  7, 13, "123", 4) == str1 + 16);
+
+    C(T_memmem(str1 +  0, 20, "aabaab", 6) == NULL);
+    C(T_memmem(str1 +  0, 20, "\xff\x00\xff", 4) == NULL);
+    C(T_memmem(str1 +  0, 20, "\xff", 1) == NULL);
+
+    C(T_memmem(SINK, 300, "\xff", 1) == NULL);
+    C(T_memmem(SINK, 300, "\xff\xff", 2) == NULL);
+    C(T_memmem(SINK, 300, "\xff\0", 2) == NULL);
+    C(T_memmem(SINK, 300, "\0\xff", 2) == NULL);
+
+    return 0;
+}
+
 int run_tests(void) {
     int ret = 0;
     /* boot_asprintf */
@@ -728,6 +806,7 @@ int run_tests(void) {
     TEST(memmove_test());
     TEST(strlcat_test());
     TEST(stpncpy_test());
+    TEST(memmem_test());
 
     return 0;
 }

test/standalone/asprintf_fprintf/src/rename.asm

@@ -2,7 +2,7 @@
 
 	section	.text
 
-	public	_T_memset, _T_memcpy, _T_memmove, _T_memcmp, _T_memccpy, _T_mempcpy, _T_memrchr
+	public	_T_memset, _T_memcpy, _T_memmove, _T_memcmp, _T_memccpy, _T_mempcpy, _T_memrchr, _T_memmem
 	public	_T_strlen, _T_strcmp, _T_strncmp, _T_stpcpy, _T_stpncpy, _T_strlcat
 	public	_T_bzero
 
@@ -13,6 +13,7 @@ _T_memcmp := _memcmp
 _T_memccpy := _memccpy
 _T_mempcpy := _mempcpy
 _T_memrchr := _memrchr
+_T_memmem := _memmem
 
 _T_strlen := _strlen
 _T_strcmp := _strcmp
@@ -29,6 +30,6 @@ _T_bzero := _bzero
 _NULL_ptr:
 	db	$00, $00, $00
 
-	extern	_memset, _memcpy, _memmove, _memcmp, _memccpy, _mempcpy, _memrchr
+	extern	_memset, _memcpy, _memmove, _memcmp, _memccpy, _mempcpy, _memrchr, _memmem
 	extern	_strlen, _strcmp, _strncmp, _stpcpy, _stpncpy, _strlcat
 	extern	_bzero