summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorGravatar archshift2016-06-10 18:42:08 -0700
committerGravatar archshift2016-06-10 18:42:08 -0700
commiteac4c016cb498e49a0f48803a7ea07be3caf0e1b (patch)
tree9a12d2bfca4b3cca4b5ccb06deee4101ded93f98 /src/core
parentarm_dyncom_interpreter: Rename anonymous enum to TransExtData (diff)
downloadyuzu-eac4c016cb498e49a0f48803a7ea07be3caf0e1b.tar.gz
yuzu-eac4c016cb498e49a0f48803a7ea07be3caf0e1b.tar.xz
yuzu-eac4c016cb498e49a0f48803a7ea07be3caf0e1b.zip
arm_dyncom_interpreter: rename operation functions to fit style guide
Diffstat (limited to 'src/core')
-rw-r--r--src/core/arm/dyncom/arm_dyncom_interpreter.cpp4
-rw-r--r--src/core/arm/dyncom/arm_dyncom_trans.inc64
2 files changed, 34 insertions, 34 deletions
diff --git a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp
index 0e38bef22..acf66b350 100644
--- a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp
+++ b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp
@@ -685,7 +685,7 @@ static inline void *AllocBuffer(unsigned int size) {
685 return (void *)&inst_buf[start]; 685 return (void *)&inst_buf[start];
686} 686}
687 687
688static shtop_fp_t get_shtop(unsigned int inst) { 688static shtop_fp_t GetShifterOp(unsigned int inst) {
689 if (BIT(inst, 25)) { 689 if (BIT(inst, 25)) {
690 return DPO(Immediate); 690 return DPO(Immediate);
691 } else if (BITS(inst, 4, 11) == 0) { 691 } else if (BITS(inst, 4, 11) == 0) {
@@ -710,7 +710,7 @@ static shtop_fp_t get_shtop(unsigned int inst) {
710 return nullptr; 710 return nullptr;
711} 711}
712 712
713static get_addr_fp_t get_calc_addr_op(unsigned int inst) { 713static get_addr_fp_t GetAddressingOp(unsigned int inst) {
714 if (BITS(inst, 24, 27) == 5 && BIT(inst, 21) == 0) { 714 if (BITS(inst, 24, 27) == 5 && BIT(inst, 21) == 0) {
715 return LnSWoUB(ImmediateOffset); 715 return LnSWoUB(ImmediateOffset);
716 } else if (BITS(inst, 24, 27) == 7 && BIT(inst, 21) == 0 && BITS(inst, 4, 11) == 0) { 716 } else if (BITS(inst, 24, 27) == 7 && BIT(inst, 21) == 0 && BITS(inst, 4, 11) == 0) {
diff --git a/src/core/arm/dyncom/arm_dyncom_trans.inc b/src/core/arm/dyncom/arm_dyncom_trans.inc
index 8cc5a4df8..70a585939 100644
--- a/src/core/arm/dyncom/arm_dyncom_trans.inc
+++ b/src/core/arm/dyncom/arm_dyncom_trans.inc
@@ -14,7 +14,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(adc)(unsigned int inst, int index)
14 inst_cream->Rn = BITS(inst, 16, 19); 14 inst_cream->Rn = BITS(inst, 16, 19);
15 inst_cream->Rd = BITS(inst, 12, 15); 15 inst_cream->Rd = BITS(inst, 12, 15);
16 inst_cream->shifter_operand = BITS(inst, 0, 11); 16 inst_cream->shifter_operand = BITS(inst, 0, 11);
17 inst_cream->shtop_func = get_shtop(inst); 17 inst_cream->shtop_func = GetShifterOp(inst);
18 18
19 if (inst_cream->Rd == 15) 19 if (inst_cream->Rd == 15)
20 inst_base->br = TransExtData::INDIRECT_BRANCH; 20 inst_base->br = TransExtData::INDIRECT_BRANCH;
@@ -35,7 +35,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(add)(unsigned int inst, int index)
35 inst_cream->Rn = BITS(inst, 16, 19); 35 inst_cream->Rn = BITS(inst, 16, 19);
36 inst_cream->Rd = BITS(inst, 12, 15); 36 inst_cream->Rd = BITS(inst, 12, 15);
37 inst_cream->shifter_operand = BITS(inst, 0, 11); 37 inst_cream->shifter_operand = BITS(inst, 0, 11);
38 inst_cream->shtop_func = get_shtop(inst); 38 inst_cream->shtop_func = GetShifterOp(inst);
39 39
40 if (inst_cream->Rd == 15) 40 if (inst_cream->Rd == 15)
41 inst_base->br = TransExtData::INDIRECT_BRANCH; 41 inst_base->br = TransExtData::INDIRECT_BRANCH;
@@ -56,7 +56,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(and)(unsigned int inst, int index)
56 inst_cream->Rn = BITS(inst, 16, 19); 56 inst_cream->Rn = BITS(inst, 16, 19);
57 inst_cream->Rd = BITS(inst, 12, 15); 57 inst_cream->Rd = BITS(inst, 12, 15);
58 inst_cream->shifter_operand = BITS(inst, 0, 11); 58 inst_cream->shifter_operand = BITS(inst, 0, 11);
59 inst_cream->shtop_func = get_shtop(inst); 59 inst_cream->shtop_func = GetShifterOp(inst);
60 60
61 if (inst_cream->Rd == 15) 61 if (inst_cream->Rd == 15)
62 inst_base->br = TransExtData::INDIRECT_BRANCH; 62 inst_base->br = TransExtData::INDIRECT_BRANCH;
@@ -97,7 +97,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(bic)(unsigned int inst, int index)
97 inst_cream->Rn = BITS(inst, 16, 19); 97 inst_cream->Rn = BITS(inst, 16, 19);
98 inst_cream->Rd = BITS(inst, 12, 15); 98 inst_cream->Rd = BITS(inst, 12, 15);
99 inst_cream->shifter_operand = BITS(inst, 0, 11); 99 inst_cream->shifter_operand = BITS(inst, 0, 11);
100 inst_cream->shtop_func = get_shtop(inst); 100 inst_cream->shtop_func = GetShifterOp(inst);
101 101
102 if (inst_cream->Rd == 15) 102 if (inst_cream->Rd == 15)
103 inst_base->br = TransExtData::INDIRECT_BRANCH; 103 inst_base->br = TransExtData::INDIRECT_BRANCH;
@@ -208,7 +208,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(cmn)(unsigned int inst, int index)
208 inst_cream->I = BIT(inst, 25); 208 inst_cream->I = BIT(inst, 25);
209 inst_cream->Rn = BITS(inst, 16, 19); 209 inst_cream->Rn = BITS(inst, 16, 19);
210 inst_cream->shifter_operand = BITS(inst, 0, 11); 210 inst_cream->shifter_operand = BITS(inst, 0, 11);
211 inst_cream->shtop_func = get_shtop(inst); 211 inst_cream->shtop_func = GetShifterOp(inst);
212 212
213 return inst_base; 213 return inst_base;
214} 214}
@@ -224,7 +224,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(cmp)(unsigned int inst, int index)
224 inst_cream->I = BIT(inst, 25); 224 inst_cream->I = BIT(inst, 25);
225 inst_cream->Rn = BITS(inst, 16, 19); 225 inst_cream->Rn = BITS(inst, 16, 19);
226 inst_cream->shifter_operand = BITS(inst, 0, 11); 226 inst_cream->shifter_operand = BITS(inst, 0, 11);
227 inst_cream->shtop_func = get_shtop(inst); 227 inst_cream->shtop_func = GetShifterOp(inst);
228 228
229 return inst_base; 229 return inst_base;
230} 230}
@@ -260,7 +260,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(cpy)(unsigned int inst, int index)
260 inst_cream->S = BIT(inst, 20); 260 inst_cream->S = BIT(inst, 20);
261 inst_cream->Rd = BITS(inst, 12, 15); 261 inst_cream->Rd = BITS(inst, 12, 15);
262 inst_cream->shifter_operand = BITS(inst, 0, 11); 262 inst_cream->shifter_operand = BITS(inst, 0, 11);
263 inst_cream->shtop_func = get_shtop(inst); 263 inst_cream->shtop_func = GetShifterOp(inst);
264 264
265 if (inst_cream->Rd == 15) { 265 if (inst_cream->Rd == 15) {
266 inst_base->br = TransExtData::INDIRECT_BRANCH; 266 inst_base->br = TransExtData::INDIRECT_BRANCH;
@@ -281,7 +281,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(eor)(unsigned int inst, int index)
281 inst_cream->Rn = BITS(inst, 16, 19); 281 inst_cream->Rn = BITS(inst, 16, 19);
282 inst_cream->Rd = BITS(inst, 12, 15); 282 inst_cream->Rd = BITS(inst, 12, 15);
283 inst_cream->shifter_operand = BITS(inst, 0, 11); 283 inst_cream->shifter_operand = BITS(inst, 0, 11);
284 inst_cream->shtop_func = get_shtop(inst); 284 inst_cream->shtop_func = GetShifterOp(inst);
285 285
286 if (inst_cream->Rd == 15) 286 if (inst_cream->Rd == 15)
287 inst_base->br = TransExtData::INDIRECT_BRANCH; 287 inst_base->br = TransExtData::INDIRECT_BRANCH;
@@ -307,7 +307,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(ldm)(unsigned int inst, int index)
307 inst_base->br = TransExtData::NON_BRANCH; 307 inst_base->br = TransExtData::NON_BRANCH;
308 308
309 inst_cream->inst = inst; 309 inst_cream->inst = inst;
310 inst_cream->get_addr = get_calc_addr_op(inst); 310 inst_cream->get_addr = GetAddressingOp(inst);
311 311
312 if (BIT(inst, 15)) { 312 if (BIT(inst, 15)) {
313 inst_base->br = TransExtData::INDIRECT_BRANCH; 313 inst_base->br = TransExtData::INDIRECT_BRANCH;
@@ -339,7 +339,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(ldr)(unsigned int inst, int index)
339 inst_base->br = TransExtData::NON_BRANCH; 339 inst_base->br = TransExtData::NON_BRANCH;
340 340
341 inst_cream->inst = inst; 341 inst_cream->inst = inst;
342 inst_cream->get_addr = get_calc_addr_op(inst); 342 inst_cream->get_addr = GetAddressingOp(inst);
343 343
344 if (BITS(inst, 12, 15) == 15) 344 if (BITS(inst, 12, 15) == 15)
345 inst_base->br = TransExtData::INDIRECT_BRANCH; 345 inst_base->br = TransExtData::INDIRECT_BRANCH;
@@ -357,7 +357,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(ldrcond)(unsigned int inst, int index)
357 inst_base->br = TransExtData::NON_BRANCH; 357 inst_base->br = TransExtData::NON_BRANCH;
358 358
359 inst_cream->inst = inst; 359 inst_cream->inst = inst;
360 inst_cream->get_addr = get_calc_addr_op(inst); 360 inst_cream->get_addr = GetAddressingOp(inst);
361 361
362 if (BITS(inst, 12, 15) == 15) 362 if (BITS(inst, 12, 15) == 15)
363 inst_base->br = TransExtData::INDIRECT_BRANCH; 363 inst_base->br = TransExtData::INDIRECT_BRANCH;
@@ -406,7 +406,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(ldrb)(unsigned int inst, int index)
406 inst_base->br = TransExtData::NON_BRANCH; 406 inst_base->br = TransExtData::NON_BRANCH;
407 407
408 inst_cream->inst = inst; 408 inst_cream->inst = inst;
409 inst_cream->get_addr = get_calc_addr_op(inst); 409 inst_cream->get_addr = GetAddressingOp(inst);
410 410
411 return inst_base; 411 return inst_base;
412} 412}
@@ -440,7 +440,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(ldrd)(unsigned int inst, int index)
440 inst_base->br = TransExtData::NON_BRANCH; 440 inst_base->br = TransExtData::NON_BRANCH;
441 441
442 inst_cream->inst = inst; 442 inst_cream->inst = inst;
443 inst_cream->get_addr = get_calc_addr_op(inst); 443 inst_cream->get_addr = GetAddressingOp(inst);
444 444
445 return inst_base; 445 return inst_base;
446} 446}
@@ -480,7 +480,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(ldrh)(unsigned int inst, int index)
480 inst_base->br = TransExtData::NON_BRANCH; 480 inst_base->br = TransExtData::NON_BRANCH;
481 481
482 inst_cream->inst = inst; 482 inst_cream->inst = inst;
483 inst_cream->get_addr = get_calc_addr_op(inst); 483 inst_cream->get_addr = GetAddressingOp(inst);
484 484
485 return inst_base; 485 return inst_base;
486} 486}
@@ -494,7 +494,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(ldrsb)(unsigned int inst, int index)
494 inst_base->br = TransExtData::NON_BRANCH; 494 inst_base->br = TransExtData::NON_BRANCH;
495 495
496 inst_cream->inst = inst; 496 inst_cream->inst = inst;
497 inst_cream->get_addr = get_calc_addr_op(inst); 497 inst_cream->get_addr = GetAddressingOp(inst);
498 498
499 return inst_base; 499 return inst_base;
500} 500}
@@ -508,7 +508,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(ldrsh)(unsigned int inst, int index)
508 inst_base->br = TransExtData::NON_BRANCH; 508 inst_base->br = TransExtData::NON_BRANCH;
509 509
510 inst_cream->inst = inst; 510 inst_cream->inst = inst;
511 inst_cream->get_addr = get_calc_addr_op(inst); 511 inst_cream->get_addr = GetAddressingOp(inst);
512 512
513 return inst_base; 513 return inst_base;
514} 514}
@@ -606,7 +606,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(mov)(unsigned int inst, int index)
606 inst_cream->S = BIT(inst, 20); 606 inst_cream->S = BIT(inst, 20);
607 inst_cream->Rd = BITS(inst, 12, 15); 607 inst_cream->Rd = BITS(inst, 12, 15);
608 inst_cream->shifter_operand = BITS(inst, 0, 11); 608 inst_cream->shifter_operand = BITS(inst, 0, 11);
609 inst_cream->shtop_func = get_shtop(inst); 609 inst_cream->shtop_func = GetShifterOp(inst);
610 610
611 if (inst_cream->Rd == 15) { 611 if (inst_cream->Rd == 15) {
612 inst_base->br = TransExtData::INDIRECT_BRANCH; 612 inst_base->br = TransExtData::INDIRECT_BRANCH;
@@ -694,7 +694,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(mvn)(unsigned int inst, int index)
694 inst_cream->S = BIT(inst, 20); 694 inst_cream->S = BIT(inst, 20);
695 inst_cream->Rd = BITS(inst, 12, 15); 695 inst_cream->Rd = BITS(inst, 12, 15);
696 inst_cream->shifter_operand = BITS(inst, 0, 11); 696 inst_cream->shifter_operand = BITS(inst, 0, 11);
697 inst_cream->shtop_func = get_shtop(inst); 697 inst_cream->shtop_func = GetShifterOp(inst);
698 698
699 if (inst_cream->Rd == 15) { 699 if (inst_cream->Rd == 15) {
700 inst_base->br = TransExtData::INDIRECT_BRANCH; 700 inst_base->br = TransExtData::INDIRECT_BRANCH;
@@ -716,7 +716,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(orr)(unsigned int inst, int index)
716 inst_cream->Rd = BITS(inst, 12, 15); 716 inst_cream->Rd = BITS(inst, 12, 15);
717 inst_cream->Rn = BITS(inst, 16, 19); 717 inst_cream->Rn = BITS(inst, 16, 19);
718 inst_cream->shifter_operand = BITS(inst, 0, 11); 718 inst_cream->shifter_operand = BITS(inst, 0, 11);
719 inst_cream->shtop_func = get_shtop(inst); 719 inst_cream->shtop_func = GetShifterOp(inst);
720 720
721 if (inst_cream->Rd == 15) 721 if (inst_cream->Rd == 15)
722 inst_base->br = TransExtData::INDIRECT_BRANCH; 722 inst_base->br = TransExtData::INDIRECT_BRANCH;
@@ -871,7 +871,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(rfe)(unsigned int inst, int index)
871 inst_base->br = TransExtData::INDIRECT_BRANCH; 871 inst_base->br = TransExtData::INDIRECT_BRANCH;
872 872
873 inst_cream->inst = inst; 873 inst_cream->inst = inst;
874 inst_cream->get_addr = get_calc_addr_op(inst); 874 inst_cream->get_addr = GetAddressingOp(inst);
875 875
876 return inst_base; 876 return inst_base;
877} 877}
@@ -890,7 +890,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(rsb)(unsigned int inst, int index)
890 inst_cream->Rn = BITS(inst, 16, 19); 890 inst_cream->Rn = BITS(inst, 16, 19);
891 inst_cream->Rd = BITS(inst, 12, 15); 891 inst_cream->Rd = BITS(inst, 12, 15);
892 inst_cream->shifter_operand = BITS(inst, 0, 11); 892 inst_cream->shifter_operand = BITS(inst, 0, 11);
893 inst_cream->shtop_func = get_shtop(inst); 893 inst_cream->shtop_func = GetShifterOp(inst);
894 894
895 if (inst_cream->Rd == 15) 895 if (inst_cream->Rd == 15)
896 inst_base->br = TransExtData::INDIRECT_BRANCH; 896 inst_base->br = TransExtData::INDIRECT_BRANCH;
@@ -911,7 +911,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(rsc)(unsigned int inst, int index)
911 inst_cream->Rn = BITS(inst, 16, 19); 911 inst_cream->Rn = BITS(inst, 16, 19);
912 inst_cream->Rd = BITS(inst, 12, 15); 912 inst_cream->Rd = BITS(inst, 12, 15);
913 inst_cream->shifter_operand = BITS(inst, 0, 11); 913 inst_cream->shifter_operand = BITS(inst, 0, 11);
914 inst_cream->shtop_func = get_shtop(inst); 914 inst_cream->shtop_func = GetShifterOp(inst);
915 915
916 if (inst_cream->Rd == 15) 916 if (inst_cream->Rd == 15)
917 inst_base->br = TransExtData::INDIRECT_BRANCH; 917 inst_base->br = TransExtData::INDIRECT_BRANCH;
@@ -970,7 +970,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(sbc)(unsigned int inst, int index)
970 inst_cream->Rn = BITS(inst, 16, 19); 970 inst_cream->Rn = BITS(inst, 16, 19);
971 inst_cream->Rd = BITS(inst, 12, 15); 971 inst_cream->Rd = BITS(inst, 12, 15);
972 inst_cream->shifter_operand = BITS(inst, 0, 11); 972 inst_cream->shifter_operand = BITS(inst, 0, 11);
973 inst_cream->shtop_func = get_shtop(inst); 973 inst_cream->shtop_func = GetShifterOp(inst);
974 974
975 if (inst_cream->Rd == 15) 975 if (inst_cream->Rd == 15)
976 inst_base->br = TransExtData::INDIRECT_BRANCH; 976 inst_base->br = TransExtData::INDIRECT_BRANCH;
@@ -1280,7 +1280,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(srs)(unsigned int inst, int index)
1280 inst_base->br = TransExtData::NON_BRANCH; 1280 inst_base->br = TransExtData::NON_BRANCH;
1281 1281
1282 inst_cream->inst = inst; 1282 inst_cream->inst = inst;
1283 inst_cream->get_addr = get_calc_addr_op(inst); 1283 inst_cream->get_addr = GetAddressingOp(inst);
1284 1284
1285 return inst_base; 1285 return inst_base;
1286} 1286}
@@ -1337,7 +1337,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(stm)(unsigned int inst, int index)
1337 inst_base->br = TransExtData::NON_BRANCH; 1337 inst_base->br = TransExtData::NON_BRANCH;
1338 1338
1339 inst_cream->inst = inst; 1339 inst_cream->inst = inst;
1340 inst_cream->get_addr = get_calc_addr_op(inst); 1340 inst_cream->get_addr = GetAddressingOp(inst);
1341 return inst_base; 1341 return inst_base;
1342} 1342}
1343static ARM_INST_PTR INTERPRETER_TRANSLATE(sxtb)(unsigned int inst, int index) 1343static ARM_INST_PTR INTERPRETER_TRANSLATE(sxtb)(unsigned int inst, int index)
@@ -1365,7 +1365,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(str)(unsigned int inst, int index)
1365 inst_base->br = TransExtData::NON_BRANCH; 1365 inst_base->br = TransExtData::NON_BRANCH;
1366 1366
1367 inst_cream->inst = inst; 1367 inst_cream->inst = inst;
1368 inst_cream->get_addr = get_calc_addr_op(inst); 1368 inst_cream->get_addr = GetAddressingOp(inst);
1369 1369
1370 return inst_base; 1370 return inst_base;
1371} 1371}
@@ -1410,7 +1410,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(strb)(unsigned int inst, int index)
1410 inst_base->br = TransExtData::NON_BRANCH; 1410 inst_base->br = TransExtData::NON_BRANCH;
1411 1411
1412 inst_cream->inst = inst; 1412 inst_cream->inst = inst;
1413 inst_cream->get_addr = get_calc_addr_op(inst); 1413 inst_cream->get_addr = GetAddressingOp(inst);
1414 1414
1415 return inst_base; 1415 return inst_base;
1416} 1416}
@@ -1444,7 +1444,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(strd)(unsigned int inst, int index){
1444 inst_base->br = TransExtData::NON_BRANCH; 1444 inst_base->br = TransExtData::NON_BRANCH;
1445 1445
1446 inst_cream->inst = inst; 1446 inst_cream->inst = inst;
1447 inst_cream->get_addr = get_calc_addr_op(inst); 1447 inst_cream->get_addr = GetAddressingOp(inst);
1448 1448
1449 return inst_base; 1449 return inst_base;
1450} 1450}
@@ -1485,7 +1485,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(strh)(unsigned int inst, int index)
1485 inst_base->br = TransExtData::NON_BRANCH; 1485 inst_base->br = TransExtData::NON_BRANCH;
1486 1486
1487 inst_cream->inst = inst; 1487 inst_cream->inst = inst;
1488 inst_cream->get_addr = get_calc_addr_op(inst); 1488 inst_cream->get_addr = GetAddressingOp(inst);
1489 1489
1490 return inst_base; 1490 return inst_base;
1491} 1491}
@@ -1528,7 +1528,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(sub)(unsigned int inst, int index)
1528 inst_cream->Rn = BITS(inst, 16, 19); 1528 inst_cream->Rn = BITS(inst, 16, 19);
1529 inst_cream->Rd = BITS(inst, 12, 15); 1529 inst_cream->Rd = BITS(inst, 12, 15);
1530 inst_cream->shifter_operand = BITS(inst, 0, 11); 1530 inst_cream->shifter_operand = BITS(inst, 0, 11);
1531 inst_cream->shtop_func = get_shtop(inst); 1531 inst_cream->shtop_func = GetShifterOp(inst);
1532 1532
1533 if (inst_cream->Rd == 15) 1533 if (inst_cream->Rd == 15)
1534 inst_base->br = TransExtData::INDIRECT_BRANCH; 1534 inst_base->br = TransExtData::INDIRECT_BRANCH;
@@ -1641,7 +1641,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(teq)(unsigned int inst, int index)
1641 inst_cream->I = BIT(inst, 25); 1641 inst_cream->I = BIT(inst, 25);
1642 inst_cream->Rn = BITS(inst, 16, 19); 1642 inst_cream->Rn = BITS(inst, 16, 19);
1643 inst_cream->shifter_operand = BITS(inst, 0, 11); 1643 inst_cream->shifter_operand = BITS(inst, 0, 11);
1644 inst_cream->shtop_func = get_shtop(inst); 1644 inst_cream->shtop_func = GetShifterOp(inst);
1645 1645
1646 return inst_base; 1646 return inst_base;
1647} 1647}
@@ -1659,7 +1659,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(tst)(unsigned int inst, int index)
1659 inst_cream->Rn = BITS(inst, 16, 19); 1659 inst_cream->Rn = BITS(inst, 16, 19);
1660 inst_cream->Rd = BITS(inst, 12, 15); 1660 inst_cream->Rd = BITS(inst, 12, 15);
1661 inst_cream->shifter_operand = BITS(inst, 0, 11); 1661 inst_cream->shifter_operand = BITS(inst, 0, 11);
1662 inst_cream->shtop_func = get_shtop(inst); 1662 inst_cream->shtop_func = GetShifterOp(inst);
1663 1663
1664 return inst_base; 1664 return inst_base;
1665} 1665}
HIC SVNT DRACONES