summaryrefslogtreecommitdiff
path: root/src/core/arm/skyeye_common
diff options
context:
space:
mode:
authorGravatar archshift2016-06-10 18:26:42 -0700
committerGravatar archshift2016-06-10 18:35:57 -0700
commit5297f5dfc914ebdfb027edb964bc141d01be9c6a (patch)
treeb7d56fcc116c7d7b7f96a324a4e2b4950d210aa5 /src/core/arm/skyeye_common
parentarm_dyncom_interpreter.cpp: #include translation info from inc files (diff)
downloadyuzu-5297f5dfc914ebdfb027edb964bc141d01be9c6a.tar.gz
yuzu-5297f5dfc914ebdfb027edb964bc141d01be9c6a.tar.xz
yuzu-5297f5dfc914ebdfb027edb964bc141d01be9c6a.zip
arm_dyncom_interpreter: Rename anonymous enum to TransExtData
Diffstat (limited to 'src/core/arm/skyeye_common')
-rw-r--r--src/core/arm/skyeye_common/vfp/vfpinstr.cpp64
1 files changed, 32 insertions, 32 deletions
diff --git a/src/core/arm/skyeye_common/vfp/vfpinstr.cpp b/src/core/arm/skyeye_common/vfp/vfpinstr.cpp
index 4f9083515..1a98d0114 100644
--- a/src/core/arm/skyeye_common/vfp/vfpinstr.cpp
+++ b/src/core/arm/skyeye_common/vfp/vfpinstr.cpp
@@ -26,7 +26,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(vmla)(unsigned int inst, int index)
26 26
27 inst_base->cond = BITS(inst, 28, 31); 27 inst_base->cond = BITS(inst, 28, 31);
28 inst_base->idx = index; 28 inst_base->idx = index;
29 inst_base->br = NON_BRANCH; 29 inst_base->br = TransExtData::NON_BRANCH;
30 30
31 inst_cream->dp_operation = BIT(inst, 8); 31 inst_cream->dp_operation = BIT(inst, 8);
32 inst_cream->instr = inst; 32 inst_cream->instr = inst;
@@ -75,7 +75,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(vmls)(unsigned int inst, int index)
75 75
76 inst_base->cond = BITS(inst, 28, 31); 76 inst_base->cond = BITS(inst, 28, 31);
77 inst_base->idx = index; 77 inst_base->idx = index;
78 inst_base->br = NON_BRANCH; 78 inst_base->br = TransExtData::NON_BRANCH;
79 79
80 inst_cream->dp_operation = BIT(inst, 8); 80 inst_cream->dp_operation = BIT(inst, 8);
81 inst_cream->instr = inst; 81 inst_cream->instr = inst;
@@ -124,7 +124,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(vnmla)(unsigned int inst, int index)
124 124
125 inst_base->cond = BITS(inst, 28, 31); 125 inst_base->cond = BITS(inst, 28, 31);
126 inst_base->idx = index; 126 inst_base->idx = index;
127 inst_base->br = NON_BRANCH; 127 inst_base->br = TransExtData::NON_BRANCH;
128 128
129 inst_cream->dp_operation = BIT(inst, 8); 129 inst_cream->dp_operation = BIT(inst, 8);
130 inst_cream->instr = inst; 130 inst_cream->instr = inst;
@@ -174,7 +174,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(vnmls)(unsigned int inst, int index)
174 174
175 inst_base->cond = BITS(inst, 28, 31); 175 inst_base->cond = BITS(inst, 28, 31);
176 inst_base->idx = index; 176 inst_base->idx = index;
177 inst_base->br = NON_BRANCH; 177 inst_base->br = TransExtData::NON_BRANCH;
178 178
179 inst_cream->dp_operation = BIT(inst, 8); 179 inst_cream->dp_operation = BIT(inst, 8);
180 inst_cream->instr = inst; 180 inst_cream->instr = inst;
@@ -223,7 +223,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(vnmul)(unsigned int inst, int index)
223 223
224 inst_base->cond = BITS(inst, 28, 31); 224 inst_base->cond = BITS(inst, 28, 31);
225 inst_base->idx = index; 225 inst_base->idx = index;
226 inst_base->br = NON_BRANCH; 226 inst_base->br = TransExtData::NON_BRANCH;
227 227
228 inst_cream->dp_operation = BIT(inst, 8); 228 inst_cream->dp_operation = BIT(inst, 8);
229 inst_cream->instr = inst; 229 inst_cream->instr = inst;
@@ -272,7 +272,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(vmul)(unsigned int inst, int index)
272 272
273 inst_base->cond = BITS(inst, 28, 31); 273 inst_base->cond = BITS(inst, 28, 31);
274 inst_base->idx = index; 274 inst_base->idx = index;
275 inst_base->br = NON_BRANCH; 275 inst_base->br = TransExtData::NON_BRANCH;
276 276
277 inst_cream->dp_operation = BIT(inst, 8); 277 inst_cream->dp_operation = BIT(inst, 8);
278 inst_cream->instr = inst; 278 inst_cream->instr = inst;
@@ -321,7 +321,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(vadd)(unsigned int inst, int index)
321 321
322 inst_base->cond = BITS(inst, 28, 31); 322 inst_base->cond = BITS(inst, 28, 31);
323 inst_base->idx = index; 323 inst_base->idx = index;
324 inst_base->br = NON_BRANCH; 324 inst_base->br = TransExtData::NON_BRANCH;
325 325
326 inst_cream->dp_operation = BIT(inst, 8); 326 inst_cream->dp_operation = BIT(inst, 8);
327 inst_cream->instr = inst; 327 inst_cream->instr = inst;
@@ -370,7 +370,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(vsub)(unsigned int inst, int index)
370 370
371 inst_base->cond = BITS(inst, 28, 31); 371 inst_base->cond = BITS(inst, 28, 31);
372 inst_base->idx = index; 372 inst_base->idx = index;
373 inst_base->br = NON_BRANCH; 373 inst_base->br = TransExtData::NON_BRANCH;
374 374
375 inst_cream->dp_operation = BIT(inst, 8); 375 inst_cream->dp_operation = BIT(inst, 8);
376 inst_cream->instr = inst; 376 inst_cream->instr = inst;
@@ -419,7 +419,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(vdiv)(unsigned int inst, int index)
419 419
420 inst_base->cond = BITS(inst, 28, 31); 420 inst_base->cond = BITS(inst, 28, 31);
421 inst_base->idx = index; 421 inst_base->idx = index;
422 inst_base->br = NON_BRANCH; 422 inst_base->br = TransExtData::NON_BRANCH;
423 423
424 inst_cream->dp_operation = BIT(inst, 8); 424 inst_cream->dp_operation = BIT(inst, 8);
425 inst_cream->instr = inst; 425 inst_cream->instr = inst;
@@ -470,7 +470,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(vmovi)(unsigned int inst, int index)
470 470
471 inst_base->cond = BITS(inst, 28, 31); 471 inst_base->cond = BITS(inst, 28, 31);
472 inst_base->idx = index; 472 inst_base->idx = index;
473 inst_base->br = NON_BRANCH; 473 inst_base->br = TransExtData::NON_BRANCH;
474 474
475 inst_cream->single = BIT(inst, 8) == 0; 475 inst_cream->single = BIT(inst, 8) == 0;
476 inst_cream->d = (inst_cream->single ? BITS(inst,12,15)<<1 | BIT(inst,22) : BITS(inst,12,15) | BIT(inst,22)<<4); 476 inst_cream->d = (inst_cream->single ? BITS(inst,12,15)<<1 | BIT(inst,22) : BITS(inst,12,15) | BIT(inst,22)<<4);
@@ -518,7 +518,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(vmovr)(unsigned int inst, int index)
518 518
519 inst_base->cond = BITS(inst, 28, 31); 519 inst_base->cond = BITS(inst, 28, 31);
520 inst_base->idx = index; 520 inst_base->idx = index;
521 inst_base->br = NON_BRANCH; 521 inst_base->br = TransExtData::NON_BRANCH;
522 522
523 inst_cream->single = BIT(inst, 8) == 0; 523 inst_cream->single = BIT(inst, 8) == 0;
524 inst_cream->d = (inst_cream->single ? BITS(inst,12,15)<<1 | BIT(inst,22) : BITS(inst,12,15) | BIT(inst,22)<<4); 524 inst_cream->d = (inst_cream->single ? BITS(inst,12,15)<<1 | BIT(inst,22) : BITS(inst,12,15) | BIT(inst,22)<<4);
@@ -560,7 +560,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(vabs)(unsigned int inst, int index)
560 560
561 inst_base->cond = BITS(inst, 28, 31); 561 inst_base->cond = BITS(inst, 28, 31);
562 inst_base->idx = index; 562 inst_base->idx = index;
563 inst_base->br = NON_BRANCH; 563 inst_base->br = TransExtData::NON_BRANCH;
564 564
565 inst_cream->dp_operation = BIT(inst, 8); 565 inst_cream->dp_operation = BIT(inst, 8);
566 inst_cream->instr = inst; 566 inst_cream->instr = inst;
@@ -610,7 +610,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(vneg)(unsigned int inst, int index)
610 610
611 inst_base->cond = BITS(inst, 28, 31); 611 inst_base->cond = BITS(inst, 28, 31);
612 inst_base->idx = index; 612 inst_base->idx = index;
613 inst_base->br = NON_BRANCH; 613 inst_base->br = TransExtData::NON_BRANCH;
614 614
615 inst_cream->dp_operation = BIT(inst, 8); 615 inst_cream->dp_operation = BIT(inst, 8);
616 inst_cream->instr = inst; 616 inst_cream->instr = inst;
@@ -659,7 +659,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(vsqrt)(unsigned int inst, int index)
659 659
660 inst_base->cond = BITS(inst, 28, 31); 660 inst_base->cond = BITS(inst, 28, 31);
661 inst_base->idx = index; 661 inst_base->idx = index;
662 inst_base->br = NON_BRANCH; 662 inst_base->br = TransExtData::NON_BRANCH;
663 663
664 inst_cream->dp_operation = BIT(inst, 8); 664 inst_cream->dp_operation = BIT(inst, 8);
665 inst_cream->instr = inst; 665 inst_cream->instr = inst;
@@ -708,7 +708,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(vcmp)(unsigned int inst, int index)
708 708
709 inst_base->cond = BITS(inst, 28, 31); 709 inst_base->cond = BITS(inst, 28, 31);
710 inst_base->idx = index; 710 inst_base->idx = index;
711 inst_base->br = NON_BRANCH; 711 inst_base->br = TransExtData::NON_BRANCH;
712 712
713 inst_cream->dp_operation = BIT(inst, 8); 713 inst_cream->dp_operation = BIT(inst, 8);
714 inst_cream->instr = inst; 714 inst_cream->instr = inst;
@@ -757,7 +757,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(vcmp2)(unsigned int inst, int index)
757 757
758 inst_base->cond = BITS(inst, 28, 31); 758 inst_base->cond = BITS(inst, 28, 31);
759 inst_base->idx = index; 759 inst_base->idx = index;
760 inst_base->br = NON_BRANCH; 760 inst_base->br = TransExtData::NON_BRANCH;
761 761
762 inst_cream->dp_operation = BIT(inst, 8); 762 inst_cream->dp_operation = BIT(inst, 8);
763 inst_cream->instr = inst; 763 inst_cream->instr = inst;
@@ -806,7 +806,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(vcvtbds)(unsigned int inst, int index)
806 806
807 inst_base->cond = BITS(inst, 28, 31); 807 inst_base->cond = BITS(inst, 28, 31);
808 inst_base->idx = index; 808 inst_base->idx = index;
809 inst_base->br = NON_BRANCH; 809 inst_base->br = TransExtData::NON_BRANCH;
810 810
811 inst_cream->dp_operation = BIT(inst, 8); 811 inst_cream->dp_operation = BIT(inst, 8);
812 inst_cream->instr = inst; 812 inst_cream->instr = inst;
@@ -857,7 +857,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(vcvtbff)(unsigned int inst, int index)
857 857
858 inst_base->cond = BITS(inst, 28, 31); 858 inst_base->cond = BITS(inst, 28, 31);
859 inst_base->idx = index; 859 inst_base->idx = index;
860 inst_base->br = NON_BRANCH; 860 inst_base->br = TransExtData::NON_BRANCH;
861 861
862 inst_cream->dp_operation = BIT(inst, 8); 862 inst_cream->dp_operation = BIT(inst, 8);
863 inst_cream->instr = inst; 863 inst_cream->instr = inst;
@@ -906,7 +906,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(vcvtbfi)(unsigned int inst, int index)
906 906
907 inst_base->cond = BITS(inst, 28, 31); 907 inst_base->cond = BITS(inst, 28, 31);
908 inst_base->idx = index; 908 inst_base->idx = index;
909 inst_base->br = NON_BRANCH; 909 inst_base->br = TransExtData::NON_BRANCH;
910 910
911 inst_cream->dp_operation = BIT(inst, 8); 911 inst_cream->dp_operation = BIT(inst, 8);
912 inst_cream->instr = inst; 912 inst_cream->instr = inst;
@@ -962,7 +962,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(vmovbrs)(unsigned int inst, int index)
962 962
963 inst_base->cond = BITS(inst, 28, 31); 963 inst_base->cond = BITS(inst, 28, 31);
964 inst_base->idx = index; 964 inst_base->idx = index;
965 inst_base->br = NON_BRANCH; 965 inst_base->br = TransExtData::NON_BRANCH;
966 966
967 inst_cream->to_arm = BIT(inst, 20) == 1; 967 inst_cream->to_arm = BIT(inst, 20) == 1;
968 inst_cream->t = BITS(inst, 12, 15); 968 inst_cream->t = BITS(inst, 12, 15);
@@ -1006,7 +1006,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(vmsr)(unsigned int inst, int index)
1006 1006
1007 inst_base->cond = BITS(inst, 28, 31); 1007 inst_base->cond = BITS(inst, 28, 31);
1008 inst_base->idx = index; 1008 inst_base->idx = index;
1009 inst_base->br = NON_BRANCH; 1009 inst_base->br = TransExtData::NON_BRANCH;
1010 1010
1011 inst_cream->reg = BITS(inst, 16, 19); 1011 inst_cream->reg = BITS(inst, 16, 19);
1012 inst_cream->Rt = BITS(inst, 12, 15); 1012 inst_cream->Rt = BITS(inst, 12, 15);
@@ -1069,7 +1069,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(vmovbrc)(unsigned int inst, int index)
1069 1069
1070 inst_base->cond = BITS(inst, 28, 31); 1070 inst_base->cond = BITS(inst, 28, 31);
1071 inst_base->idx = index; 1071 inst_base->idx = index;
1072 inst_base->br = NON_BRANCH; 1072 inst_base->br = TransExtData::NON_BRANCH;
1073 1073
1074 inst_cream->d = BITS(inst, 16, 19)|BIT(inst, 7)<<4; 1074 inst_cream->d = BITS(inst, 16, 19)|BIT(inst, 7)<<4;
1075 inst_cream->t = BITS(inst, 12, 15); 1075 inst_cream->t = BITS(inst, 12, 15);
@@ -1115,7 +1115,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(vmrs)(unsigned int inst, int index)
1115 1115
1116 inst_base->cond = BITS(inst, 28, 31); 1116 inst_base->cond = BITS(inst, 28, 31);
1117 inst_base->idx = index; 1117 inst_base->idx = index;
1118 inst_base->br = NON_BRANCH; 1118 inst_base->br = TransExtData::NON_BRANCH;
1119 1119
1120 inst_cream->reg = BITS(inst, 16, 19); 1120 inst_cream->reg = BITS(inst, 16, 19);
1121 inst_cream->Rt = BITS(inst, 12, 15); 1121 inst_cream->Rt = BITS(inst, 12, 15);
@@ -1200,7 +1200,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(vmovbcr)(unsigned int inst, int index)
1200 1200
1201 inst_base->cond = BITS(inst, 28, 31); 1201 inst_base->cond = BITS(inst, 28, 31);
1202 inst_base->idx = index; 1202 inst_base->idx = index;
1203 inst_base->br = NON_BRANCH; 1203 inst_base->br = TransExtData::NON_BRANCH;
1204 1204
1205 inst_cream->d = BITS(inst, 16, 19)|BIT(inst, 7)<<4; 1205 inst_cream->d = BITS(inst, 16, 19)|BIT(inst, 7)<<4;
1206 inst_cream->t = BITS(inst, 12, 15); 1206 inst_cream->t = BITS(inst, 12, 15);
@@ -1253,7 +1253,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(vmovbrrss)(unsigned int inst, int inde
1253 1253
1254 inst_base->cond = BITS(inst, 28, 31); 1254 inst_base->cond = BITS(inst, 28, 31);
1255 inst_base->idx = index; 1255 inst_base->idx = index;
1256 inst_base->br = NON_BRANCH; 1256 inst_base->br = TransExtData::NON_BRANCH;
1257 1257
1258 inst_cream->to_arm = BIT(inst, 20) == 1; 1258 inst_cream->to_arm = BIT(inst, 20) == 1;
1259 inst_cream->t = BITS(inst, 12, 15); 1259 inst_cream->t = BITS(inst, 12, 15);
@@ -1301,7 +1301,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(vmovbrrd)(unsigned int inst, int index
1301 1301
1302 inst_base->cond = BITS(inst, 28, 31); 1302 inst_base->cond = BITS(inst, 28, 31);
1303 inst_base->idx = index; 1303 inst_base->idx = index;
1304 inst_base->br = NON_BRANCH; 1304 inst_base->br = TransExtData::NON_BRANCH;
1305 1305
1306 inst_cream->to_arm = BIT(inst, 20) == 1; 1306 inst_cream->to_arm = BIT(inst, 20) == 1;
1307 inst_cream->t = BITS(inst, 12, 15); 1307 inst_cream->t = BITS(inst, 12, 15);
@@ -1354,7 +1354,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(vstr)(unsigned int inst, int index)
1354 1354
1355 inst_base->cond = BITS(inst, 28, 31); 1355 inst_base->cond = BITS(inst, 28, 31);
1356 inst_base->idx = index; 1356 inst_base->idx = index;
1357 inst_base->br = NON_BRANCH; 1357 inst_base->br = TransExtData::NON_BRANCH;
1358 1358
1359 inst_cream->single = BIT(inst, 8) == 0; 1359 inst_cream->single = BIT(inst, 8) == 0;
1360 inst_cream->add = BIT(inst, 23); 1360 inst_cream->add = BIT(inst, 23);
@@ -1420,7 +1420,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(vpush)(unsigned int inst, int index)
1420 1420
1421 inst_base->cond = BITS(inst, 28, 31); 1421 inst_base->cond = BITS(inst, 28, 31);
1422 inst_base->idx = index; 1422 inst_base->idx = index;
1423 inst_base->br = NON_BRANCH; 1423 inst_base->br = TransExtData::NON_BRANCH;
1424 1424
1425 inst_cream->single = BIT(inst, 8) == 0; 1425 inst_cream->single = BIT(inst, 8) == 0;
1426 inst_cream->d = (inst_cream->single ? BITS(inst, 12, 15)<<1|BIT(inst, 22) : BITS(inst, 12, 15)|BIT(inst, 22)<<4); 1426 inst_cream->d = (inst_cream->single ? BITS(inst, 12, 15)<<1|BIT(inst, 22) : BITS(inst, 12, 15)|BIT(inst, 22)<<4);
@@ -1495,7 +1495,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(vstm)(unsigned int inst, int index)
1495 1495
1496 inst_base->cond = BITS(inst, 28, 31); 1496 inst_base->cond = BITS(inst, 28, 31);
1497 inst_base->idx = index; 1497 inst_base->idx = index;
1498 inst_base->br = NON_BRANCH; 1498 inst_base->br = TransExtData::NON_BRANCH;
1499 1499
1500 inst_cream->single = BIT(inst, 8) == 0; 1500 inst_cream->single = BIT(inst, 8) == 0;
1501 inst_cream->add = BIT(inst, 23); 1501 inst_cream->add = BIT(inst, 23);
@@ -1580,7 +1580,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(vpop)(unsigned int inst, int index)
1580 1580
1581 inst_base->cond = BITS(inst, 28, 31); 1581 inst_base->cond = BITS(inst, 28, 31);
1582 inst_base->idx = index; 1582 inst_base->idx = index;
1583 inst_base->br = NON_BRANCH; 1583 inst_base->br = TransExtData::NON_BRANCH;
1584 1584
1585 inst_cream->single = BIT(inst, 8) == 0; 1585 inst_cream->single = BIT(inst, 8) == 0;
1586 inst_cream->d = (inst_cream->single ? (BITS(inst, 12, 15)<<1)|BIT(inst, 22) : BITS(inst, 12, 15)|(BIT(inst, 22)<<4)); 1586 inst_cream->d = (inst_cream->single ? (BITS(inst, 12, 15)<<1)|BIT(inst, 22) : BITS(inst, 12, 15)|(BIT(inst, 22)<<4));
@@ -1653,7 +1653,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(vldr)(unsigned int inst, int index)
1653 1653
1654 inst_base->cond = BITS(inst, 28, 31); 1654 inst_base->cond = BITS(inst, 28, 31);
1655 inst_base->idx = index; 1655 inst_base->idx = index;
1656 inst_base->br = NON_BRANCH; 1656 inst_base->br = TransExtData::NON_BRANCH;
1657 1657
1658 inst_cream->single = BIT(inst, 8) == 0; 1658 inst_cream->single = BIT(inst, 8) == 0;
1659 inst_cream->add = BIT(inst, 23); 1659 inst_cream->add = BIT(inst, 23);
@@ -1722,7 +1722,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(vldm)(unsigned int inst, int index)
1722 1722
1723 inst_base->cond = BITS(inst, 28, 31); 1723 inst_base->cond = BITS(inst, 28, 31);
1724 inst_base->idx = index; 1724 inst_base->idx = index;
1725 inst_base->br = NON_BRANCH; 1725 inst_base->br = TransExtData::NON_BRANCH;
1726 1726
1727 inst_cream->single = BIT(inst, 8) == 0; 1727 inst_cream->single = BIT(inst, 8) == 0;
1728 inst_cream->add = BIT(inst, 23); 1728 inst_cream->add = BIT(inst, 23);