summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Albert2014-11-28 01:17:03 -0600
committerDan Albert2014-11-28 14:30:46 -0600
commitfd1c060eaa640d6801b6d42e714a66bb2e6afac8 (patch)
treec37de4ed030f8bc2917e362f25cbc92071637d9b /libpixelflinger
parent809965cc363dfa2a53bfc5bb2f4d14f7f467add8 (diff)
downloadplatform-system-core-fd1c060eaa640d6801b6d42e714a66bb2e6afac8.tar.gz
platform-system-core-fd1c060eaa640d6801b6d42e714a66bb2e6afac8.tar.xz
platform-system-core-fd1c060eaa640d6801b6d42e714a66bb2e6afac8.zip
Fix build.
More UD literals that weren't caught by hammerhead... Change-Id: I6b0abdeef41d1f40c2fe86843b5149925ff6356e
Diffstat (limited to 'libpixelflinger')
-rw-r--r--libpixelflinger/tests/arch-arm64/assembler/arm64_assembler_test.cpp21
1 files changed, 11 insertions, 10 deletions
diff --git a/libpixelflinger/tests/arch-arm64/assembler/arm64_assembler_test.cpp b/libpixelflinger/tests/arch-arm64/assembler/arm64_assembler_test.cpp
index fd96f7ebc..5f5879784 100644
--- a/libpixelflinger/tests/arch-arm64/assembler/arm64_assembler_test.cpp
+++ b/libpixelflinger/tests/arch-arm64/assembler/arm64_assembler_test.cpp
@@ -493,16 +493,17 @@ void dataOpTest(dataOpTest_t test, ARMAssemblerInterface *a64asm, uint32_t Rd =
493 if(i == Rd) continue; 493 if(i == Rd) continue;
494 if(regs[i] != savedRegs[i]) 494 if(regs[i] != savedRegs[i])
495 { 495 {
496 printf("Test %x failed Reg(%d) tampered Expected(0x%"PRIx64")," 496 printf("Test %x failed Reg(%d) tampered Expected(0x%" PRIx64 "),"
497 "Actual(0x%"PRIx64") t\n", test.id, i, savedRegs[i], regs[i]); 497 "Actual(0x%" PRIx64 ") t\n", test.id, i, savedRegs[i],
498 regs[i]);
498 return; 499 return;
499 } 500 }
500 } 501 }
501 502
502 if(test.checkRd == 1 && (uint64_t)regs[Rd] != test.postRdValue) 503 if(test.checkRd == 1 && (uint64_t)regs[Rd] != test.postRdValue)
503 { 504 {
504 printf("Test %x failed, Expected(%"PRIx64"), Actual(%"PRIx64")\n", 505 printf("Test %x failed, Expected(%" PRIx64 "), Actual(%" PRIx64 ")\n",
505 test.id, test.postRdValue, regs[Rd]); 506 test.id, test.postRdValue, regs[Rd]);
506 } 507 }
507 else if(test.checkFlag == 1 && flags[test.postFlag] == 0) 508 else if(test.checkFlag == 1 && flags[test.postFlag] == 0)
508 { 509 {
@@ -610,7 +611,7 @@ void dataTransferTest(dataTransferTest_t test, ARMAssemblerInterface *a64asm,
610 if(regs[i] != savedRegs[i]) 611 if(regs[i] != savedRegs[i])
611 { 612 {
612 printf("Test %x failed Reg(%d) tampered" 613 printf("Test %x failed Reg(%d) tampered"
613 " Expected(0x%"PRIx64"), Actual(0x%"PRIx64") t\n", 614 " Expected(0x%" PRIx64 "), Actual(0x%" PRIx64 ") t\n",
614 test.id, i, savedRegs[i], regs[i]); 615 test.id, i, savedRegs[i], regs[i]);
615 return; 616 return;
616 } 617 }
@@ -619,13 +620,13 @@ void dataTransferTest(dataTransferTest_t test, ARMAssemblerInterface *a64asm,
619 if((uint64_t)regs[Rd] != test.postRdValue) 620 if((uint64_t)regs[Rd] != test.postRdValue)
620 { 621 {
621 printf("Test %x failed, " 622 printf("Test %x failed, "
622 "Expected in Rd(0x%"PRIx64"), Actual(0x%"PRIx64")\n", 623 "Expected in Rd(0x%" PRIx64 "), Actual(0x%" PRIx64 ")\n",
623 test.id, test.postRdValue, regs[Rd]); 624 test.id, test.postRdValue, regs[Rd]);
624 } 625 }
625 else if((uint64_t)regs[Rn] != (uint64_t)(&dataMem[test.postRnValue])) 626 else if((uint64_t)regs[Rn] != (uint64_t)(&dataMem[test.postRnValue]))
626 { 627 {
627 printf("Test %x failed, " 628 printf("Test %x failed, "
628 "Expected in Rn(0x%"PRIx64"), Actual(0x%"PRIx64")\n", 629 "Expected in Rn(0x%" PRIx64 "), Actual(0x%" PRIx64 ")\n",
629 test.id, test.postRnValue, regs[Rn] - (uint64_t)dataMem); 630 test.id, test.postRnValue, regs[Rn] - (uint64_t)dataMem);
630 } 631 }
631 else if(test.checkMem == true) 632 else if(test.checkMem == true)
@@ -638,7 +639,7 @@ void dataTransferTest(dataTransferTest_t test, ARMAssemblerInterface *a64asm,
638 if(value != test.postMemValue) 639 if(value != test.postMemValue)
639 { 640 {
640 printf("Test %x failed, " 641 printf("Test %x failed, "
641 "Expected in Mem(0x%"PRIx64"), Actual(0x%"PRIx64")\n", 642 "Expected in Mem(0x%" PRIx64 "), Actual(0x%" PRIx64 ")\n",
642 test.id, test.postMemValue, value); 643 test.id, test.postMemValue, value);
643 } 644 }
644 else 645 else
@@ -697,8 +698,8 @@ void dataTransferLDMSTM(ARMAssemblerInterface *a64asm)
697 if(regs[j] != j) 698 if(regs[j] != j)
698 { 699 {
699 printf("LDM/STM Test %x failed " 700 printf("LDM/STM Test %x failed "
700 "Reg%d expected(0x%x) Actual(0x%"PRIx64") \n", 701 "Reg%d expected(0x%x) Actual(0x%" PRIx64 ") \n",
701 patterns[i],j,j,regs[j]); 702 patterns[i], j, j, regs[j]);
702 break; 703 break;
703 } 704 }
704 } 705 }