45 lines
1.6 KiB
Diff
45 lines
1.6 KiB
Diff
--- dyninst-10.2.0/testsuite-10.1.0/CMakeLists.txt
|
|
+++ dyninst-10.2.0/testsuite-10.1.0/CMakeLists.txt
|
|
@@ -111,7 +111,8 @@
|
|
if(UNIX)
|
|
enable_language(ASM-ATT)
|
|
- if("${DYNINST_PLATFORM}" MATCHES "i386")
|
|
- enable_language(ASM_NASM)
|
|
- endif()
|
|
+# nasm/yasm are deprecated
|
|
+# if("${DYNINST_PLATFORM}" MATCHES "i386")
|
|
+# enable_language(ASM_NASM)
|
|
+# endif()
|
|
elseif(WIN32)
|
|
enable_language(ASM_MASM)
|
|
|
|
--- dyninst-10.2.0/testsuite-10.1.0/src/instruction/test_instruction_farcall.C
|
|
+++ dyninst-10.2.0/testsuite-10.1.0/src/instruction/test_instruction_farcall.C
|
|
@@ -96,21 +96,21 @@ test_results_t test_instruction_farcall_Mutator::executeTest()
|
|
if(decodedInsns.size() != expectedInsns) // six valid, one invalid
|
|
{
|
|
logerror("FAILED: Expected %d instructions, decoded %d\n", expectedInsns, decodedInsns.size());
|
|
- for(std::vector<Instruction::Ptr>::iterator curInsn = decodedInsns.begin();
|
|
+ for(std::vector<Instruction>::iterator curInsn = decodedInsns.begin();
|
|
curInsn != decodedInsns.end();
|
|
++curInsn)
|
|
{
|
|
- logerror("\t%s\t", (*curInsn)->format().c_str());
|
|
- for(unsigned j = 0; j < (*curInsn)->size(); ++j)
|
|
+ logerror("\t%s\t", (*curInsn).format().c_str());
|
|
+ for(unsigned j = 0; j < (*curInsn).size(); ++j)
|
|
{
|
|
- logerror("%x ", (*curInsn)->rawByte(j));
|
|
+ logerror("%x ", (*curInsn).rawByte(j));
|
|
}
|
|
logerror("\n");
|
|
}
|
|
|
|
return FAILED;
|
|
}
|
|
- if(decodedInsns.back() && decodedInsns.back()->isValid())
|
|
+ if(decodedInsns.size() > 0 && decodedInsns.back().isValid())
|
|
{
|
|
logerror("FAILED: Expected instructions to end with an invalid instruction, but they didn't");
|
|
return FAILED;
|