Skip to content
Snippets Groups Projects
Commit d7407490 authored by jdh8d's avatar jdh8d
Browse files

Redoing mem-decl fixes for push/jmp. update somehow erased them.

Former-commit-id: ed994d871f7b51cf28c85e193b95e4882e4df87b
parent a158fa79
No related branches found
No related tags found
No related merge requests found
......@@ -244,7 +244,7 @@ char MasmPrefixes[8][16] = {
char NasmPrefixes[8][8] = {
"byte ", /* GV.MemDecoration == 1 */
"word ", /* GV.MemDecoration == 2 */
" ", /* GV.MemDecoration == 3 */
"dword ", /* GV.MemDecoration == 3 */
"qword ", /* GV.MemDecoration == 4 */
" ", /* GV.MemDecoration == 5 (multibytes) */
"tword ", /* GV.MemDecoration == 6 */
......
......@@ -142,31 +142,12 @@ void get_instruction_targets(FileIR_t *firp)
{
Instruction_t *insn=*it;
DISASM disasm;
memset(&disasm, 0, sizeof(DISASM));
#if 0
disasm.Options = NasmSyntax + PrefixedNumeral;
disasm.Archi = 32;
disasm.EIP = (UIntPtr) insn->GetDataBits().c_str();
disasm.VirtualAddr = insn->GetAddress()->GetVirtualOffset();
#endif
int instr_len = insn->Disassemble(disasm);
assert(instr_len==insn->GetDataBits().size());
/* we are moving the marking of callsite indirects into fix calls
* which has a better notion of whether the callsite indicates an
* indirect branch target at the next instruction
*/
#if 0
/* calls indicate an indirect target, pc+sizeof(instruction) */
if(disasm.Instruction.BranchType==CallType)
{
possible_target(disasm.VirtualAddr+instr_len);
}
else
#endif
/* other branches can't indicate an indirect branch target */
if(disasm.Instruction.BranchType)
continue;
......@@ -177,9 +158,6 @@ void get_instruction_targets(FileIR_t *firp)
handle_argument(&disasm.Argument1);
handle_argument(&disasm.Argument2);
handle_argument(&disasm.Argument3);
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment