add x86 mmr handling to java binding

bindings/java/samples/Sample_x86_mmr.java

@@ -0,0 +1,77 @@
+/*
+
+Java bindings for the Unicorn Emulator Engine
+
+Copyright(c) 2016 Chris Eagle
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+version 2 as published by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+*/
+
+/* Sample code to demonstrate how to register read/write API */
+
+import unicorn.*;
+
+public class Sample_x86_mmr {
+
+   static void test_x86_mmr() {
+       // Initialize emulator in X86-32bit mode
+       Unicorn uc;
+       try {
+         uc = new Unicorn(Unicorn.UC_ARCH_X86, Unicorn.UC_MODE_32);
+       } catch (UnicornException uex) {
+          System.out.println("Failed on uc_open() with error returned: " + uex);
+          return;
+       }
+   
+       // map 4k 
+       uc.mem_map(ADDRESS, 0x1000, Unicorn.UC_PROT_ALL);
+
+       X86_MMR ldtr1 = new X86_MMR(0x1111111122222222L, 0x33333333, 0x44444444, (short)0x5555);
+       X86_MMR ldtr2;
+       X86_MMR gdtr1 = new X86_MMR(0x6666666677777777L, 0x88888888, 0x99999999, (short)0xaaaa);
+       X86_MMR gdtr2, gdtr3, gdtr4;
+
+       int eax;
+       
+       // initialize machine registers
+
+       uc.reg_write(Unicorn.UC_X86_REG_LDTR, ldtr1);       
+       uc.reg_write(Unicorn.UC_X86_REG_GDTR, gdtr1);
+       uc.reg_write(Unicorn.UC_X86_REG_EAX, new Long(0xdddddddd));
+      
+       // read the registers back out   
+       eax = (int)((Long)uc.reg_read(Unicorn.UC_X86_REG_EAX)).longValue();
+       ldtr2 = (X86_MMR)uc.reg_read(Unicorn.UC_X86_REG_LDTR);
+       gdtr2 = (X86_MMR)uc.reg_read(Unicorn.UC_X86_REG_GDTR);
+
+       System.out.printf(">>> EAX = 0x%x\n", eax);
+
+       System.out.printf(">>> LDTR.base = 0x%x\n", ldtr2.base);
+       System.out.printf(">>> LDTR.limit = 0x%x\n", ldtr2.limit);
+       System.out.printf(">>> LDTR.flags = 0x%x\n", ldtr2.flags);
+       System.out.printf(">>> LDTR.selector = 0x%x\n\n", ldtr2.selector);
+
+       System.out.printf(">>> GDTR.base = 0x%x\n", gdtr2.base);
+       System.out.printf(">>> GDTR.limit = 0x%x\n", gdtr2.limit);
+   
+       uc.close();
+   }
+
+   public static void main(String args[])
+   {
+      test_x86_mmr();
+   }
+
+}

bindings/java/unicorn/Unicorn.java

@@ -26,6 +26,8 @@ import java.util.*;
 public class Unicorn implements UnicornConst, ArmConst, Arm64Const, M68kConst, SparcConst, MipsConst, X86Const { 
 
    private long eng;
+   private int arch;
+   private int mode;
 
    private long blockHandle = 0;
    private long interruptHandle = 0;
@@ -275,6 +277,38 @@ public class Unicorn implements UnicornConst, ArmConst, Arm64Const, M68kConst, S
       }
    }
 
