Define the ADD_IMM macro in terms of ADD()

Remove the CLEAR_CARRY macro, which wasn't being used

1 files changed, 1 insertions, 3 deletions

diff --git a/modules/alg_ia32/asm_macr.h b/modules/alg_ia32/asm_macr.h
index 8b2224103..eb25ad209 100644
--- a/modules/alg_ia32/asm_macr.h
+++ b/modules/alg_ia32/asm_macr.h
@@ -99,15 +99,13 @@ func_name:
 #define IMM(VAL) $VAL
 
 #define ADD(TO, FROM) addl FROM, TO
-#define ADD_IMM(TO, NUM) addl IMM(NUM), TO
+#define ADD_IMM(TO, NUM) ADD(TO, IMM(NUM))
 #define ADD_W_CARRY(TO1, TO2, FROM) addl FROM, TO1; adcl IMM(0), TO2;
 #define SUB_IMM(TO, NUM) subl IMM(NUM), TO
 #define ADD2_IMM(TO, FROM, NUM) leal NUM(FROM), TO
 #define ADD3_IMM(TO, FROM, NUM) leal NUM(TO,FROM,1), TO
 #define MUL(REG) mull REG
 
-#define CLEAR_CARRY() clc
-
 #define SHL_IMM(REG, SHIFT) shll IMM(SHIFT), REG
 #define SHR_IMM(REG, SHIFT) shrl IMM(SHIFT), REG
 #define SHL2_3(TO, FROM) leal 0(,FROM,8), TO