Merge remote-tracking branch 'upstream/master' into change-handle-based-api

include/uc_priv.h

@@ -45,7 +45,9 @@ typedef void (*uc_args_uc_long_t)(struct uc_struct*, unsigned long);
 
 typedef void (*uc_args_uc_u64_t)(struct uc_struct *, uint64_t addr);
 
-typedef int (*uc_args_uc_ram_size_t)(struct uc_struct*,  ram_addr_t begin, size_t size);
+typedef MemoryRegion* (*uc_args_uc_ram_size_t)(struct uc_struct*,  ram_addr_t begin, size_t size, uint32_t perms);
+
+typedef void (*uc_readonly_mem_t)(MemoryRegion *mr, bool readonly);
 
 // which interrupt should make emulation stop?
 typedef bool (*uc_args_int_t)(int intno);
@@ -61,6 +63,9 @@ struct hook_struct {
 // extend memory to keep 32 more hooks each time
 #define HOOK_SIZE 32
 
+//relloc increment, KEEP THIS A POWER OF 2!
+#define MEM_BLOCK_INCR 32
+
 struct uc_struct {
     uc_arch arch;
     uc_mode mode;
@@ -85,11 +90,11 @@ struct uc_struct {
     uc_args_tcg_enable_t tcg_enabled;
     uc_args_uc_long_t tcg_exec_init;
     uc_args_uc_ram_size_t memory_map;
+    uc_readonly_mem_t readonly_mem;
     // list of cpu
     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
@@ -165,11 +170,13 @@ struct uc_struct {
     int thumb;  // thumb mode for ARM
     // full TCG cache leads to middle-block break in the last translation?
     bool block_full;
+    MemoryRegion **mapped_blocks;
+    uint32_t mapped_block_count;
 };
 
 #include "qemu_macro.h"
 
 // check if this address is mapped in (via uc_mem_map())
-bool memory_mapping(uint64_t address);
+MemoryRegion *memory_mapping(struct uc_struct* uc, uint64_t address);
 
 #endif

include/unicorn/unicorn.h

@@ -96,7 +96,7 @@ typedef enum uc_mode {
     UC_MODE_MIPS32R6 = 1 << 6, // Mips32r6 ISA
     UC_MODE_V9 = 1 << 4, // SparcV9 mode (Sparc)
     UC_MODE_QPX = 1 << 4, // Quad Processing eXtensions mode (PPC)
-    UC_MODE_BIG_ENDIAN = 1 << 31,   // big-endian mode
+    UC_MODE_BIG_ENDIAN = 1 << 30,   // big-endian mode
     UC_MODE_MIPS32 = UC_MODE_32,    // Mips32 ISA (Mips)
     UC_MODE_MIPS64 = UC_MODE_64,    // Mips64 ISA (Mips)
 } uc_mode;
@@ -116,6 +116,8 @@ typedef enum uc_err {
     UC_ERR_HOOK,    // Invalid hook type: uc_hook_add()
     UC_ERR_INSN_INVALID, // Quit emulation due to invalid instruction: uc_emu_start()
     UC_ERR_MAP, // Invalid memory mapping: uc_mem_map()
+    UC_ERR_MEM_WRITE_NW, // Quit emulation due to write to non-writable: uc_emu_start()
+    UC_ERR_MEM_READ_NR, // Quit emulation due to read from non-readable: uc_emu_start()
 } uc_err;
 
 
@@ -147,6 +149,8 @@ typedef enum uc_mem_type {
     UC_MEM_READ = 16,   // Memory is read from
     UC_MEM_WRITE,       // Memory is written to
     UC_MEM_READ_WRITE,  // Memory is accessed (either READ or WRITE)
+    UC_MEM_WRITE_NW,    // write to non-writable
+    UC_MEM_READ_NR,     // read from non-readable
 } uc_mem_type;
 
 // All type of hooks for uc_hook_add() API.
@@ -384,6 +388,13 @@ uc_err uc_hook_add(struct uc_struct *uc, uc_hook_h *hh, uc_hook_t type, void *ca
 UNICORN_EXPORT
 uc_err uc_hook_del(struct uc_struct *uc, uc_hook_h hh);
 
+typedef enum uc_prot {
+   UC_PROT_NONE = 0,
+   UC_PROT_READ = 1,
+   UC_PROT_WRITE = 2,
+   UC_PROT_ALL = 3,
+} uc_prot;
+
 /*
  Map memory in for emulation.
  This API adds a memory region that can be used by emulation.
@@ -393,12 +404,15 @@ uc_err uc_hook_del(struct uc_struct *uc, uc_hook_h hh);
     This address must be aligned to 4KB, or this will return with UC_ERR_MAP error.
  @size: size of the new memory region to be mapped in.
     This size must be multiple of 4KB, or this will return with UC_ERR_MAP error.
+ @perms: Permissions for the newly mapped region.
+    This must be some combination of UC_PROT_READ & UC_PROT_WRITE,
+    or this will return with UC_ERR_MAP error. See uc_prot type above.
 
  @return UC_ERR_OK on success, or other value on failure (refer to uc_err enum
  for detailed error).
 */
 UNICORN_EXPORT
-uc_err uc_mem_map(struct uc_struct *uc, uint64_t address, size_t size);
+uc_err uc_mem_map(struct uc_struct *uc, uint64_t address, size_t size, uint32_t perms);
 
 #ifdef __cplusplus
 }