GP-0: Post-merge fixes for tests involving assembly.

This commit is contained in:
Dan 2021-04-05 12:17:33 -04:00
parent 28bad6d430
commit d9476f62e7
2 changed files with 12 additions and 5 deletions

View file

@ -386,7 +386,7 @@ public class PopulateDemoTrace extends GhidraScript {
* A call to "exit" results in the immediate termination of the calling thread.
*/
Assembler asm = Assemblers.getAssembler(trace.getFixedProgramView(snap));
InstructionBlock mainBlock = asm.assemble(mainLabel.getAddress(), //
Iterator<Instruction> mainBlock = asm.assemble(mainLabel.getAddress(), //
"PUSH RBP", //
"MOV RBP,RSP", //
"CALL clone", //
@ -404,7 +404,7 @@ public class PopulateDemoTrace extends GhidraScript {
"MOV dword ptr [RSP+8],0x21646c", //
"CALL exit" //
);
mainBlock.forEach(mainInstructions::add);
mainBlock.forEachRemaining(mainInstructions::add);
/**
* Stub out "clone"