Nguyen Anh Quynh 20b01a6933 fix merge conflict

2016-02-01 12:08:38 +08:00

..

arm_ldst.h

import

2015-08-21 15:04:50 +08:00

arm-semi.c

import

2015-08-21 15:04:50 +08:00

cpu64.c

import

2015-08-21 15:04:50 +08:00

cpu-qom.h

import

2015-08-21 15:04:50 +08:00

cpu.c

handle some errors properly so avoid exit() during initialization. this fixes issue #237

2015-11-12 01:43:41 +08:00

cpu.h

import

2015-08-21 15:04:50 +08:00

crypto_helper.c

import

2015-08-21 15:04:50 +08:00

helper-a64.c

import

2015-08-21 15:04:50 +08:00

helper-a64.h

import

2015-08-21 15:04:50 +08:00

helper.c

import

2015-08-21 15:04:50 +08:00

helper.h

rework code/block tracing

2016-01-22 19:07:50 -08:00

internals.h

import

2015-08-21 15:04:50 +08:00

iwmmxt_helper.c

import

2015-08-21 15:04:50 +08:00

kvm_arm.h

import

2015-08-21 15:04:50 +08:00

kvm-consts.h

import

2015-08-21 15:04:50 +08:00

kvm-stub.c

import

2015-08-21 15:04:50 +08:00

Makefile.objs

import

2015-08-21 15:04:50 +08:00

neon_helper.c

import

2015-08-21 15:04:50 +08:00

op_addsub.h

import

2015-08-21 15:04:50 +08:00

op_helper.c

import

2015-08-21 15:04:50 +08:00

psci.c

import

2015-08-21 15:04:50 +08:00

translate-a64.c

code style

2016-01-26 17:37:48 +08:00

translate.c

rework code/block tracing

2016-01-22 19:07:50 -08:00

translate.h

import

2015-08-21 15:04:50 +08:00

unicorn_aarch64.c

fix merge conflict

2016-02-01 12:08:38 +08:00

unicorn_arm.c

fix merge conflict

2016-02-01 12:08:38 +08:00

unicorn.h

change uch to uc_struct (target-arm)

2015-08-26 09:02:16 -04:00