Prevent the instruction category from being overwritten after a fused call/pop has been recognised (#612)

tetsuo-cpp · web-flow · commit 81f5f96ebb5e · 2022-07-28T13:37:22.000-04:00
* Prevent the instruction category from being overwritten after a
fused call/pop has been recognised

* Move assignment up and remove conditional
diff --git a/lib/Arch/X86/Arch.cpp b/lib/Arch/X86/Arch.cpp
@@ -1046,6 +1046,8 @@ bool X86Arch::DecodeInstruction(uint64_t address, std::string_view inst_bytes,
     return false;
   }
 
+  inst.category = CreateCategory(xedd);
+
   // Look for instruction fusing opportunities. For now, just `call; pop`.
   const char *is_fused_call_pop = nullptr;
   if (len < inst_bytes.size() &&
@@ -1072,7 +1074,6 @@ bool X86Arch::DecodeInstruction(uint64_t address, std::string_view inst_bytes,
     }
   }
 
-  inst.category = CreateCategory(xedd);
   inst.next_pc = address + len + extra_len;
 
   // Fiddle with the size of the bytes.

Original file line number	Diff line number	Diff line change
`@@ -1046,6 +1046,8 @@ bool X86Arch::DecodeInstruction(uint64_t address, std::string_view inst_bytes,`
`1046`	`1046`	`return false;`
`1047`	`1047`	`}`
`1048`	`1048`
	`1049`	`+ inst.category = CreateCategory(xedd);`
	`1050`	`+`
`1049`	`1051`	// Look for instruction fusing opportunities. For now, just `call; pop`.
`1050`	`1052`	`const char *is_fused_call_pop = nullptr;`
`1051`	`1053`	`if (len < inst_bytes.size() &&`
`@@ -1072,7 +1074,6 @@ bool X86Arch::DecodeInstruction(uint64_t address, std::string_view inst_bytes,`
`1072`	`1074`	`}`
`1073`	`1075`	`}`
`1074`	`1076`
`1075`		`- inst.category = CreateCategory(xedd);`
`1076`	`1077`	`inst.next_pc = address + len + extra_len;`
`1077`	`1078`
`1078`	`1079`	`// Fiddle with the size of the bytes.`