Revert "target-i386: Use movcond to implement rotate flags."
PATCH 1/1 Revert "target-i386: Use movcond to implement rotate flags."
This commit breaks boot of MS-DOS 6.22, which stops at:
MODE CON CODEPAGE PREPARE=((850) C:\DOS\EGA.CPI)
This reverts part of commit 34d80a55ff8517fd37bcfea5063b9797e2bd9132.
---
checkpatch.pl complains about this patch, but I preferred to do a simple revert than to fix code style.
target-i386/translate.c | 98 ++++++++++++++++++++++------------------------- 1 file changed, 45 insertions(+), 53 deletions(-)
target-i386/translate.c +45 -53
@@ -1804,81 +1804,73 @@ static void gen_rot_rm_T1(DisasContext *s, int ot, int op1, int is_right)static void gen_rot_rm_im (DisasContext *s,int ot,int op1,int op2,int is_right) { -int mask = (ot ==OT_QUAD ?0x3f :0x1f ); -int shift; +int mask; +int data_bits; +TCGv t0, t1, a0; + +/* XXX: inefficient, but we must use local temps */ + t0 =tcg_temp_local_new (); + t1 =tcg_temp_local_new (); + a0 =tcg_temp_local_new (); + +if (ot ==OT_QUAD ) + mask =0x3f ; +else + mask =0x1f ;/* load */ if (op1 ==OR_TMP0 ) { -gen_op_ld_T0_A0 (ot + s->mem_index); +tcg_gen_mov_tl (a0, cpu_A0); +gen_op_ld_v (ot + s->mem_index, t0, a0); }else { -gen_op_mov_TN_reg (ot,0 , op1); +gen_op_mov_v_reg (ot, t0, op1); } +gen_extu (ot, t0); +tcg_gen_mov_tl (t1, t0); + op2 &= mask; + data_bits =8 << ot;if (op2 !=0 ) { -switch (ot) { -#ifdef TARGET_X86_64 -case OT_LONG : -tcg_gen_trunc_tl_i32 (cpu_tmp2_i32, cpu_T[0 ]); -if (is_right) { -tcg_gen_rotri_i32 (cpu_tmp2_i32, cpu_tmp2_i32, op2); - }else { -tcg_gen_rotli_i32 (cpu_tmp2_i32, cpu_tmp2_i32, op2); - } -tcg_gen_extu_i32_tl (cpu_T[0 ], cpu_tmp2_i32); -break ; -#endif -default : -if (is_right) { -tcg_gen_rotri_tl (cpu_T[0 ], cpu_T[0 ], op2); - }else { -tcg_gen_rotli_tl (cpu_T[0 ], cpu_T[0 ], op2); - } -break ; -case OT_BYTE : - mask =7 ; - goto do_shifts; -case OT_WORD : - mask =15 ; - do_shifts: - shift = op2 & mask; -if (is_right) { - shift = mask +1 - shift; - } -gen_extu (ot, cpu_T[0 ]); -tcg_gen_shli_tl (cpu_tmp0, cpu_T[0 ], shift); -tcg_gen_shri_tl (cpu_T[0 ], cpu_T[0 ], mask +1 - shift); -tcg_gen_or_tl (cpu_T[0 ], cpu_T[0 ], cpu_tmp0); -break ; +int shift = op2 & ((1 << (3 + ot)) -1 ); +if (is_right) { +tcg_gen_shri_tl (cpu_tmp4, t0, shift); +tcg_gen_shli_tl (t0, t0, data_bits - shift); + } +else { +tcg_gen_shli_tl (cpu_tmp4, t0, shift); +tcg_gen_shri_tl (t0, t0, data_bits - shift); } +tcg_gen_or_tl (t0, t0, cpu_tmp4); }/* store */ if (op1 ==OR_TMP0 ) { -gen_op_st_T0_A0 (ot + s->mem_index); +gen_op_st_v (ot + s->mem_index, t0, a0); }else { -gen_op_mov_reg_T0 (ot, op1); +gen_op_mov_reg_v (ot, op1, t0); }if (op2 !=0 ) { -/* Compute the flags into CC_SRC. */ +/* update eflags */ gen_compute_eflags (s); +assert (s->cc_op ==CC_OP_EFLAGS ); -/* The value that was "rotated out" is now present at the other end -of the word. Compute C into CC_DST and O into CC_SRC2. Note that -since we've computed the flags into CC_SRC, these variables are -currently dead. */ +tcg_gen_andi_tl (cpu_cc_src, cpu_cc_src, ~(CC_O |CC_C )); +tcg_gen_xor_tl (cpu_tmp0, t1, t0); +tcg_gen_lshift (cpu_tmp0, cpu_tmp0,11 - (data_bits -1 )); +tcg_gen_andi_tl (cpu_tmp0, cpu_tmp0,CC_O ); +tcg_gen_or_tl (cpu_cc_src, cpu_cc_src, cpu_tmp0);if (is_right) { -tcg_gen_shri_tl (cpu_cc_src2, cpu_T[0 ], mask -1 ); -tcg_gen_shri_tl (cpu_cc_dst, cpu_T[0 ], mask); - }else { -tcg_gen_shri_tl (cpu_cc_src2, cpu_T[0 ], mask); -tcg_gen_andi_tl (cpu_cc_dst, cpu_T[0 ],1 ); +tcg_gen_shri_tl (t0, t0, data_bits -1 ); } -tcg_gen_andi_tl (cpu_cc_src2, cpu_cc_src2,1 ); -tcg_gen_xor_tl (cpu_cc_src2, cpu_cc_src2, cpu_cc_dst); -set_cc_op (s,CC_OP_ADCOX ); +tcg_gen_andi_tl (t0, t0,CC_C ); +tcg_gen_or_tl (cpu_cc_src, cpu_cc_src, t0); } + +tcg_temp_free (t0); +tcg_temp_free (t1); +tcg_temp_free (a0); }/* XXX: add faster immediate = 1 case */
Signature · 1 line
1.7.10.4
Quoted 6 lines · Hervé Poussineau
This commit breaks boot of MS-DOS 6.22, which stops at:
MODE CON CODEPAGE PREPARE=((850) C:\DOS\EGA.CPI)This reverts part of commit
34d80a55ff8517fd37bcfea5063b9797e2bd9132.Signed-off-by Hervé Poussineau <[email protected]>
I strongly suspect the bug is now fixed by 089305ac0a273e64c9a5655d26da7fe19ecee66f and there's no need for a revert.
r~
Quoted 9 lines · Richard Henderson
Quoted 6 lines · Hervé Poussineau
This commit breaks boot of MS-DOS 6.22, which stops at:
MODE CON CODEPAGE PREPARE=((850) C:\DOS\EGA.CPI)This reverts part of commit
34d80a55ff8517fd37bcfea5063b9797e2bd9132.Signed-off-by Hervé Poussineau <[email protected]>I strongly suspect the bug is now fixed by
089305ac0a273e64c9a5655d26da7fe19ecee66fand there's no need for a revert.
No, the bug is still present in e9016ee2bda1b7757072b856b2196f691aee3388.
Hervé
Quoted 5 lines · Hervé Poussineau
Quoted 4 lines · Richard Henderson
Quoted 3 lines · Hervé Poussineau
This commit breaks boot of MS-DOS 6.22, which stops at:
MODE CON CODEPAGE PREPARE=((850) C:\DOS\EGA.CPI)
Quoted 8 lines
Quoted 6 lines
Quoted 3 lines
This reverts part of commit
34d80a55ff8517fd37bcfea5063b9797e2bd9132.Signed-off-by Hervé Poussineau <[email protected]>I strongly suspect the bug is now fixed by
089305ac0a273e64c9a5655d26da7fe19ecee66fand there's no need for a revert.No, the bug is still present in
e9016ee2bda1b7757072b856b2196f691aee3388.
Then could you provide, at least privately, a copy of the image that fails?
r~
Quoted 5 lines · Hervé Poussineau
This commit breaks boot of MS-DOS 6.22, which stops at:
MODE CON CODEPAGE PREPARE=((850) C:\DOS\EGA.CPI)This reverts part of commit
34d80a55ff8517fd37bcfea5063b9797e2bd9132.
Quoted 8 lines
Signed-off-by Hervé Poussineau <[email protected]>---
checkpatch.pl complains about this patch, but I preferred to do a simple revert than to fix code style.
target-i386/translate.c | 98 ++++++++++++++++++++++------------------------- 1 file changed, 45 insertions(+), 53 deletions(-)
The actual bug is the same than the one fixed in commit 089305ac, but for the immediate case. I have just send a patch to fix the issue.
Signature · 2 lines
Aurelien Jarno GPG: 1024D/F1BCDB73 [email protected] http://www.aurel32.net