summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar archshift2016-06-08 21:03:49 -0700
committerGravatar archshift2016-06-08 21:03:49 -0700
commita371744575bcec6a92c3bb8801b980530a4443a5 (patch)
treeb621cbc12e9d1bfda6374a099d4d7e3ff36244b5 /src
parentarm_dyncom_interpreter.cpp: Split by translation and interpreter logic (diff)
downloadyuzu-a371744575bcec6a92c3bb8801b980530a4443a5.tar.gz
yuzu-a371744575bcec6a92c3bb8801b980530a4443a5.tar.xz
yuzu-a371744575bcec6a92c3bb8801b980530a4443a5.zip
arm_dyncom_interpreter: rename operation functions to fit style guide
Diffstat (limited to 'src')
-rw-r--r--src/core/arm/dyncom/arm_dyncom_interpreter.cpp6
-rw-r--r--src/core/arm/dyncom/arm_dyncom_trans.cpp78
2 files changed, 42 insertions, 42 deletions
diff --git a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp
index 5f61b0ebb..01d5d478e 100644
--- a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp
+++ b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp
@@ -649,7 +649,7 @@ static void LnSWoUB(ScaledRegisterOffset)(ARMul_State* cpu, unsigned int inst, u
649 virt_addr = addr; 649 virt_addr = addr;
650} 650}
651 651
652shtop_fp_t get_shifter_op(unsigned int inst) { 652shtop_fp_t GetShifterOp(unsigned int inst) {
653 if (BIT(inst, 25)) { 653 if (BIT(inst, 25)) {
654 return DPO(Immediate); 654 return DPO(Immediate);
655 } else if (BITS(inst, 4, 11) == 0) { 655 } else if (BITS(inst, 4, 11) == 0) {
@@ -674,7 +674,7 @@ shtop_fp_t get_shifter_op(unsigned int inst) {
674 return nullptr; 674 return nullptr;
675} 675}
676 676
677get_addr_fp_t get_calc_addr_op(unsigned int inst) { 677get_addr_fp_t GetAddressingOp(unsigned int inst) {
678 if (BITS(inst, 24, 27) == 5 && BIT(inst, 21) == 0) { 678 if (BITS(inst, 24, 27) == 5 && BIT(inst, 21) == 0) {
679 return LnSWoUB(ImmediateOffset); 679 return LnSWoUB(ImmediateOffset);
680 } else if (BITS(inst, 24, 27) == 7 && BIT(inst, 21) == 0 && BITS(inst, 4, 11) == 0) { 680 } else if (BITS(inst, 24, 27) == 7 && BIT(inst, 21) == 0 && BITS(inst, 4, 11) == 0) {
@@ -718,7 +718,7 @@ get_addr_fp_t get_calc_addr_op(unsigned int inst) {
718} 718}
719 719
720// Specialized for LDRT, LDRBT, STRT, and STRBT, which have specific addressing mode requirements 720// Specialized for LDRT, LDRBT, STRT, and STRBT, which have specific addressing mode requirements
721get_addr_fp_t get_calc_addr_op_loadstoret(unsigned int inst) { 721get_addr_fp_t GetAddressingOpLoadStoreT(unsigned int inst) {
722 if (BITS(inst, 25, 27) == 2) { 722 if (BITS(inst, 25, 27) == 2) {
723 return LnSWoUB(ImmediatePostIndexed); 723 return LnSWoUB(ImmediatePostIndexed);
724 } else if (BITS(inst, 25, 27) == 3) { 724 } else if (BITS(inst, 25, 27) == 3) {
diff --git a/src/core/arm/dyncom/arm_dyncom_trans.cpp b/src/core/arm/dyncom/arm_dyncom_trans.cpp
index 8a0146531..7f13ff836 100644
--- a/src/core/arm/dyncom/arm_dyncom_trans.cpp
+++ b/src/core/arm/dyncom/arm_dyncom_trans.cpp
@@ -23,9 +23,9 @@ static FORCE_INLINE void* AllocBuffer(size_t size) {
23#define glue(x, y) x ## y 23#define glue(x, y) x ## y
24#define INTERPRETER_TRANSLATE(s) glue(InterpreterTranslate_, s) 24#define INTERPRETER_TRANSLATE(s) glue(InterpreterTranslate_, s)
25 25
26shtop_fp_t get_shifter_op(unsigned int inst); 26shtop_fp_t GetShifterOp(unsigned int inst);
27get_addr_fp_t get_calc_addr_op(unsigned int inst); 27get_addr_fp_t GetAddressingOp(unsigned int inst);
28get_addr_fp_t get_calc_addr_op_loadstoret(unsigned int inst); 28get_addr_fp_t GetAddressingOpLoadStoreT(unsigned int inst);
29 29
30static ARM_INST_PTR INTERPRETER_TRANSLATE(adc)(unsigned int inst, int index) 30static ARM_INST_PTR INTERPRETER_TRANSLATE(adc)(unsigned int inst, int index)
31{ 31{
@@ -41,7 +41,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(adc)(unsigned int inst, int index)
41 inst_cream->Rn = BITS(inst, 16, 19); 41 inst_cream->Rn = BITS(inst, 16, 19);
42 inst_cream->Rd = BITS(inst, 12, 15); 42 inst_cream->Rd = BITS(inst, 12, 15);
43 inst_cream->shifter_operand = BITS(inst, 0, 11); 43 inst_cream->shifter_operand = BITS(inst, 0, 11);
44 inst_cream->shtop_func = get_shifter_op(inst); 44 inst_cream->shtop_func = GetShifterOp(inst);
45 45
46 if (inst_cream->Rd == 15) 46 if (inst_cream->Rd == 15)
47 inst_base->br = TransExtData::INDIRECT_BRANCH; 47 inst_base->br = TransExtData::INDIRECT_BRANCH;
@@ -62,7 +62,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(add)(unsigned int inst, int index)
62 inst_cream->Rn = BITS(inst, 16, 19); 62 inst_cream->Rn = BITS(inst, 16, 19);
63 inst_cream->Rd = BITS(inst, 12, 15); 63 inst_cream->Rd = BITS(inst, 12, 15);
64 inst_cream->shifter_operand = BITS(inst, 0, 11); 64 inst_cream->shifter_operand = BITS(inst, 0, 11);
65 inst_cream->shtop_func = get_shifter_op(inst); 65 inst_cream->shtop_func = GetShifterOp(inst);
66 66
67 if (inst_cream->Rd == 15) 67 if (inst_cream->Rd == 15)
68 inst_base->br = TransExtData::INDIRECT_BRANCH; 68 inst_base->br = TransExtData::INDIRECT_BRANCH;
@@ -83,7 +83,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(and)(unsigned int inst, int index)
83 inst_cream->Rn = BITS(inst, 16, 19); 83 inst_cream->Rn = BITS(inst, 16, 19);
84 inst_cream->Rd = BITS(inst, 12, 15); 84 inst_cream->Rd = BITS(inst, 12, 15);
85 inst_cream->shifter_operand = BITS(inst, 0, 11); 85 inst_cream->shifter_operand = BITS(inst, 0, 11);
86 inst_cream->shtop_func = get_shifter_op(inst); 86 inst_cream->shtop_func = GetShifterOp(inst);
87 87
88 if (inst_cream->Rd == 15) 88 if (inst_cream->Rd == 15)
89 inst_base->br = TransExtData::INDIRECT_BRANCH; 89 inst_base->br = TransExtData::INDIRECT_BRANCH;
@@ -126,7 +126,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(bic)(unsigned int inst, int index)
126 inst_cream->Rn = BITS(inst, 16, 19); 126 inst_cream->Rn = BITS(inst, 16, 19);
127 inst_cream->Rd = BITS(inst, 12, 15); 127 inst_cream->Rd = BITS(inst, 12, 15);
128 inst_cream->shifter_operand = BITS(inst, 0, 11); 128 inst_cream->shifter_operand = BITS(inst, 0, 11);
129 inst_cream->shtop_func = get_shifter_op(inst); 129 inst_cream->shtop_func = GetShifterOp(inst);
130 130
131 if (inst_cream->Rd == 15) 131 if (inst_cream->Rd == 15)
132 inst_base->br = TransExtData::INDIRECT_BRANCH; 132 inst_base->br = TransExtData::INDIRECT_BRANCH;
@@ -237,7 +237,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(cmn)(unsigned int inst, int index)
237 inst_cream->I = BIT(inst, 25); 237 inst_cream->I = BIT(inst, 25);
238 inst_cream->Rn = BITS(inst, 16, 19); 238 inst_cream->Rn = BITS(inst, 16, 19);
239 inst_cream->shifter_operand = BITS(inst, 0, 11); 239 inst_cream->shifter_operand = BITS(inst, 0, 11);
240 inst_cream->shtop_func = get_shifter_op(inst); 240 inst_cream->shtop_func = GetShifterOp(inst);
241 241
242 return inst_base; 242 return inst_base;
243} 243}
@@ -253,7 +253,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(cmp)(unsigned int inst, int index)
253 inst_cream->I = BIT(inst, 25); 253 inst_cream->I = BIT(inst, 25);
254 inst_cream->Rn = BITS(inst, 16, 19); 254 inst_cream->Rn = BITS(inst, 16, 19);
255 inst_cream->shifter_operand = BITS(inst, 0, 11); 255 inst_cream->shifter_operand = BITS(inst, 0, 11);
256 inst_cream->shtop_func = get_shifter_op(inst); 256 inst_cream->shtop_func = GetShifterOp(inst);
257 257
258 return inst_base; 258 return inst_base;
259} 259}
@@ -289,7 +289,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(cpy)(unsigned int inst, int index)
289 inst_cream->S = BIT(inst, 20); 289 inst_cream->S = BIT(inst, 20);
290 inst_cream->Rd = BITS(inst, 12, 15); 290 inst_cream->Rd = BITS(inst, 12, 15);
291 inst_cream->shifter_operand = BITS(inst, 0, 11); 291 inst_cream->shifter_operand = BITS(inst, 0, 11);
292 inst_cream->shtop_func = get_shifter_op(inst); 292 inst_cream->shtop_func = GetShifterOp(inst);
293 293
294 if (inst_cream->Rd == 15) { 294 if (inst_cream->Rd == 15) {
295 inst_base->br = TransExtData::INDIRECT_BRANCH; 295 inst_base->br = TransExtData::INDIRECT_BRANCH;
@@ -310,7 +310,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(eor)(unsigned int inst, int index)
310 inst_cream->Rn = BITS(inst, 16, 19); 310 inst_cream->Rn = BITS(inst, 16, 19);
311 inst_cream->Rd = BITS(inst, 12, 15); 311 inst_cream->Rd = BITS(inst, 12, 15);
312 inst_cream->shifter_operand = BITS(inst, 0, 11); 312 inst_cream->shifter_operand = BITS(inst, 0, 11);
313 inst_cream->shtop_func = get_shifter_op(inst); 313 inst_cream->shtop_func = GetShifterOp(inst);
314 314
315 if (inst_cream->Rd == 15) 315 if (inst_cream->Rd == 15)
316 inst_base->br = TransExtData::INDIRECT_BRANCH; 316 inst_base->br = TransExtData::INDIRECT_BRANCH;
@@ -336,7 +336,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(ldm)(unsigned int inst, int index)
336 inst_base->br = TransExtData::NON_BRANCH; 336 inst_base->br = TransExtData::NON_BRANCH;
337 337
338 inst_cream->inst = inst; 338 inst_cream->inst = inst;
339 inst_cream->get_addr = get_calc_addr_op(inst); 339 inst_cream->get_addr = GetAddressingOp(inst);
340 340
341 if (BIT(inst, 15)) { 341 if (BIT(inst, 15)) {
342 inst_base->br = TransExtData::INDIRECT_BRANCH; 342 inst_base->br = TransExtData::INDIRECT_BRANCH;
@@ -368,7 +368,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(ldr)(unsigned int inst, int index)
368 inst_base->br = TransExtData::NON_BRANCH; 368 inst_base->br = TransExtData::NON_BRANCH;
369 369
370 inst_cream->inst = inst; 370 inst_cream->inst = inst;
371 inst_cream->get_addr = get_calc_addr_op(inst); 371 inst_cream->get_addr = GetAddressingOp(inst);
372 372
373 if (BITS(inst, 12, 15) == 15) 373 if (BITS(inst, 12, 15) == 15)
374 inst_base->br = TransExtData::INDIRECT_BRANCH; 374 inst_base->br = TransExtData::INDIRECT_BRANCH;
@@ -386,7 +386,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(ldrcond)(unsigned int inst, int index)
386 inst_base->br = TransExtData::NON_BRANCH; 386 inst_base->br = TransExtData::NON_BRANCH;
387 387
388 inst_cream->inst = inst; 388 inst_cream->inst = inst;
389 inst_cream->get_addr = get_calc_addr_op(inst); 389 inst_cream->get_addr = GetAddressingOp(inst);
390 390
391 if (BITS(inst, 12, 15) == 15) 391 if (BITS(inst, 12, 15) == 15)
392 inst_base->br = TransExtData::INDIRECT_BRANCH; 392 inst_base->br = TransExtData::INDIRECT_BRANCH;
@@ -435,7 +435,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(ldrb)(unsigned int inst, int index)
435 inst_base->br = TransExtData::NON_BRANCH; 435 inst_base->br = TransExtData::NON_BRANCH;
436 436
437 inst_cream->inst = inst; 437 inst_cream->inst = inst;
438 inst_cream->get_addr = get_calc_addr_op(inst); 438 inst_cream->get_addr = GetAddressingOp(inst);
439 439
440 return inst_base; 440 return inst_base;
441} 441}
@@ -449,7 +449,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(ldrbt)(unsigned int inst, int index)
449 inst_base->br = TransExtData::NON_BRANCH; 449 inst_base->br = TransExtData::NON_BRANCH;
450 450
451 inst_cream->inst = inst; 451 inst_cream->inst = inst;
452 inst_cream->get_addr = get_calc_addr_op_loadstoret(inst); 452 inst_cream->get_addr = GetAddressingOpLoadStoreT(inst);
453 453
454 return inst_base; 454 return inst_base;
455} 455}
@@ -463,7 +463,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(ldrd)(unsigned int inst, int index)
463 inst_base->br = TransExtData::NON_BRANCH; 463 inst_base->br = TransExtData::NON_BRANCH;
464 464
465 inst_cream->inst = inst; 465 inst_cream->inst = inst;
466 inst_cream->get_addr = get_calc_addr_op(inst); 466 inst_cream->get_addr = GetAddressingOp(inst);
467 467
468 return inst_base; 468 return inst_base;
469} 469}
@@ -503,7 +503,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(ldrh)(unsigned int inst, int index)
503 inst_base->br = TransExtData::NON_BRANCH; 503 inst_base->br = TransExtData::NON_BRANCH;
504 504
505 inst_cream->inst = inst; 505 inst_cream->inst = inst;
506 inst_cream->get_addr = get_calc_addr_op(inst); 506 inst_cream->get_addr = GetAddressingOp(inst);
507 507
508 return inst_base; 508 return inst_base;
509} 509}
@@ -517,7 +517,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(ldrsb)(unsigned int inst, int index)
517 inst_base->br = TransExtData::NON_BRANCH; 517 inst_base->br = TransExtData::NON_BRANCH;
518 518
519 inst_cream->inst = inst; 519 inst_cream->inst = inst;
520 inst_cream->get_addr = get_calc_addr_op(inst); 520 inst_cream->get_addr = GetAddressingOp(inst);
521 521
522 return inst_base; 522 return inst_base;
523} 523}
@@ -531,7 +531,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(ldrsh)(unsigned int inst, int index)
531 inst_base->br = TransExtData::NON_BRANCH; 531 inst_base->br = TransExtData::NON_BRANCH;
532 532
533 inst_cream->inst = inst; 533 inst_cream->inst = inst;
534 inst_cream->get_addr = get_calc_addr_op(inst); 534 inst_cream->get_addr = GetAddressingOp(inst);
535 535
536 return inst_base; 536 return inst_base;
537} 537}
@@ -545,7 +545,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(ldrt)(unsigned int inst, int index)
545 inst_base->br = TransExtData::NON_BRANCH; 545 inst_base->br = TransExtData::NON_BRANCH;
546 546
547 inst_cream->inst = inst; 547 inst_cream->inst = inst;
548 inst_cream->get_addr = get_calc_addr_op_loadstoret(inst); 548 inst_cream->get_addr = GetAddressingOpLoadStoreT(inst);
549 549
550 if (BITS(inst, 12, 15) == 15) { 550 if (BITS(inst, 12, 15) == 15) {
551 inst_base->br = TransExtData::INDIRECT_BRANCH; 551 inst_base->br = TransExtData::INDIRECT_BRANCH;
@@ -618,7 +618,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(mov)(unsigned int inst, int index)
618 inst_cream->S = BIT(inst, 20); 618 inst_cream->S = BIT(inst, 20);
619 inst_cream->Rd = BITS(inst, 12, 15); 619 inst_cream->Rd = BITS(inst, 12, 15);
620 inst_cream->shifter_operand = BITS(inst, 0, 11); 620 inst_cream->shifter_operand = BITS(inst, 0, 11);
621 inst_cream->shtop_func = get_shifter_op(inst); 621 inst_cream->shtop_func = GetShifterOp(inst);
622 622
623 if (inst_cream->Rd == 15) { 623 if (inst_cream->Rd == 15) {
624 inst_base->br = TransExtData::INDIRECT_BRANCH; 624 inst_base->br = TransExtData::INDIRECT_BRANCH;
@@ -706,7 +706,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(mvn)(unsigned int inst, int index)
706 inst_cream->S = BIT(inst, 20); 706 inst_cream->S = BIT(inst, 20);
707 inst_cream->Rd = BITS(inst, 12, 15); 707 inst_cream->Rd = BITS(inst, 12, 15);
708 inst_cream->shifter_operand = BITS(inst, 0, 11); 708 inst_cream->shifter_operand = BITS(inst, 0, 11);
709 inst_cream->shtop_func = get_shifter_op(inst); 709 inst_cream->shtop_func = GetShifterOp(inst);
710 710
711 if (inst_cream->Rd == 15) { 711 if (inst_cream->Rd == 15) {
712 inst_base->br = TransExtData::INDIRECT_BRANCH; 712 inst_base->br = TransExtData::INDIRECT_BRANCH;
@@ -728,7 +728,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(orr)(unsigned int inst, int index)
728 inst_cream->Rd = BITS(inst, 12, 15); 728 inst_cream->Rd = BITS(inst, 12, 15);
729 inst_cream->Rn = BITS(inst, 16, 19); 729 inst_cream->Rn = BITS(inst, 16, 19);
730 inst_cream->shifter_operand = BITS(inst, 0, 11); 730 inst_cream->shifter_operand = BITS(inst, 0, 11);
731 inst_cream->shtop_func = get_shifter_op(inst); 731 inst_cream->shtop_func = GetShifterOp(inst);
732 732
733 if (inst_cream->Rd == 15) 733 if (inst_cream->Rd == 15)
734 inst_base->br = TransExtData::INDIRECT_BRANCH; 734 inst_base->br = TransExtData::INDIRECT_BRANCH;
@@ -883,7 +883,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(rfe)(unsigned int inst, int index)
883 inst_base->br = TransExtData::INDIRECT_BRANCH; 883 inst_base->br = TransExtData::INDIRECT_BRANCH;
884 884
885 inst_cream->inst = inst; 885 inst_cream->inst = inst;
886 inst_cream->get_addr = get_calc_addr_op(inst); 886 inst_cream->get_addr = GetAddressingOp(inst);
887 887
888 return inst_base; 888 return inst_base;
889} 889}
@@ -902,7 +902,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(rsb)(unsigned int inst, int index)
902 inst_cream->Rn = BITS(inst, 16, 19); 902 inst_cream->Rn = BITS(inst, 16, 19);
903 inst_cream->Rd = BITS(inst, 12, 15); 903 inst_cream->Rd = BITS(inst, 12, 15);
904 inst_cream->shifter_operand = BITS(inst, 0, 11); 904 inst_cream->shifter_operand = BITS(inst, 0, 11);
905 inst_cream->shtop_func = get_shifter_op(inst); 905 inst_cream->shtop_func = GetShifterOp(inst);
906 906
907 if (inst_cream->Rd == 15) 907 if (inst_cream->Rd == 15)
908 inst_base->br = TransExtData::INDIRECT_BRANCH; 908 inst_base->br = TransExtData::INDIRECT_BRANCH;
@@ -923,7 +923,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(rsc)(unsigned int inst, int index)
923 inst_cream->Rn = BITS(inst, 16, 19); 923 inst_cream->Rn = BITS(inst, 16, 19);
924 inst_cream->Rd = BITS(inst, 12, 15); 924 inst_cream->Rd = BITS(inst, 12, 15);
925 inst_cream->shifter_operand = BITS(inst, 0, 11); 925 inst_cream->shifter_operand = BITS(inst, 0, 11);
926 inst_cream->shtop_func = get_shifter_op(inst); 926 inst_cream->shtop_func = GetShifterOp(inst);
927 927
928 if (inst_cream->Rd == 15) 928 if (inst_cream->Rd == 15)
929 inst_base->br = TransExtData::INDIRECT_BRANCH; 929 inst_base->br = TransExtData::INDIRECT_BRANCH;
@@ -982,7 +982,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(sbc)(unsigned int inst, int index)
982 inst_cream->Rn = BITS(inst, 16, 19); 982 inst_cream->Rn = BITS(inst, 16, 19);
983 inst_cream->Rd = BITS(inst, 12, 15); 983 inst_cream->Rd = BITS(inst, 12, 15);
984 inst_cream->shifter_operand = BITS(inst, 0, 11); 984 inst_cream->shifter_operand = BITS(inst, 0, 11);
985 inst_cream->shtop_func = get_shifter_op(inst); 985 inst_cream->shtop_func = GetShifterOp(inst);
986 986
987 if (inst_cream->Rd == 15) 987 if (inst_cream->Rd == 15)
988 inst_base->br = TransExtData::INDIRECT_BRANCH; 988 inst_base->br = TransExtData::INDIRECT_BRANCH;
@@ -1292,7 +1292,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(srs)(unsigned int inst, int index)
1292 inst_base->br = TransExtData::NON_BRANCH; 1292 inst_base->br = TransExtData::NON_BRANCH;
1293 1293
1294 inst_cream->inst = inst; 1294 inst_cream->inst = inst;
1295 inst_cream->get_addr = get_calc_addr_op(inst); 1295 inst_cream->get_addr = GetAddressingOp(inst);
1296 1296
1297 return inst_base; 1297 return inst_base;
1298} 1298}
@@ -1349,7 +1349,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(stm)(unsigned int inst, int index)
1349 inst_base->br = TransExtData::NON_BRANCH; 1349 inst_base->br = TransExtData::NON_BRANCH;
1350 1350
1351 inst_cream->inst = inst; 1351 inst_cream->inst = inst;
1352 inst_cream->get_addr = get_calc_addr_op(inst); 1352 inst_cream->get_addr = GetAddressingOp(inst);
1353 return inst_base; 1353 return inst_base;
1354} 1354}
1355static ARM_INST_PTR INTERPRETER_TRANSLATE(sxtb)(unsigned int inst, int index) 1355static ARM_INST_PTR INTERPRETER_TRANSLATE(sxtb)(unsigned int inst, int index)
@@ -1377,7 +1377,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(str)(unsigned int inst, int index)
1377 inst_base->br = TransExtData::NON_BRANCH; 1377 inst_base->br = TransExtData::NON_BRANCH;
1378 1378
1379 inst_cream->inst = inst; 1379 inst_cream->inst = inst;
1380 inst_cream->get_addr = get_calc_addr_op(inst); 1380 inst_cream->get_addr = GetAddressingOp(inst);
1381 1381
1382 return inst_base; 1382 return inst_base;
1383} 1383}
@@ -1422,7 +1422,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(strb)(unsigned int inst, int index)
1422 inst_base->br = TransExtData::NON_BRANCH; 1422 inst_base->br = TransExtData::NON_BRANCH;
1423 1423
1424 inst_cream->inst = inst; 1424 inst_cream->inst = inst;
1425 inst_cream->get_addr = get_calc_addr_op(inst); 1425 inst_cream->get_addr = GetAddressingOp(inst);
1426 1426
1427 return inst_base; 1427 return inst_base;
1428} 1428}
@@ -1436,7 +1436,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(strbt)(unsigned int inst, int index)
1436 inst_base->br = TransExtData::NON_BRANCH; 1436 inst_base->br = TransExtData::NON_BRANCH;
1437 1437
1438 inst_cream->inst = inst; 1438 inst_cream->inst = inst;
1439 inst_cream->get_addr = get_calc_addr_op_loadstoret(inst); 1439 inst_cream->get_addr = GetAddressingOpLoadStoreT(inst);
1440 1440
1441 return inst_base; 1441 return inst_base;
1442} 1442}
@@ -1449,7 +1449,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(strd)(unsigned int inst, int index){
1449 inst_base->br = TransExtData::NON_BRANCH; 1449 inst_base->br = TransExtData::NON_BRANCH;
1450 1450
1451 inst_cream->inst = inst; 1451 inst_cream->inst = inst;
1452 inst_cream->get_addr = get_calc_addr_op(inst); 1452 inst_cream->get_addr = GetAddressingOp(inst);
1453 1453
1454 return inst_base; 1454 return inst_base;
1455} 1455}
@@ -1490,7 +1490,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(strh)(unsigned int inst, int index)
1490 inst_base->br = TransExtData::NON_BRANCH; 1490 inst_base->br = TransExtData::NON_BRANCH;
1491 1491
1492 inst_cream->inst = inst; 1492 inst_cream->inst = inst;
1493 inst_cream->get_addr = get_calc_addr_op(inst); 1493 inst_cream->get_addr = GetAddressingOp(inst);
1494 1494
1495 return inst_base; 1495 return inst_base;
1496} 1496}
@@ -1504,7 +1504,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(strt)(unsigned int inst, int index)
1504 inst_base->br = TransExtData::NON_BRANCH; 1504 inst_base->br = TransExtData::NON_BRANCH;
1505 1505
1506 inst_cream->inst = inst; 1506 inst_cream->inst = inst;
1507 inst_cream->get_addr = get_calc_addr_op_loadstoret(inst); 1507 inst_cream->get_addr = GetAddressingOpLoadStoreT(inst);
1508 1508
1509 return inst_base; 1509 return inst_base;
1510} 1510}
@@ -1522,7 +1522,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(sub)(unsigned int inst, int index)
1522 inst_cream->Rn = BITS(inst, 16, 19); 1522 inst_cream->Rn = BITS(inst, 16, 19);
1523 inst_cream->Rd = BITS(inst, 12, 15); 1523 inst_cream->Rd = BITS(inst, 12, 15);
1524 inst_cream->shifter_operand = BITS(inst, 0, 11); 1524 inst_cream->shifter_operand = BITS(inst, 0, 11);
1525 inst_cream->shtop_func = get_shifter_op(inst); 1525 inst_cream->shtop_func = GetShifterOp(inst);
1526 1526
1527 if (inst_cream->Rd == 15) 1527 if (inst_cream->Rd == 15)
1528 inst_base->br = TransExtData::INDIRECT_BRANCH; 1528 inst_base->br = TransExtData::INDIRECT_BRANCH;
@@ -1635,7 +1635,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(teq)(unsigned int inst, int index)
1635 inst_cream->I = BIT(inst, 25); 1635 inst_cream->I = BIT(inst, 25);
1636 inst_cream->Rn = BITS(inst, 16, 19); 1636 inst_cream->Rn = BITS(inst, 16, 19);
1637 inst_cream->shifter_operand = BITS(inst, 0, 11); 1637 inst_cream->shifter_operand = BITS(inst, 0, 11);
1638 inst_cream->shtop_func = get_shifter_op(inst); 1638 inst_cream->shtop_func = GetShifterOp(inst);
1639 1639
1640 return inst_base; 1640 return inst_base;
1641} 1641}
@@ -1653,7 +1653,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(tst)(unsigned int inst, int index)
1653 inst_cream->Rn = BITS(inst, 16, 19); 1653 inst_cream->Rn = BITS(inst, 16, 19);
1654 inst_cream->Rd = BITS(inst, 12, 15); 1654 inst_cream->Rd = BITS(inst, 12, 15);
1655 inst_cream->shifter_operand = BITS(inst, 0, 11); 1655 inst_cream->shifter_operand = BITS(inst, 0, 11);
1656 inst_cream->shtop_func = get_shifter_op(inst); 1656 inst_cream->shtop_func = GetShifterOp(inst);
1657 1657
1658 return inst_base; 1658 return inst_base;
1659} 1659}
HIC SVNT DRACONES