Restructure diffing code & initial 3-way diffing (WIP)

objdiff-core/src/arch/mod.rs

@@ -4,8 +4,8 @@ use anyhow::{bail, Result};
 use object::{Architecture, Object, Relocation, RelocationFlags};
 
 use crate::{
-    diff::{DiffObjConfig, ProcessCodeResult},
-    obj::{ObjReloc, ObjSection},
+    diff::DiffObjConfig,
+    obj::{ObjIns, ObjReloc, ObjSection},
 };
 
 #[cfg(feature = "mips")]
@@ -33,6 +33,11 @@ pub trait ObjArch: Send + Sync {
     fn display_reloc(&self, flags: RelocationFlags) -> Cow<'static, str>;
 }
 
+pub struct ProcessCodeResult {
+    pub ops: Vec<u16>,
+    pub insts: Vec<ObjIns>,
+}
+
 pub fn new_arch(object: &object::File) -> Result<Box<dyn ObjArch>> {
     Ok(match object.architecture() {
         #[cfg(feature = "ppc")]