yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-07-03 11:28:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Chris Eagle 2015-08-25 03:05:48 -07:00
parent a389ec5730 cd0fe763ab
commit 4127d8ad85
7 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -83,3 +83,4 @@ config.log
regress/map_crash regress/map_crash
regress/sigill regress/sigill
regress/sigill2 regress/sigill2
regress/block_test

2
include/uc_priv.h
View file

@ -163,6 +163,8 @@ struct uc_struct {
uint64_t addr_end; // address where emulation stops (@end param of uc_emu_start()) uint64_t addr_end; // address where emulation stops (@end param of uc_emu_start())
int thumb; // thumb mode for ARM int thumb; // thumb mode for ARM
// full TCG cache leads to middle-block break in the last translation?
bool block_full;
}; };
#include "qemu_macro.h" #include "qemu_macro.h"

2
include/unicorn/unicorn.h
View file

@ -121,7 +121,7 @@ typedef enum uc_err {
// Callback function for tracing code (UC_HOOK_CODE & UC_HOOK_BLOCK) // Callback function for tracing code (UC_HOOK_CODE & UC_HOOK_BLOCK)
// @address: address where the code is being executed // @address: address where the code is being executed
// @size: size of machine instruction being executed // @size: size of machine instruction(s) being executed, or 0 when size is unknown
// @user_data: user data passed to tracing APIs. // @user_data: user data passed to tracing APIs.
typedef void (*uc_cb_hookcode_t)(uch handle, uint64_t address, uint32_t size, void *user_data); typedef void (*uc_cb_hookcode_t)(uch handle, uint64_t address, uint32_t size, void *user_data);

8
qemu/target-i386/translate.c
View file

@ -8256,6 +8256,7 @@ static inline void gen_intermediate_code_internal(uint8_t *gen_opc_cc_op,
target_ulong cs_base; target_ulong cs_base;
int num_insns; int num_insns;
int max_insns; int max_insns;
bool block_full = false;
/* generate intermediate code */ /* generate intermediate code */
pc_start = tb->pc; pc_start = tb->pc;
@ -8349,7 +8350,9 @@ static inline void gen_intermediate_code_internal(uint8_t *gen_opc_cc_op,
max_insns = CF_COUNT_MASK; max_insns = CF_COUNT_MASK;
// Unicorn: trace this block on request // Unicorn: trace this block on request
if (env->uc->hook_block) { // Only hook this block if it is not broken from previous translation due to
// full translation cache
if (env->uc->hook_block && !env->uc->block_full) {
struct hook_struct *trace = hook_find((uch)env->uc, UC_HOOK_BLOCK, pc_start); struct hook_struct *trace = hook_find((uch)env->uc, UC_HOOK_BLOCK, pc_start);
if (trace) { if (trace) {
env->uc->block_addr = pc_start; env->uc->block_addr = pc_start;
@ -8407,6 +8410,7 @@ static inline void gen_intermediate_code_internal(uint8_t *gen_opc_cc_op,
num_insns >= max_insns) { num_insns >= max_insns) {
gen_jmp_im(dc, pc_ptr - dc->cs_base); gen_jmp_im(dc, pc_ptr - dc->cs_base);
gen_eob(dc); gen_eob(dc);
block_full = true;
break; break;
} }
} }
@ -8427,6 +8431,8 @@ done_generating:
tb->size = pc_ptr - pc_start; tb->size = pc_ptr - pc_start;
// tb->icount = num_insns; // tb->icount = num_insns;
} }
env->uc->block_full = block_full;
} }
void gen_intermediate_code(CPUX86State *env, TranslationBlock *tb) void gen_intermediate_code(CPUX86State *env, TranslationBlock *tb)

6
qemu/translate-all.c
View file

@ -179,8 +179,10 @@ static int cpu_gen_code(CPUArchState *env, TranslationBlock *tb, int *gen_code_s
gen_intermediate_code(env, tb); gen_intermediate_code(env, tb);
// Unicorn: when tracing block, patch 1st operand for block size // Unicorn: when tracing block, patch 1st operand for block size
if (env->uc->hook_block) { if (env->uc->hook_block && env->uc->block_addr == tb->pc) {
if (env->uc->block_addr == tb->pc) if (env->uc->block_full) // block size is unknown
*(s->gen_opparam_buf + 1) = 0;
else
*(s->gen_opparam_buf + 1) = tb->size; *(s->gen_opparam_buf + 1) = tb->size;
} }

4
regress/block_test.c
View file

@ -6,7 +6,7 @@
#include <unicorn/unicorn.h> #include <unicorn/unicorn.h>
static count = 1; static int count = 1;
// Callback function for tracing code (UC_HOOK_CODE & UC_HOOK_BLOCK) // Callback function for tracing code (UC_HOOK_CODE & UC_HOOK_BLOCK)
// @address: address where the code is being executed // @address: address where the code is being executed
@ -79,4 +79,6 @@ int main() {
fprintf(stderr, "ok %d - uc_emu_start\n", count++); fprintf(stderr, "ok %d - uc_emu_start\n", count++);
fprintf(stderr, "ok %d - Done", count++); fprintf(stderr, "ok %d - Done", count++);
return 0;
} }

1
uc.c
View file

@ -414,6 +414,7 @@ uc_err uc_emu_start(uch handle, uint64_t begin, uint64_t until, uint64_t timeout
uc->emu_counter = 0; uc->emu_counter = 0;
uc->stop_request = false; uc->stop_request = false;
uc->invalid_error = UC_ERR_OK; uc->invalid_error = UC_ERR_OK;
uc->block_full = false;
switch(uc->arch) { switch(uc->arch) {
default: default: