From 6c0e0b998be3901fa544eafd0a7a0c51d0d575c6 Mon Sep 17 00:00:00 2001 From: herman ten brugge Date: Mon, 27 Dec 2021 11:24:33 +0100 Subject: Fix memcpy1/memcpy2 asm testcode on x86_64 --- tests/tcctest.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/tcctest.c b/tests/tcctest.c index 16fa83e..a4bb212 100644 --- a/tests/tcctest.c +++ b/tests/tcctest.c @@ -3209,7 +3209,7 @@ return dest; static inline void * memcpy1(void * to, const void * from, size_t n) { -long d0, d1, d2; +size_t d0, d1, d2; __asm__ __volatile__( "rep ; movsl\n\t" "testb $2,%b4\n\t" @@ -3220,14 +3220,14 @@ __asm__ __volatile__( "movsb\n" "2:" : "=&c" (d0), "=&D" (d1), "=&S" (d2) - :"0" (n/4), "q" (n),"1" ((long) to),"2" ((long) from) + :"0" (n/4), "q" (n),"1" ((size_t) to),"2" ((size_t) from) : "memory"); return (to); } static inline void * memcpy2(void * to, const void * from, size_t n) { -long d0, d1, d2; +size_t d0, d1, d2; __asm__ __volatile__( "rep movsl\n\t" /* one-line rep prefix + string op */ "testb $2,%b4\n\t" @@ -3238,7 +3238,7 @@ __asm__ __volatile__( "movsb\n" "2:" : "=&c" (d0), "=&D" (d1), "=&S" (d2) - :"0" (n/4), "q" (n),"1" ((long) to),"2" ((long) from) + :"0" (n/4), "q" (n),"1" ((size_t) to),"2" ((size_t) from) : "memory"); return (to); } -- cgit v1.2.3