merge msvc with master

This commit is contained in:
Nguyen Anh Quynh
2017-02-24 10:39:36 +08:00
40 changed files with 327 additions and 512 deletions

View File

@ -117,7 +117,10 @@ public interface ArmConst {
public static final int UC_ARM_REG_S29 = 108;
public static final int UC_ARM_REG_S30 = 109;
public static final int UC_ARM_REG_S31 = 110;
public static final int UC_ARM_REG_ENDING = 111;
public static final int UC_ARM_REG_C1_C0_2 = 111;
public static final int UC_ARM_REG_C13_C0_2 = 112;
public static final int UC_ARM_REG_C13_C0_3 = 113;
public static final int UC_ARM_REG_ENDING = 114;
// alias registers
public static final int UC_ARM_REG_R13 = 12;