mirror of
https://github.com/yuzu-mirror/unicorn.git
synced 2026-04-04 14:07:42 +00:00
fix merge conflicts
This commit is contained in:
commit
c01dcf0a14
41 changed files with 543 additions and 109 deletions
|
|
@ -254,7 +254,8 @@ public interface X86Const {
|
|||
public static final int UC_X86_REG_TR = 245;
|
||||
public static final int UC_X86_REG_FPCW = 246;
|
||||
public static final int UC_X86_REG_FPTAG = 247;
|
||||
public static final int UC_X86_REG_ENDING = 248;
|
||||
public static final int UC_X86_REG_MSR = 248;
|
||||
public static final int UC_X86_REG_ENDING = 249;
|
||||
|
||||
// X86 instructions
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue