X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FMisc.c;h=f21c51115fc0ec8609762ec3f10a4fc753723728;hb=259ed0ea6635845527a3da94a67a6260463861e6;hp=a458f4de120f4c2a36a3e59fab7c7d2280dddfcd;hpb=70357ce52578dee0dd3b3663902cf872c3d34258;p=picodrive.git

diff --git a/Pico/Misc.c b/Pico/Misc.c
index a458f4d..f21c511 100644
--- a/Pico/Misc.c
+++ b/Pico/Misc.c
@@ -330,7 +330,7 @@ typedef struct
 
 PICO_INTERNAL_ASM void memcpy16(unsigned short *dest, unsigned short *src, int count)
 {
-	if (((int)dest & (int)src & 3) == 0)
+	if ((((int)dest | (int)src) & 3) == 0)
 	{
 		if (count >= 32) {
 			memcpy32((int *)dest, (int *)src, count/2);
@@ -353,7 +353,7 @@ PICO_INTERNAL_ASM void memcpy16bswap(unsigned short *dest, void *src, int count)
 		*dest++ = (src_[0] << 8) | src_[1];
 }
 
-
+#ifndef _ASM_MISC_C_AMIPS
 PICO_INTERNAL_ASM void memcpy32(int *dest, int *src, int count)
 {
 	intblock *bd = (intblock *) dest, *bs = (intblock *) src;
@@ -376,5 +376,7 @@ PICO_INTERNAL_ASM void memset32(int *dest, int c, int count)
 	while (count--)
 		*dest++ = c;
 }
+void memset32_uncached(int *dest, int c, int count) { memset32(dest, c, count); }
+#endif
 #endif