diff --git a/jit/jit-rules-x86.c b/jit/jit-rules-x86.c
index 1669856..0dbd95e 100644
--- a/jit/jit-rules-x86.c
+++ b/jit/jit-rules-x86.c
@@ -781,7 +781,7 @@ _jit_gen_load_value(jit_gencode_t gen, int reg, int other_reg, jit_value_t value
 					x86_clear_reg(inst, _jit_reg_info[reg].cpu_reg);
 #else
 					x86_clear_reg(inst, _jit_reg_info[reg].cpu_reg);
-					x86_clear_reg(inst, _jit_reg_info[other_reg].cpu_reg);
+					x86_clear_reg(inst, _jit_reg_info[reg].other_reg);
 #endif
 				}
 				else
@@ -792,7 +792,7 @@ _jit_gen_load_value(jit_gencode_t gen, int reg, int other_reg, jit_value_t value
 #else
 					x86_mov_reg_imm(inst, _jit_reg_info[reg].cpu_reg,
 							(jit_int)long_value);
-					x86_mov_reg_imm(inst, _jit_reg_info[other_reg].cpu_reg,
+					x86_mov_reg_imm(inst, _jit_reg_info[reg].other_reg,
 							(jit_int)(long_value >> 32));
 #endif
 				}
@@ -849,7 +849,7 @@ _jit_gen_load_value(jit_gencode_t gen, int reg, int other_reg, jit_value_t value
 					un.float64_value = float64_value;
 					x86_mov_reg_imm(inst, _jit_reg_info[reg].cpu_reg,
 							un.int_value[0]);
-					x86_mov_reg_imm(inst, _jit_reg_info[other_reg].cpu_reg,
+					x86_mov_reg_imm(inst, _jit_reg_info[reg].other_reg,
 							un.int_value[1]);
 				}
 				else
@@ -887,7 +887,7 @@ _jit_gen_load_value(jit_gencode_t gen, int reg, int other_reg, jit_value_t value
 					un.nfloat_value = nfloat_value;
 					x86_mov_reg_imm(inst, _jit_reg_info[reg].cpu_reg,
 							un.int_value[0]);
-					x86_mov_reg_imm(inst, _jit_reg_info[other_reg].cpu_reg,
+					x86_mov_reg_imm(inst, _jit_reg_info[reg].other_reg,
 							un.int_value[1]);
 				}
 				else
@@ -991,7 +991,7 @@ _jit_gen_load_value(jit_gencode_t gen, int reg, int other_reg, jit_value_t value
 #else
 				x86_mov_reg_reg(inst, _jit_reg_info[reg].cpu_reg,
 						_jit_reg_info[src_reg].cpu_reg, 4);
-				x86_mov_reg_reg(inst, _jit_reg_info[other_reg].cpu_reg,
+				x86_mov_reg_reg(inst, _jit_reg_info[reg].other_reg,
 						_jit_reg_info[other_src_reg].cpu_reg, 4);
 #endif
 			}
@@ -1063,7 +1063,7 @@ _jit_gen_load_value(jit_gencode_t gen, int reg, int other_reg, jit_value_t value
 #else
 				x86_mov_reg_membase(inst, _jit_reg_info[reg].cpu_reg,
 						    X86_EBP, offset, 4);
-				x86_mov_reg_membase(inst, _jit_reg_info[other_reg].cpu_reg,
+				x86_mov_reg_membase(inst, _jit_reg_info[reg].other_reg,
 						    X86_EBP, offset + 4, 4);
 #endif
 			}
@@ -1089,7 +1089,7 @@ _jit_gen_load_value(jit_gencode_t gen, int reg, int other_reg, jit_value_t value
 				{
 					x86_mov_reg_membase(inst, _jit_reg_info[reg].cpu_reg,
 							    X86_EBP, offset, 4);
-					x86_mov_reg_membase(inst, _jit_reg_info[other_reg].cpu_reg,
+					x86_mov_reg_membase(inst, _jit_reg_info[reg].other_reg,
 							    X86_EBP, offset + 4, 4);
 				}
 				else
@@ -1105,7 +1105,7 @@ _jit_gen_load_value(jit_gencode_t gen, int reg, int other_reg, jit_value_t value
 				{
 					x86_mov_reg_membase(inst, _jit_reg_info[reg].cpu_reg,
 							    X86_EBP, offset, 4);
-					x86_mov_reg_membase(inst, _jit_reg_info[other_reg].cpu_reg,
+					x86_mov_reg_membase(inst, _jit_reg_info[reg].other_reg,
 							    X86_EBP, offset + 4, 4);
 				}
 				else if(sizeof(jit_nfloat) == sizeof(jit_float64))