X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=blobdiff_plain;f=src%2Futil.h;fp=src%2Futil.h;h=ec87a4d043eb5ae1d9a0fcf2f7b96f6797f6b755;hp=f93efc8ba2f29bbea15c9915dbf0b14d7ab6e115;hb=e5413255949140efda5ab0b1e27ec2363fcee542;hpb=2eb6ea48991f9e5462c0a83b50006e5b58f935a0

diff --git a/src/util.h b/src/util.h
index f93efc8..ec87a4d 100644
--- a/src/util.h
+++ b/src/util.h
@@ -111,21 +111,26 @@ void halt(void);
 
 #ifdef __GNUC__
 #if defined(__i386__) || defined(__x86_64__)
-#define memset16(dest, val, count) asm volatile ( \
-	"cld\n\t" \
-	"test $1, %2\n\t" \
-	"jz 0f\n\t" \
-	"rep stosw\n\t" \
-	"jmp 1f\n\t" \
-	"0:\n\t" \
-	"shr $1, %2\n\t" \
-	"push %%ax\n\t" \
-	"shl $16, %%eax\n\t" \
-	"pop %%ax\n\t" \
-	"rep stosl\n\t" \
-	"1:\n\t"\
-	:: "D"(dest), "a"((uint16_t)(val)), "c"(count) \
-	: "memory")
+#define memset16(dest, val, count) \
+	do { \
+		uint32_t dummy1, dummy2; \
+		asm volatile ( \
+			"cld\n\t" \
+			"test $1, %%ecx\n\t" \
+			"jz 0f\n\t" \
+			"rep stosw\n\t" \
+			"jmp 1f\n\t" \
+			"0:\n\t" \
+			"shr $1, %%ecx\n\t" \
+			"push %%ax\n\t" \
+			"shl $16, %%eax\n\t" \
+			"pop %%ax\n\t" \
+			"rep stosl\n\t" \
+			"1:\n\t"\
+			: "=D"(dummy1), "=c"(dummy2) \
+			: "0"(dest), "a"((uint16_t)(val)), "1"(count) \
+			: "flags", "memory"); \
+	} while(0)
 #else
 static void INLINE memset16(void *dest, uint16_t val, int count)
 {