+/** 
+ * Write to register.
+ *
+ * @param  regid  Register ID that is to be modified.
+ * @param  value  Number containing the new register value
+ */
+   private native void reg_write_num(int regid, Number value) throws UnicornException;
+
+/** 
+ * Write to register.
+ *
+ * @param  regid  Register ID that is to be modified.
+ * @param  value  X86 specific memory management register containing the new register value
+ */
+   private native void reg_write_mmr(int regid, X86_MMR value) throws UnicornException;
+
+/**
+ * Read register value.
+ *
+ * @param regid  Register ID that is to be retrieved.
+ * @return Number containing the requested register value.
+ */
+   private native Number reg_read_num(int regid) throws UnicornException;
+
+/**
+ * Read register value.
+ *
+ * @param regid  Register ID that is to be retrieved.
+ * @return X86_MMR containing the requested register value.
+ */
+   private native Number reg_read_mmr(int regid) throws UnicornException;
+
 /**
  * Native access to uc_open 
  *
@@ -292,6 +326,9 @@ public class Unicorn implements UnicornConst, ArmConst, Arm64Const, M68kConst, S
  *
  */
    public Unicorn(int arch, int mode) throws UnicornException {
+      //remember these in case we need arch specific code
+      this.arch = arch;
+      this.mode = mode;
       eng = open(arch, mode);
       unicorns.put(eng, this);
       allLists.add(blockList);
@@ -369,19 +406,60 @@ public class Unicorn implements UnicornConst, ArmConst, Arm64Const, M68kConst, S
 /** 
  * Write to register.
  *
+ * @deprecated use reg_write(int regid, Object value) instead
  * @param  regid  Register ID that is to be modified.
  * @param  value  Array containing value that will be written into register @regid
  */
+@Deprecated
    public native void reg_write(int regid, byte[] value) throws UnicornException;
 
+/** 
+ * Write to register.
+ *
+ * @param  regid  Register ID that is to be modified.
+ * @param  value  Object containing the new register value. Long, BigInteger, or
+ *                other custom class used to represent register values
+ */
+   public void reg_write(int regid, Object value) throws UnicornException {
+      if (value instanceof Number) {
+         reg_write_num(regid, (Number)value);
+      }
+      else if (arch == UC_ARCH_X86 && value instanceof X86_MMR) {
+         if (regid >= UC_X86_REG_IDTR && regid <= UC_X86_REG_TR) {
+            reg_write_mmr(regid, (X86_MMR)value);
+         }
+      }
+      else {
+         throw new ClassCastException("Invalid value type");
+      }
+   }
+
+/**
+ * Read register value.
+ *
+ * @deprecated use Object reg_write(int regid) instead
+ * @param regid  Register ID that is to be retrieved.
+ * @param regsz  Size of the register being retrieved.
+ * @return Byte array containing the requested register value.
+ */
+@Deprecated
+   public native byte[] reg_read(int regid, int regsz) throws UnicornException;
+
 /**
  * Read register value.
  *
  * @param regid  Register ID that is to be retrieved.
- * @param regsz  Size of the register being retrieved.
- * @return Byte array containing the requested register value.
+ * @return Object containing the requested register value. Long, BigInteger, or
+ *                other custom class used to represent register values
  */
-   public native byte[] reg_read(int regid, int regsz) throws UnicornException;
+   public Object reg_read(int regid) throws UnicornException {
+      if (arch == UC_ARCH_X86 && regid >= UC_X86_REG_IDTR && regid <= UC_X86_REG_TR) {
+         return reg_read_mmr(regid);
+      }
+      else {
+         return reg_read_num(regid);
+      }
+   }
 
 /** 
  * Write to memory.

bindings/java/unicorn/X86_MMR.java

@@ -0,0 +1,46 @@
+/*
+
+Java bindings for the Unicorn Emulator Engine
+
+Copyright(c) 2016 Chris Eagle
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+version 2 as published by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+*/
+
+package unicorn;
+
+public class X86_MMR {
+
+   public long base;
+   public int limit;
+   public int flags;
+   public short selector;
+
+   public X86_MMR(long base, int limit, int flags, short selector) {
+      this.base = base;
+      this.limit = limit;
+      this.flags = flags;
+      this.selector = selector;
+   }
+
+   public X86_MMR(long base, int limit) {
+      this.base = base;
+      this.limit = limit;
+      selector = 0;
+      flags = 0;
+   }
+
+}
+

bindings/java/unicorn_Unicorn.c

@@ -24,8 +24,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <stdlib.h>
 #include <string.h>
 
-
 #include <unicorn/unicorn.h>
+#include <unicorn/x86.h>
 #include "unicorn_Unicorn.h"
 
 //cache jmethodID values as we look them up
@@ -201,6 +201,117 @@ static uc_engine *getEngine(JNIEnv *env, jobject self) {
    return (uc_engine *)(*env)->GetLongField(env, self, fid);
 }
 
+/*
+ * Class:     unicorn_Unicorn
+ * Method:    reg_write_num
+ * Signature: (ILjava/lang/Number;)V
+ */
+JNIEXPORT void JNICALL Java_unicorn_Unicorn_reg_1write_1num
+  (JNIEnv *env, jobject self, jint regid, jobject value) {
+   uc_engine *eng = getEngine(env, self);
+
+   jclass clz = (*env)->FindClass(env, "java/lang/Number");
+   if ((*env)->ExceptionCheck(env)) {
+      return;
+   }
+
+   jmethodID longValue = (*env)->GetMethodID(env, clz, "longValue", "()J");
+   jlong longVal = (*env)->CallLongMethod(env, value, longValue);
+   uc_err err = uc_reg_write(eng, regid, &longVal);
+   if (err != UC_ERR_OK) {
+      throwException(env, err);
+   }
+}
+
+/*
+ * Class:     unicorn_Unicorn
+ * Method:    reg_write_mmr
+ * Signature: (ILunicorn/X86_MMR;)V
+ */
+JNIEXPORT void JNICALL Java_unicorn_Unicorn_reg_1write_1mmr
+  (JNIEnv *env, jobject self, jint regid, jobject value) {
+   uc_engine *eng = getEngine(env, self);
+   uc_x86_mmr mmr;
+
+   jclass clz = (*env)->FindClass(env, "unicorn/X86_MMR");
+   if ((*env)->ExceptionCheck(env)) {
+      return;
+   }
+
+   jfieldID fid = (*env)->GetFieldID(env, clz, "base", "J");
+   mmr.base = (uint64_t)(*env)->GetLongField(env, value, fid);
+
+   fid = (*env)->GetFieldID(env, clz, "limit", "I");
+   mmr.limit = (uint32_t)(*env)->GetLongField(env, value, fid);
+
+   fid = (*env)->GetFieldID(env, clz, "flags", "I");
+   mmr.flags = (uint32_t)(*env)->GetLongField(env, value, fid);
+
+   fid = (*env)->GetFieldID(env, clz, "selector", "S");
+   mmr.selector = (uint16_t)(*env)->GetLongField(env, value, fid);
+
+   uc_err err = uc_reg_write(eng, regid, &mmr);
+   if (err != UC_ERR_OK) {
+      throwException(env, err);
+   }
+}
+
+/*
+ * Class:     unicorn_Unicorn
+ * Method:    reg_read_num
+ * Signature: (I)Ljava/lang/Number;
+ */
+JNIEXPORT jobject JNICALL Java_unicorn_Unicorn_reg_1read_1num
+  (JNIEnv *env, jobject self, jint regid) {
+   uc_engine *eng = getEngine(env, self);
+
+   jclass clz = (*env)->FindClass(env, "java/lang/Long");
+   if ((*env)->ExceptionCheck(env)) {
+      return NULL;
+   }
+
+   jlong longVal;
+   uc_err err = uc_reg_read(eng, regid, &longVal);
+   if (err != UC_ERR_OK) {
+      throwException(env, err);
+   }
+
+   jmethodID cons = (*env)->GetMethodID(env, clz, "<init>", "(J)V");
+   jobject result = (*env)->NewObject(env, clz, cons, longVal);
+   if ((*env)->ExceptionCheck(env)) {
+      return NULL;
+   }
+   return result;
+}
+
+/*
+ * Class:     unicorn_Unicorn
+ * Method:    reg_read_mmr
+ * Signature: (I)Ljava/lang/Number;
+ */
+JNIEXPORT jobject JNICALL Java_unicorn_Unicorn_reg_1read_1mmr
+  (JNIEnv *env, jobject self, jint regid) {
+   uc_engine *eng = getEngine(env, self);
+
+   jclass clz = (*env)->FindClass(env, "unicorn/X86_MMR");
+   if ((*env)->ExceptionCheck(env)) {
+      return NULL;
+   }
+
+   uc_x86_mmr mmr;
+   uc_err err = uc_reg_read(eng, regid, &mmr);
+   if (err != UC_ERR_OK) {
+      throwException(env, err);
+   }
+
+   jmethodID cons = (*env)->GetMethodID(env, clz, "<init>", "(JIIS)V");
+   jobject result = (*env)->NewObject(env, clz, cons, mmr.base, mmr.limit, mmr.flags, mmr.selector);
+   if ((*env)->ExceptionCheck(env)) {
+      return NULL;
+   }
+   return result;
+}
+
 /*
  * Class:     unicorn_Unicorn
  * Method:    open