yuzu-mirror/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-mirror/unicorn.git synced 2026-04-21 06:13:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed some conflicts

Browse source
This commit is contained in:
xorstream 2017-01-23 11:35:00 +11:00
parent 19a6dc948f
commit cbd0e6056c
11 changed files with 0 additions and 217 deletions
Download patch file Download diff file Expand all files Collapse all files

20
samples/mem_apis.c
View file

@ -20,27 +20,7 @@
#define __STDC_FORMAT_MACROS
<<<<<<< HEAD
=======
// windows specific includes
#ifdef _MSC_VER
#include <io.h>
#include <windows.h>
#define PRIx64 "llX"
#ifdef DYNLOAD
#include "unicorn_dynload.h"
#else // DYNLOAD
#include <unicorn/unicorn.h>
#ifdef _WIN64
#pragma comment(lib, "unicorn_staload64.lib")
#else // _WIN64
#pragma comment(lib, "unicorn_staload.lib")
#endif // _WIN64
#endif // DYNLOAD
// posix specific includes
#else // _MSC_VER
>>>>>>> unicorn-engine/msvc
#include <unicorn/unicorn.h>
#include <string.h>
#include <stdlib.h>

21
samples/sample_arm.c
View file

@ -3,27 +3,6 @@
/* Sample code to demonstrate how to emulate ARM code */
<<<<<<< HEAD
=======
// windows specific
#ifdef _MSC_VER
#include <io.h>
#include <windows.h>
#define PRIx64 "llX"
#ifdef DYNLOAD
#include "unicorn_dynload.h"
#else // DYNLOAD
#include <unicorn/unicorn.h>
#ifdef _WIN64
#pragma comment(lib, "unicorn_staload64.lib")
#else // _WIN64
#pragma comment(lib, "unicorn_staload.lib")
#endif // _WIN64
#endif // DYNLOAD
// posix specific
#else // _MSC_VER
>>>>>>> unicorn-engine/msvc
#include <unicorn/unicorn.h>
#include <string.h>

21
samples/sample_arm64.c
View file

@ -3,27 +3,6 @@
/* Sample code to demonstrate how to emulate ARM64 code */
<<<<<<< HEAD
=======
// windows specific
#ifdef _MSC_VER
#include <io.h>
#include <windows.h>
#define PRIx64 "llX"
#ifdef DYNLOAD
#include "unicorn_dynload.h"
#else // DYNLOAD
#include <unicorn/unicorn.h>
#ifdef _WIN64
#pragma comment(lib, "unicorn_staload64.lib")
#else // _WIN64
#pragma comment(lib, "unicorn_staload.lib")
#endif // _WIN64
#endif // DYNLOAD
// posix specific
#else // _MSC_VER
>>>>>>> unicorn-engine/msvc
#include <unicorn/unicorn.h>
#include <string.h>

6
samples/sample_batch_reg.c
View file

@ -1,9 +1,3 @@
<<<<<<< HEAD
=======
#include <stdio.h>
#include <string.h>
>>>>>>> unicorn-engine/msvc
#include <unicorn/unicorn.h>
#include <string.h>
#include <stdio.h>

21
samples/sample_m68k.c
View file

@ -3,27 +3,6 @@
/* Sample code to demonstrate how to emulate m68k code */
<<<<<<< HEAD
=======
// windows specific
#ifdef _MSC_VER
#include <io.h>
#include <windows.h>
#define PRIx64 "llX"
#ifdef DYNLOAD
#include "unicorn_dynload.h"
#else // DYNLOAD
#include <unicorn/unicorn.h>
#ifdef _WIN64
#pragma comment(lib, "unicorn_staload64.lib")
#else // _WIN64
#pragma comment(lib, "unicorn_staload.lib")
#endif // _WIN64
#endif // DYNLOAD
// posix specific
#else // _MSC_VER
>>>>>>> unicorn-engine/msvc
#include <unicorn/unicorn.h>
#include <string.h>

21
samples/sample_mips.c
View file

@ -3,27 +3,6 @@
/* Sample code to demonstrate how to emulate Mips code (big endian) */
<<<<<<< HEAD
=======
// windows specific
#ifdef _MSC_VER
#include <io.h>
#include <windows.h>
#define PRIx64 "llX"
#ifdef DYNLOAD
#include "unicorn_dynload.h"
#else // DYNLOAD
#include <unicorn/unicorn.h>
#ifdef _WIN64
#pragma comment(lib, "unicorn_staload64.lib")
#else // _WIN64
#pragma comment(lib, "unicorn_staload.lib")
#endif // _WIN64
#endif // DYNLOAD
// posix specific
#else // _MSC_VER
>>>>>>> unicorn-engine/msvc
#include <unicorn/unicorn.h>
#include <string.h>

21
samples/sample_sparc.c
View file

@ -3,27 +3,6 @@
/* Sample code to demonstrate how to emulate Sparc code */
<<<<<<< HEAD
=======
// windows specific
#ifdef _MSC_VER
#include <io.h>
#include <windows.h>
#define PRIx64 "llX"
#ifdef DYNLOAD
#include "unicorn_dynload.h"
#else // DYNLOAD
#include <unicorn/unicorn.h>
#ifdef _WIN64
#pragma comment(lib, "unicorn_staload64.lib")
#else // _WIN64
#pragma comment(lib, "unicorn_staload.lib")
#endif // _WIN64
#endif // DYNLOAD
// posix specific
#else // _MSC_VER
>>>>>>> unicorn-engine/msvc
#include <unicorn/unicorn.h>
#include <string.h>

8
samples/sample_x86_32_gdt_and_seg_regs.c
View file

@ -20,18 +20,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include <unicorn/unicorn.h>
<<<<<<< HEAD
=======
#include <assert.h>
>>>>>>> unicorn-engine/msvc
#include <string.h>
#include <assert.h>
#include <stdlib.h>
<<<<<<< HEAD
#
=======
>>>>>>> unicorn-engine/msvc
#pragma pack(push, 1)
struct SegmentDescriptor {
union {

21
samples/shellcode.c
View file

@ -3,27 +3,6 @@
/* Sample code to trace code with Linux code with syscall */
<<<<<<< HEAD
=======
// windows specific
#ifdef _MSC_VER
#include <io.h>
#include <windows.h>
#define PRIx64 "llX"
#ifdef DYNLOAD
#include "unicorn_dynload.h"
#else // DYNLOAD
#include <unicorn/unicorn.h>
#ifdef _WIN64
#pragma comment(lib, "unicorn_staload64.lib")
#else // _WIN64
#pragma comment(lib, "unicorn_staload.lib")
#endif // _WIN64
#endif // DYNLOAD
// posix specific
#else // _MSC_VER
>>>>>>> unicorn-engine/msvc
#include <unicorn/unicorn.h>
#include <string.h>