mirror of
https://github.com/yuzu-emu/unicorn.git
synced 2025-01-03 16:05:47 +00:00
Merge branch 'master' into a64
This commit is contained in:
commit
0109cd6c8a
|
@ -12,7 +12,7 @@ module Common =
|
||||||
let UC_VERSION_MAJOR = 1
|
let UC_VERSION_MAJOR = 1
|
||||||
|
|
||||||
let UC_VERSION_MINOR = 0
|
let UC_VERSION_MINOR = 0
|
||||||
let UC_VERSION_EXTRA = 1
|
let UC_VERSION_EXTRA = 2
|
||||||
let UC_SECOND_SCALE = 1000000
|
let UC_SECOND_SCALE = 1000000
|
||||||
let UC_MILISECOND_SCALE = 1000
|
let UC_MILISECOND_SCALE = 1000
|
||||||
let UC_ARCH_ARM = 1
|
let UC_ARCH_ARM = 1
|
||||||
|
|
|
@ -7,7 +7,7 @@ const (
|
||||||
VERSION_MAJOR = 1
|
VERSION_MAJOR = 1
|
||||||
|
|
||||||
VERSION_MINOR = 0
|
VERSION_MINOR = 0
|
||||||
VERSION_EXTRA = 1
|
VERSION_EXTRA = 2
|
||||||
SECOND_SCALE = 1000000
|
SECOND_SCALE = 1000000
|
||||||
MILISECOND_SCALE = 1000
|
MILISECOND_SCALE = 1000
|
||||||
ARCH_ARM = 1
|
ARCH_ARM = 1
|
||||||
|
|
|
@ -9,7 +9,7 @@ public interface UnicornConst {
|
||||||
public static final int UC_VERSION_MAJOR = 1;
|
public static final int UC_VERSION_MAJOR = 1;
|
||||||
|
|
||||||
public static final int UC_VERSION_MINOR = 0;
|
public static final int UC_VERSION_MINOR = 0;
|
||||||
public static final int UC_VERSION_EXTRA = 1;
|
public static final int UC_VERSION_EXTRA = 2;
|
||||||
public static final int UC_SECOND_SCALE = 1000000;
|
public static final int UC_SECOND_SCALE = 1000000;
|
||||||
public static final int UC_MILISECOND_SCALE = 1000;
|
public static final int UC_MILISECOND_SCALE = 1000;
|
||||||
public static final int UC_ARCH_ARM = 1;
|
public static final int UC_ARCH_ARM = 1;
|
||||||
|
|
|
@ -7,7 +7,7 @@ module Unicorn
|
||||||
UC_VERSION_MAJOR = 1
|
UC_VERSION_MAJOR = 1
|
||||||
|
|
||||||
UC_VERSION_MINOR = 0
|
UC_VERSION_MINOR = 0
|
||||||
UC_VERSION_EXTRA = 1
|
UC_VERSION_EXTRA = 2
|
||||||
UC_SECOND_SCALE = 1000000
|
UC_SECOND_SCALE = 1000000
|
||||||
UC_MILISECOND_SCALE = 1000
|
UC_MILISECOND_SCALE = 1000
|
||||||
UC_ARCH_ARM = 1
|
UC_ARCH_ARM = 1
|
||||||
|
|
Loading…
Reference in a new issue