Connected Jakstab to the Capstone library to replace Jakstab's dissembler component

.gitignore

@@ -2,3 +2,5 @@
 *.dot
 *_jak.asm
 *.pdf
+.idea/
+Jakstab.iml

jakstab

@@ -1,6 +1,6 @@
 #!/bin/bash
 JS_HOME="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-JSCLASSPATH=${JS_HOME}/lib/antlr.jar:${JS_HOME}/lib/google-collect-1.0.jar:lib/javabdd-1.0b2.jar:${JS_HOME}/bin
+JSCLASSPATH=${JS_HOME}/lib/antlr.jar:${JS_HOME}/lib/google-collect-1.0.jar:lib/javabdd-1.0b2.jar:${JS_HOME}/bin:${JS_HOME}/lib/capstone.jar:${JS_HOME}/lib/jna-4.4.0.jar
 case `uname` in
     CYGWIN*)
         JSCLASSPATH=`cygpath -p -w -m -s "$JSCLASSPATH"`

src/org/jakstab/Program.java

@@ -402,7 +402,8 @@ public final Instruction getInstruction(AbsoluteAddress address) {
 						logger.error("Requested instruction outside code section: " + address);
 						return null;
 					}
-					instr = module.getDisassembler().decodeInstruction(fp);
+					instr = module.getDisassembler().decodeInstruction(fp, address.getValue());
+					//logger.warn("TT: " + fp + " " + address);
 					if (instr == null) {
 						logger.error("Instruction could not be disassembled at: " + address);
 					}

src/org/jakstab/asm/AbsoluteAddress.java

@@ -94,8 +94,6 @@ public boolean equals(Object obj) {
 		if (getClass() != obj.getClass())
 			return false;
 		AbsoluteAddress other = (AbsoluteAddress) obj;
-		if (value != other.value)
-			return false;
-		return true;
+		return (value == other.value);
 	}
 }

src/org/jakstab/asm/AbstractInstruction.java

