--- upstream/dynamips-0.2.6-RC5/x86-codegen.h	2007/10/06 16:09:07	6
+++ upstream/dynamips-0.2.7-RC1/x86-codegen.h	2007/10/06 16:23:47	7
@@ -359,6 +359,7 @@
 		*(inst)++ = 0xcc;	\
 	} while (0)
 
+#define x86_clc(inst) do { *(inst)++ =(unsigned char)0xf8; } while (0)
 #define x86_cld(inst) do { *(inst)++ =(unsigned char)0xfc; } while (0)
 #define x86_stosb(inst) do { *(inst)++ =(unsigned char)0xaa; } while (0)
 #define x86_stosl(inst) do { *(inst)++ =(unsigned char)0xab; } while (0)
@@ -1036,7 +1037,7 @@
 #define x86_widen_reg(inst,dreg,reg,is_signed,is_half)	\
 	do {	\
 		unsigned char op = 0xb6;	\
-                g_assert (is_half ||  X86_IS_BYTE_REG (reg)); \
+                assert (is_half ||  X86_IS_BYTE_REG (reg)); \
 		*(inst)++ = (unsigned char)0x0f;	\
 		if ((is_signed)) op += 0x08;	\
 		if ((is_half)) op += 0x01;	\
@@ -1529,7 +1530,7 @@
 
 #define x86_set_reg(inst,cond,reg,is_signed)	\
 	do {	\
-                g_assert (X86_IS_BYTE_REG (reg)); \
+                assert (X86_IS_BYTE_REG (reg)); \
 		*(inst)++ = (unsigned char)0x0f;	\
 		if ((is_signed))	\
 			*(inst)++ = x86_cc_signed_map [(cond)] + 0x20;	\