Merge branch 'master' into mem_map_ex_cse

2015-08-29 21:22:33 -07:00
parent 6beb1b8a13 c23d387e2f
commit 4a680b9277
10 changed files with 179 additions and 14 deletions
--- a/include/uc_priv.h
+++ b/include/uc_priv.h
@ -98,7 +98,6 @@ struct uc_struct {
    void* cpu;

    MemoryRegion *system_memory;    // qemu/exec.c
-    MemoryRegion *ram;
    MemoryRegion io_mem_rom;    // qemu/exec.c
    MemoryRegion io_mem_notdirty;   // qemu/exec.c
    MemoryRegion io_mem_unassigned; // qemu/exec.c