@@ -42,6 +42,8 @@ public abstract class AbstractInstruction implements Instruction {
 	 * @param name the instruction mnemonic.
 	 */
 	public AbstractInstruction(String name) {
+		if (name.contains(" "))//TODO-Dom Actually replace with real code this hack is worse than before
+			name = name.split(" ")[1];
 		this.name = name;
 	}
 
@@ -52,4 +54,6 @@ public String getName() {
 	public String toString(long currentPc, SymbolFinder symFinder) {
 		return name;
 	}
+
 }
+

src/org/jakstab/asm/DataType.java

@@ -57,7 +57,7 @@ public enum DataType {
 
 	private int bits;
 
-	private DataType(int bits) {
+	DataType(int bits) {
 		this.bits = bits;
 	}
 

src/org/jakstab/asm/Register.java

@@ -54,13 +54,13 @@ public Register(int number) {
 	 * Returns the total number of available registers on this platform
 	 */
 	public abstract int getNumberOfRegisters();
-
-	/**
+/*
+	*//**
 	 * Returns whether this register has a valid code number.
-	 */
+	 *//*
 	public boolean isValid() {
 		return ((0 <= number) && (number <= getNumberOfRegisters()));
-	}
+	}*/
 
 	/**
 	 * Returns the code of this register as it appears in instructions.

src/org/jakstab/asm/x86/X86ControlRegisters.java

@@ -30,6 +30,7 @@
 
 package org.jakstab.asm.x86;
 
+import capstone.X86_const;
 import org.jakstab.util.Logger;
 
 /**
@@ -52,11 +53,11 @@ public class X86ControlRegisters {
 	private static X86ControlRegister controlRegisters[];
 
 	static {
-		CR0 = new X86ControlRegister(0, "%cr0");
-		INVALID = new X86ControlRegister(1, "Invalid Control Register");
-		CR2 = new X86ControlRegister(2, "%cr2");
-		CR3 = new X86ControlRegister(3, "%cr3");
-		CR4 = new X86ControlRegister(4, "%cr4");
+		CR0 = new X86ControlRegister(X86_const.X86_REG_CR0, "%cr0");
+		INVALID = new X86ControlRegister(X86_const.X86_REG_CR1, "Invalid Control Register");//Not sure if capstone would output CR1 or invalid must test.
+		CR2 = new X86ControlRegister(X86_const.X86_REG_CR2, "%cr2");
+		CR3 = new X86ControlRegister(X86_const.X86_REG_CR3, "%cr3");
+		CR4 = new X86ControlRegister(X86_const.X86_REG_CR4, "%cr4");
 
 		controlRegisters = (new X86ControlRegister[] {
 				CR0, INVALID, CR2, CR3, CR4

src/org/jakstab/asm/x86/X86FloatRegister.java

@@ -33,17 +33,18 @@
 import org.jakstab.asm.Register;
 
 public class X86FloatRegister extends Register {
-
-   public X86FloatRegister(int number) {
+   protected String name;
+   public X86FloatRegister(int number, String name) {
       super(number);
+      this.name = name;
    }
 
    public int getNumber() {
       return number;
    }
 
    public int getNumberOfRegisters() {
-      return X86FloatRegisters.getNumRegisters();
+      return 8;//X86FloatRegisters.getNumRegisters();
    }
 
    public boolean isFloat() {
@@ -58,12 +59,14 @@ public boolean isStackPointer() {
       return false;
    }
 
-   public boolean isValid() {
-      return number >= 0 && number < X86FloatRegisters.getNumRegisters();
-   }
+/*   public boolean isValid() {
+      return  true;//TODO-Dom temporary fix
+      //return number >= 0 && number < X86FloatRegisters.getNumRegisters();
+   }*/
 
    public String toString() {
-      return X86FloatRegisters.getRegisterName(number);
+      return name;
+      //return X86FloatRegisters.getRegisterName(number);
    }
 
 }

src/org/jakstab/asm/x86/X86Instruction.java

@@ -195,7 +195,7 @@ public Instruction evaluate(Context ctx) {
 		if (!changed) 
 			return this;
 		else {
-			X86Instruction inst = null;
+			X86Instruction inst;
 			try {
 				inst = (X86Instruction) super.clone();
 				inst.operands = new Operand[inst.operands.length];

src/org/jakstab/asm/x86/X86InstructionFactory.java

@@ -76,4 +76,6 @@ public interface X86InstructionFactory {
 
 	public X86Instruction newGeneralInstruction(String name, Operand op1, int size, int prefixes);
 
+	public X86Instruction newGeneralInstruction(String name, int size, int prefixes);
+
 }

src/org/jakstab/asm/x86/X86InstructionFactoryImpl.java

@@ -106,5 +106,9 @@ public X86Instruction newGeneralInstruction(String name, Operand op1, int size,
 		return new X86Instruction(name, op1, size, prefixes);
 	}
 
+	@Override
+	public X86Instruction newGeneralInstruction(String name, int size, int prefixes) {
+		return new X86Instruction(name, size, prefixes);
+	}
 }
 

src/org/jakstab/asm/x86/X86MMXRegisters.java

@@ -30,6 +30,7 @@
 
 package org.jakstab.asm.x86;
 
+import capstone.X86_const;
 import org.jakstab.util.Logger;
 
 public class X86MMXRegisters {
@@ -50,14 +51,14 @@ public class X86MMXRegisters {
 	private static X86MMXRegister mmxRegisters[];
 
 	static {
-		MM0 = new X86MMXRegister(0, "%mm0");
-		MM1 = new X86MMXRegister(1, "%mm1");
-		MM2 = new X86MMXRegister(2, "%mm2");
-		MM3 = new X86MMXRegister(3, "%mm3");
-		MM4 = new X86MMXRegister(4, "%mm4");
-		MM5 = new X86MMXRegister(5, "%mm5");
-		MM6 = new X86MMXRegister(6, "%mm6");
-		MM7 = new X86MMXRegister(7, "%mm7");
+		MM0 = new X86MMXRegister(X86_const.X86_REG_MM0, "%mm0");
+		MM1 = new X86MMXRegister(X86_const.X86_REG_MM1, "%mm1");
+		MM2 = new X86MMXRegister(X86_const.X86_REG_MM2, "%mm2");
+		MM3 = new X86MMXRegister(X86_const.X86_REG_MM3, "%mm3");
+		MM4 = new X86MMXRegister(X86_const.X86_REG_MM4, "%mm4");
+		MM5 = new X86MMXRegister(X86_const.X86_REG_MM5, "%mm5");
+		MM6 = new X86MMXRegister(X86_const.X86_REG_MM6, "%mm6");
+		MM7 = new X86MMXRegister(X86_const.X86_REG_MM7, "%mm7");
 
 		mmxRegisters = (new X86MMXRegister[] {
 				MM0, MM1, MM2, MM3, MM4, MM5, MM6, MM7

src/org/jakstab/asm/x86/X86MemoryOperand.java

@@ -54,15 +54,19 @@ public X86SegmentRegister getSegmentRegister() {
 	}
 
 	public X86MemoryOperand(DataType dataType, X86SegmentRegister segReg, X86Register base, X86Register index, long disp, int scale) {
-		super(dataType, base, index, disp, 1 << scale);
+		super(dataType, base, index, disp, scale);//1 << scale);
 		this.segReg = segReg;
 	}
 
 	public X86MemoryOperand(DataType dataType, X86SegmentRegister segReg, X86Register base, X86Register index, long disp) {
 		this(dataType, segReg, base, index, disp, 0);
 	}
 
-	public X86MemoryOperand(DataType dataType, X86SegmentRegister segReg, X86Register base) {
+	public X86MemoryOperand(DataType dataType, X86SegmentRegister segReg, X86Register base, long disp){//Dom- Added long disp instead of assuming 0
+		this(dataType, segReg, base, null, disp, 0);
+	}
+
+	public X86MemoryOperand(DataType dataType, X86SegmentRegister segReg, X86Register base){//Dom- Added long disp instead of assuming 0
 		this(dataType, segReg, base, null, 0, 0);
 	}
 

src/org/jakstab/asm/x86/X86PCRelativeAddress.java

@@ -62,7 +62,6 @@ public long getEffectiveValue(long pcValue) {
 	 * @return the target's displacement from the start of the next instruction.
 	 */
 	public long getDisplacement() {
-		long displacement = super.getDisplacement();
-		return displacement;
+		return super.getDisplacement();
 	}
 }