Merge remote-tracking branch 'upstream/master' into hook_mem_constants_documentation

2015-09-05 00:41:23 +07:00
parent 41846af60a bf1185e3ef
commit 84a374e876
22 changed files with 293 additions and 234 deletions
--- a/include/uc_priv.h
+++ b/include/uc_priv.h
@@ -175,6 +175,7 @@ struct uc_struct {
    bool block_full;
    MemoryRegion **mapped_blocks;
    uint32_t mapped_block_count;
+    uint32_t mapped_block_cache_index;
    void *qemu_thread_data; // to support cross compile to Windows (qemu-thread-win32.c)
    uint32_t target_page_size;
    uint32_t target_page_align;