Menu
▾
▴
[HPPAQEMU-CVS] hppaqemu/target-hppa translate.c,1.31,1.32
|
From: Stuart B. <zu...@us...> - 2007-03-20 00:22:44
|
Update of /cvsroot/hppaqemu/hppaqemu/target-hppa In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv13117 Modified Files: translate.c Log Message: Use the correct gen_op_movl_* micro-ops in the gen_op_movl_* arrays. Index: translate.c =================================================================== RCS file: /cvsroot/hppaqemu/hppaqemu/target-hppa/translate.c,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- translate.c 17 Mar 2007 01:51:31 -0000 1.31 +++ translate.c 19 Mar 2007 23:41:11 -0000 1.32 @@ -99,110 +99,6 @@ static GenOpFunc *gen_op_movl_TN_reg[3][32] = { { - gen_op_movl_gr0_T0, - gen_op_movl_gr1_T0, - gen_op_movl_gr2_T0, - gen_op_movl_gr3_T0, - gen_op_movl_gr4_T0, - gen_op_movl_gr5_T0, - gen_op_movl_gr6_T0, - gen_op_movl_gr7_T0, - gen_op_movl_gr8_T0, - gen_op_movl_gr9_T0, - gen_op_movl_gr10_T0, - gen_op_movl_gr11_T0, - gen_op_movl_gr12_T0, - gen_op_movl_gr13_T0, - gen_op_movl_gr14_T0, - gen_op_movl_gr15_T0, - gen_op_movl_gr16_T0, - gen_op_movl_gr17_T0, - gen_op_movl_gr18_T0, - gen_op_movl_gr19_T0, - gen_op_movl_gr20_T0, - gen_op_movl_gr21_T0, - gen_op_movl_gr22_T0, - gen_op_movl_gr23_T0, - gen_op_movl_gr24_T0, - gen_op_movl_gr25_T0, - gen_op_movl_gr26_T0, - gen_op_movl_gr27_T0, - gen_op_movl_gr28_T0, - gen_op_movl_gr29_T0, - gen_op_movl_gr30_T0, - gen_op_movl_gr31_T0, - }, { - gen_op_movl_gr0_T1, - gen_op_movl_gr1_T1, - gen_op_movl_gr2_T1, - gen_op_movl_gr3_T1, - gen_op_movl_gr4_T1, - gen_op_movl_gr5_T1, - gen_op_movl_gr6_T1, - gen_op_movl_gr7_T1, - gen_op_movl_gr8_T1, - gen_op_movl_gr9_T1, - gen_op_movl_gr10_T1, - gen_op_movl_gr11_T1, - gen_op_movl_gr12_T1, - gen_op_movl_gr13_T1, - gen_op_movl_gr14_T1, - gen_op_movl_gr15_T1, - gen_op_movl_gr16_T1, - gen_op_movl_gr17_T1, - gen_op_movl_gr18_T1, - gen_op_movl_gr19_T1, - gen_op_movl_gr20_T1, - gen_op_movl_gr21_T1, - gen_op_movl_gr22_T1, - gen_op_movl_gr23_T1, - gen_op_movl_gr24_T1, - gen_op_movl_gr25_T1, - gen_op_movl_gr26_T1, - gen_op_movl_gr27_T1, - gen_op_movl_gr28_T1, - gen_op_movl_gr29_T1, - gen_op_movl_gr30_T1, - gen_op_movl_gr31_T1, - }, { - gen_op_movl_gr0_T2, - gen_op_movl_gr1_T2, - gen_op_movl_gr2_T2, - gen_op_movl_gr3_T2, - gen_op_movl_gr4_T2, - gen_op_movl_gr5_T2, - gen_op_movl_gr6_T2, - gen_op_movl_gr7_T2, - gen_op_movl_gr8_T2, - gen_op_movl_gr9_T2, - gen_op_movl_gr10_T2, - gen_op_movl_gr11_T2, - gen_op_movl_gr12_T2, - gen_op_movl_gr13_T2, - gen_op_movl_gr14_T2, - gen_op_movl_gr15_T2, - gen_op_movl_gr16_T2, - gen_op_movl_gr17_T2, - gen_op_movl_gr18_T2, - gen_op_movl_gr19_T2, - gen_op_movl_gr20_T2, - gen_op_movl_gr21_T2, - gen_op_movl_gr22_T2, - gen_op_movl_gr23_T2, - gen_op_movl_gr24_T2, - gen_op_movl_gr25_T2, - gen_op_movl_gr26_T2, - gen_op_movl_gr27_T2, - gen_op_movl_gr28_T2, - gen_op_movl_gr29_T2, - gen_op_movl_gr30_T2, - gen_op_movl_gr31_T2, - } -}; - -static GenOpFunc *gen_op_movl_reg_TN[3][32] = -{ - { gen_op_movl_T0_gr0, gen_op_movl_T0_gr1, gen_op_movl_T0_gr2, @@ -304,78 +200,111 @@ } }; -static GenOpFunc *gen_op_movl_TN_cr[2][32] = +static GenOpFunc *gen_op_movl_reg_TN[3][32] = { { - gen_op_movl_cr0_T0, - gen_op_movl_cr1_T0, - gen_op_movl_cr2_T0, - gen_op_movl_cr3_T0, - gen_op_movl_cr4_T0, - gen_op_movl_cr5_T0, - gen_op_movl_cr6_T0, - gen_op_movl_cr7_T0, - gen_op_movl_cr8_T0, - gen_op_movl_cr9_T0, - gen_op_movl_cr10_T0, - gen_op_movl_cr11_T0, - gen_op_movl_cr12_T0, - gen_op_movl_cr13_T0, - gen_op_movl_cr14_T0, - gen_op_movl_cr15_T0, - gen_op_movl_cr16_T0, - gen_op_movl_cr17_T0, - gen_op_movl_cr18_T0, - gen_op_movl_cr19_T0, - gen_op_movl_cr20_T0, - gen_op_movl_cr21_T0, - gen_op_movl_cr22_T0, - gen_op_movl_cr23_T0, - gen_op_movl_cr24_T0, - gen_op_movl_cr25_T0, - gen_op_movl_cr26_T0, - gen_op_movl_cr27_T0, - gen_op_movl_cr28_T0, - gen_op_movl_cr29_T0, - gen_op_movl_cr30_T0, - gen_op_movl_cr31_T0, + gen_op_movl_gr0_T0, + gen_op_movl_gr1_T0, + gen_op_movl_gr2_T0, + gen_op_movl_gr3_T0, + gen_op_movl_gr4_T0, + gen_op_movl_gr5_T0, + gen_op_movl_gr6_T0, + gen_op_movl_gr7_T0, + gen_op_movl_gr8_T0, + gen_op_movl_gr9_T0, + gen_op_movl_gr10_T0, + gen_op_movl_gr11_T0, + gen_op_movl_gr12_T0, + gen_op_movl_gr13_T0, + gen_op_movl_gr14_T0, + gen_op_movl_gr15_T0, + gen_op_movl_gr16_T0, + gen_op_movl_gr17_T0, + gen_op_movl_gr18_T0, + gen_op_movl_gr19_T0, + gen_op_movl_gr20_T0, + gen_op_movl_gr21_T0, + gen_op_movl_gr22_T0, + gen_op_movl_gr23_T0, + gen_op_movl_gr24_T0, + gen_op_movl_gr25_T0, + gen_op_movl_gr26_T0, + gen_op_movl_gr27_T0, + gen_op_movl_gr28_T0, + gen_op_movl_gr29_T0, + gen_op_movl_gr30_T0, + gen_op_movl_gr31_T0, }, { - gen_op_movl_cr0_T1, - gen_op_movl_cr1_T1, - gen_op_movl_cr2_T1, - gen_op_movl_cr3_T1, - gen_op_movl_cr4_T1, - gen_op_movl_cr5_T1, - gen_op_movl_cr6_T1, - gen_op_movl_cr7_T1, - gen_op_movl_cr8_T1, - gen_op_movl_cr9_T1, - gen_op_movl_cr10_T1, - gen_op_movl_cr11_T1, - gen_op_movl_cr12_T1, - gen_op_movl_cr13_T1, - gen_op_movl_cr14_T1, - gen_op_movl_cr15_T1, - gen_op_movl_cr16_T1, - gen_op_movl_cr17_T1, - gen_op_movl_cr18_T1, - gen_op_movl_cr19_T1, - gen_op_movl_cr20_T1, - gen_op_movl_cr21_T1, - gen_op_movl_cr22_T1, - gen_op_movl_cr23_T1, - gen_op_movl_cr24_T1, - gen_op_movl_cr25_T1, - gen_op_movl_cr26_T1, - gen_op_movl_cr27_T1, - gen_op_movl_cr28_T1, - gen_op_movl_cr29_T1, - gen_op_movl_cr30_T1, - gen_op_movl_cr31_T1, + gen_op_movl_gr0_T1, + gen_op_movl_gr1_T1, + gen_op_movl_gr2_T1, + gen_op_movl_gr3_T1, + gen_op_movl_gr4_T1, + gen_op_movl_gr5_T1, + gen_op_movl_gr6_T1, + gen_op_movl_gr7_T1, + gen_op_movl_gr8_T1, + gen_op_movl_gr9_T1, + gen_op_movl_gr10_T1, + gen_op_movl_gr11_T1, + gen_op_movl_gr12_T1, + gen_op_movl_gr13_T1, + gen_op_movl_gr14_T1, + gen_op_movl_gr15_T1, + gen_op_movl_gr16_T1, + gen_op_movl_gr17_T1, + gen_op_movl_gr18_T1, + gen_op_movl_gr19_T1, + gen_op_movl_gr20_T1, + gen_op_movl_gr21_T1, + gen_op_movl_gr22_T1, + gen_op_movl_gr23_T1, + gen_op_movl_gr24_T1, + gen_op_movl_gr25_T1, + gen_op_movl_gr26_T1, + gen_op_movl_gr27_T1, + gen_op_movl_gr28_T1, + gen_op_movl_gr29_T1, + gen_op_movl_gr30_T1, + gen_op_movl_gr31_T1, + }, { + gen_op_movl_gr0_T2, + gen_op_movl_gr1_T2, + gen_op_movl_gr2_T2, + gen_op_movl_gr3_T2, + gen_op_movl_gr4_T2, + gen_op_movl_gr5_T2, + gen_op_movl_gr6_T2, + gen_op_movl_gr7_T2, + gen_op_movl_gr8_T2, + gen_op_movl_gr9_T2, + gen_op_movl_gr10_T2, + gen_op_movl_gr11_T2, + gen_op_movl_gr12_T2, + gen_op_movl_gr13_T2, + gen_op_movl_gr14_T2, + gen_op_movl_gr15_T2, + gen_op_movl_gr16_T2, + gen_op_movl_gr17_T2, + gen_op_movl_gr18_T2, + gen_op_movl_gr19_T2, + gen_op_movl_gr20_T2, + gen_op_movl_gr21_T2, + gen_op_movl_gr22_T2, + gen_op_movl_gr23_T2, + gen_op_movl_gr24_T2, + gen_op_movl_gr25_T2, + gen_op_movl_gr26_T2, + gen_op_movl_gr27_T2, + gen_op_movl_gr28_T2, + gen_op_movl_gr29_T2, + gen_op_movl_gr30_T2, + gen_op_movl_gr31_T2, } }; -static GenOpFunc *gen_op_movl_cr_TN[2][32] = +static GenOpFunc *gen_op_movl_TN_cr[2][32] = { { gen_op_movl_T0_cr0, @@ -446,30 +375,78 @@ } }; -static GenOpFunc *gen_op_movl_TN_sr[2][8] = +static GenOpFunc *gen_op_movl_cr_TN[2][32] = { { - gen_op_movl_sr0_T0, - gen_op_movl_sr1_T0, - gen_op_movl_sr2_T0, - gen_op_movl_sr3_T0, - gen_op_movl_sr4_T0, - gen_op_movl_sr5_T0, - gen_op_movl_sr6_T0, - gen_op_movl_sr7_T0, + gen_op_movl_cr0_T0, + gen_op_movl_cr1_T0, + gen_op_movl_cr2_T0, + gen_op_movl_cr3_T0, + gen_op_movl_cr4_T0, + gen_op_movl_cr5_T0, + gen_op_movl_cr6_T0, + gen_op_movl_cr7_T0, + gen_op_movl_cr8_T0, + gen_op_movl_cr9_T0, + gen_op_movl_cr10_T0, + gen_op_movl_cr11_T0, + gen_op_movl_cr12_T0, + gen_op_movl_cr13_T0, + gen_op_movl_cr14_T0, + gen_op_movl_cr15_T0, + gen_op_movl_cr16_T0, + gen_op_movl_cr17_T0, + gen_op_movl_cr18_T0, + gen_op_movl_cr19_T0, + gen_op_movl_cr20_T0, + gen_op_movl_cr21_T0, + gen_op_movl_cr22_T0, + gen_op_movl_cr23_T0, + gen_op_movl_cr24_T0, + gen_op_movl_cr25_T0, + gen_op_movl_cr26_T0, + gen_op_movl_cr27_T0, + gen_op_movl_cr28_T0, + gen_op_movl_cr29_T0, + gen_op_movl_cr30_T0, + gen_op_movl_cr31_T0, }, { - gen_op_movl_sr0_T1, - gen_op_movl_sr1_T1, - gen_op_movl_sr2_T1, - gen_op_movl_sr3_T1, - gen_op_movl_sr4_T1, - gen_op_movl_sr5_T1, - gen_op_movl_sr6_T1, - gen_op_movl_sr7_T1, + gen_op_movl_cr0_T1, + gen_op_movl_cr1_T1, + gen_op_movl_cr2_T1, + gen_op_movl_cr3_T1, + gen_op_movl_cr4_T1, + gen_op_movl_cr5_T1, + gen_op_movl_cr6_T1, + gen_op_movl_cr7_T1, + gen_op_movl_cr8_T1, + gen_op_movl_cr9_T1, + gen_op_movl_cr10_T1, + gen_op_movl_cr11_T1, + gen_op_movl_cr12_T1, + gen_op_movl_cr13_T1, + gen_op_movl_cr14_T1, + gen_op_movl_cr15_T1, + gen_op_movl_cr16_T1, + gen_op_movl_cr17_T1, + gen_op_movl_cr18_T1, + gen_op_movl_cr19_T1, + gen_op_movl_cr20_T1, + gen_op_movl_cr21_T1, + gen_op_movl_cr22_T1, + gen_op_movl_cr23_T1, + gen_op_movl_cr24_T1, + gen_op_movl_cr25_T1, + gen_op_movl_cr26_T1, + gen_op_movl_cr27_T1, + gen_op_movl_cr28_T1, + gen_op_movl_cr29_T1, + gen_op_movl_cr30_T1, + gen_op_movl_cr31_T1, } }; -static GenOpFunc *gen_op_movl_sr_TN[2][32] = +static GenOpFunc *gen_op_movl_TN_sr[2][8] = { { gen_op_movl_T0_sr0, @@ -480,7 +457,7 @@ gen_op_movl_T0_sr5, gen_op_movl_T0_sr6, gen_op_movl_T0_sr7, - }, { + }, { gen_op_movl_T1_sr0, gen_op_movl_T1_sr1, gen_op_movl_T1_sr2, @@ -492,6 +469,29 @@ } }; +static GenOpFunc *gen_op_movl_sr_TN[2][32] = +{ + { + gen_op_movl_sr0_T0, + gen_op_movl_sr1_T0, + gen_op_movl_sr2_T0, + gen_op_movl_sr3_T0, + gen_op_movl_sr4_T0, + gen_op_movl_sr5_T0, + gen_op_movl_sr6_T0, + gen_op_movl_sr7_T0, + }, { + gen_op_movl_sr0_T1, + gen_op_movl_sr1_T1, + gen_op_movl_sr2_T1, + gen_op_movl_sr3_T1, + gen_op_movl_sr4_T1, + gen_op_movl_sr5_T1, + gen_op_movl_sr6_T1, + gen_op_movl_sr7_T1, + } +}; + static GenOpFunc1 *gen_op_movl_TN_im[3] = { gen_op_movl_T0_im, gen_op_movl_T1_im, @@ -1248,7 +1248,7 @@ case 10: /* CCR/SCR */ case 11: /* SAR - handled differently on 64-bit */ gen_movl_T0_reg(r); - gen_op_movl_T1_im(0xffff); + gen_movl_T1_im(0xffff); gen_op_and_T1_T0(); gen_movl_cr_T0(10); break; |
