ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Fix build."

Browse source
This commit is contained in:
Dan Albert 2014-11-28 20:57:18 +00:00 • committed by Gerrit Code Review
commit bc2602068d
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
libpixelflinger/tests/arch-arm64/assembler/arm64_assembler_test.cpp
View file

@ -493,16 +493,17 @@ void dataOpTest(dataOpTest_t test, ARMAssemblerInterface *a64asm, uint32_t Rd =
if(i == Rd) continue; if(i == Rd) continue;
if(regs[i] != savedRegs[i]) if(regs[i] != savedRegs[i])
{ {
printf("Test %x failed Reg(%d) tampered Expected(0x%"PRIx64")," printf("Test %x failed Reg(%d) tampered Expected(0x%" PRIx64 "),"
"Actual(0x%"PRIx64") t\n", test.id, i, savedRegs[i], regs[i]); "Actual(0x%" PRIx64 ") t\n", test.id, i, savedRegs[i],
regs[i]);
return; return;
} }
} }
if(test.checkRd == 1 && (uint64_t)regs[Rd] != test.postRdValue) if(test.checkRd == 1 && (uint64_t)regs[Rd] != test.postRdValue)
{ {
printf("Test %x failed, Expected(%"PRIx64"), Actual(%"PRIx64")\n", printf("Test %x failed, Expected(%" PRIx64 "), Actual(%" PRIx64 ")\n",
test.id, test.postRdValue, regs[Rd]); test.id, test.postRdValue, regs[Rd]);
} }
else if(test.checkFlag == 1 && flags[test.postFlag] == 0) else if(test.checkFlag == 1 && flags[test.postFlag] == 0)
{ {
@ -610,7 +611,7 @@ void dataTransferTest(dataTransferTest_t test, ARMAssemblerInterface *a64asm,
if(regs[i] != savedRegs[i]) if(regs[i] != savedRegs[i])
{ {
printf("Test %x failed Reg(%d) tampered" printf("Test %x failed Reg(%d) tampered"
" Expected(0x%"PRIx64"), Actual(0x%"PRIx64") t\n", " Expected(0x%" PRIx64 "), Actual(0x%" PRIx64 ") t\n",
test.id, i, savedRegs[i], regs[i]); test.id, i, savedRegs[i], regs[i]);
return; return;
} }
@ -619,13 +620,13 @@ void dataTransferTest(dataTransferTest_t test, ARMAssemblerInterface *a64asm,
if((uint64_t)regs[Rd] != test.postRdValue) if((uint64_t)regs[Rd] != test.postRdValue)
{ {
printf("Test %x failed, " printf("Test %x failed, "
"Expected in Rd(0x%"PRIx64"), Actual(0x%"PRIx64")\n", "Expected in Rd(0x%" PRIx64 "), Actual(0x%" PRIx64 ")\n",
test.id, test.postRdValue, regs[Rd]); test.id, test.postRdValue, regs[Rd]);
} }
else if((uint64_t)regs[Rn] != (uint64_t)(&dataMem[test.postRnValue])) else if((uint64_t)regs[Rn] != (uint64_t)(&dataMem[test.postRnValue]))
{ {
printf("Test %x failed, " printf("Test %x failed, "
"Expected in Rn(0x%"PRIx64"), Actual(0x%"PRIx64")\n", "Expected in Rn(0x%" PRIx64 "), Actual(0x%" PRIx64 ")\n",
test.id, test.postRnValue, regs[Rn] - (uint64_t)dataMem); test.id, test.postRnValue, regs[Rn] - (uint64_t)dataMem);
} }
else if(test.checkMem == true) else if(test.checkMem == true)
@ -638,7 +639,7 @@ void dataTransferTest(dataTransferTest_t test, ARMAssemblerInterface *a64asm,
if(value != test.postMemValue) if(value != test.postMemValue)
{ {
printf("Test %x failed, " printf("Test %x failed, "
"Expected in Mem(0x%"PRIx64"), Actual(0x%"PRIx64")\n", "Expected in Mem(0x%" PRIx64 "), Actual(0x%" PRIx64 ")\n",
test.id, test.postMemValue, value); test.id, test.postMemValue, value);
} }
else else
@ -697,8 +698,8 @@ void dataTransferLDMSTM(ARMAssemblerInterface *a64asm)
if(regs[j] != j) if(regs[j] != j)
{ {
printf("LDM/STM Test %x failed " printf("LDM/STM Test %x failed "
"Reg%d expected(0x%x) Actual(0x%"PRIx64") \n", "Reg%d expected(0x%x) Actual(0x%" PRIx64 ") \n",
patterns[i],j,j,regs[j]); patterns[i], j, j, regs[j]);
break; break;
} }
} }