Get rid of remaining X86_???

1 files changed, 18 insertions, 13 deletions

diff --git a/codex86.c b/codex86.c
index 432bbb2..190964a 100644
--- a/codex86.c
+++ b/codex86.c
@@ -499,9 +499,9 @@ static uint8_t *
 branch8 (uint8_t *code, ConditionCode cond, uint32_t imm, int is_signed)
 {
     if (is_signed)							
-	*code++ = x86_cc_signed_map [cond];				
+	*code++ = cc_signed_map[cond];				
     else								
-	*code++ = x86_cc_unsigned_map [cond];			
+	*code++ = cc_unsigned_map[cond];			
 
     return emit_imm8 (code, imm);					
 }
@@ -512,9 +512,9 @@ branch32 (uint8_t *code, ConditionCode cond, uint32_t imm, int is_signed)
     *code++ = (unsigned char)0x0f;				
 
     if (is_signed)						
-	*code++ = x86_cc_signed_map [cond] + 0x10;		
+	*code++ = cc_signed_map[cond] + 0x10;		
     else								
-	*code++ = x86_cc_unsigned_map [cond] + 0x10;		
+	*code++ = cc_unsigned_map[cond] + 0x10;		
 
     return emit_imm32 (code, imm);					
 }
@@ -616,6 +616,9 @@ emit_membase (uint8_t *code,
 	      int base_regno,
 	      uint32_t disp)
 {
+    int esp_regno = reg_to_regno (ESP);
+    int ebp_regno = reg_to_regno (EBP);
+    
     assert (is_regno (regno));
     assert (is_regno (base_regno));
 
@@ -623,27 +626,27 @@ emit_membase (uint8_t *code,
     {
 	code = emit_address (code, regno, disp);
     }
-    else if (base_regno == X86_ESP)
+    else if (base_regno == esp_regno)
     {
 	if (disp == 0)
 	{
-	    code = emit_address_byte (code, 0, regno, X86_ESP);
-	    code = emit_address_byte (code, 0, X86_ESP, X86_ESP);
+	    code = emit_address_byte (code, 0, regno, esp_regno);
+	    code = emit_address_byte (code, 0, esp_regno, esp_regno);
 	}
 	else if (is_imm8 (disp))
 	{
-	    code = emit_address_byte (code, 1, regno, X86_ESP);
-	    code = emit_address_byte (code, 0, X86_ESP, X86_ESP);
+	    code = emit_address_byte (code, 1, regno, esp_regno);
+	    code = emit_address_byte (code, 0, esp_regno, esp_regno);
 	    code = emit_imm8 (code, disp);
 	}
 	else
 	{
-	    code = emit_address_byte (code, 2, regno, X86_ESP);
-	    code = emit_address_byte (code, 0, X86_ESP, X86_ESP);
+	    code = emit_address_byte (code, 2, regno, esp_regno);
+	    code = emit_address_byte (code, 0, esp_regno, esp_regno);
 	    code = emit_imm32 (code, disp);
 	}
     }
-    else if (disp == 0 && base_regno != X86_EBP)
+    else if (disp == 0 && base_regno != ebp_regno)
     {
 	code = emit_address_byte (code, 0, regno, base_regno);
     }
@@ -669,6 +672,8 @@ emit_memindex (uint8_t *code,
 	       int index_regno,
 	       int shift)
 {
+    int ebp_regno = reg_to_regno (EBP);
+    
     assert (is_regno (regno));
     assert (is_regno (base_regno));
     assert (is_regno (index_regno));
@@ -683,7 +688,7 @@ emit_memindex (uint8_t *code,
 	code = emit_address_byte (code, shift, index_regno, 5);
 	code = emit_imm32 (code, disp);
     }
-    else if (disp == 0 && base_regno != X86_EBP)
+    else if (disp == 0 && base_regno != ebp_regno)
     {
 	code = emit_address_byte (code, 0, regno, 4);
 	code = emit_address_byte (code, shift, index_regno, base_regno);