Merge windows branch with latest changes

1 files changed, 5 insertions, 2 deletions

diff --git a/gen_x86.h b/gen_x86.h
index abc9f2a..0e614dc 100644
--- a/gen_x86.h
+++ b/gen_x86.h
@@ -36,7 +36,9 @@ enum {
 	CC_O = 0,
 	CC_NO,
 	CC_C,
+	CC_B = CC_C,
 	CC_NC,
+	CC_NB = CC_NC,
 	CC_Z,
 	CC_NZ,
 	CC_BE,
@@ -78,8 +80,6 @@ enum {
 	MODE_IMMED = 0xFF
 } x86_modes;
 
-void check_alloc_code(code_info *code, uint32_t inst_size);
-
 void rol_ir(code_info *code, uint8_t val, uint8_t dst, uint8_t size);
 void ror_ir(code_info *code, uint8_t val, uint8_t dst, uint8_t size);
 void rcl_ir(code_info *code, uint8_t val, uint8_t dst, uint8_t size);
@@ -186,7 +186,9 @@ void xchg_rr(code_info *code, uint8_t src, uint8_t dst, uint8_t size);
 void pushf(code_info *code);
 void popf(code_info *code);
 void push_r(code_info *code, uint8_t reg);
+void push_rdisp(code_info *code, uint8_t base, int32_t disp);
 void pop_r(code_info *code, uint8_t reg);
+void pop_rind(code_info *code, uint8_t reg);
 void setcc_r(code_info *code, uint8_t cc, uint8_t dst);
 void setcc_rind(code_info *code, uint8_t cc, uint8_t dst);
 void setcc_rdisp(code_info *code, uint8_t cc, uint8_t dst, int32_t disp);
@@ -207,6 +209,7 @@ void btc_rrdisp(code_info *code, uint8_t src, uint8_t dst_base, int32_t dst_disp
 void btc_ir(code_info *code, uint8_t val, uint8_t dst, uint8_t size);
 void btc_irdisp(code_info *code, uint8_t val, uint8_t dst_base, int32_t dst_disp, uint8_t size);
 void jcc(code_info *code, uint8_t cc, code_ptr dest);
+void jmp_rind(code_info *code, uint8_t dst);
 void call_r(code_info *code, uint8_t dst);
 void retn(code_info *code);
 void cdq(code_info *code);