Cleaner implementation for uc_mem_prot on mmio regions

qemu/accel/tcg/cputlb.c

@@ -1657,13 +1657,6 @@ load_helper(CPUArchState *env, target_ulong addr, TCGMemOpIdx oi,
     res = load_memop(haddr, op);
 
 _out:
-    // mmio error check
-    if (uc->invalid_error != UC_ERR_OK) {
-        uc->invalid_addr = addr;
-        cpu_exit(uc->cpu);
-        return 0;
-    }
-
     // Unicorn: callback on successful data read
     if (!code_read) {
         if (!uc->size_recur_mem) { // disabling read callback if in recursive call

qemu/softmmu/memory.c

@@ -82,13 +82,12 @@ MemoryRegion *memory_map_ptr(struct uc_struct *uc, hwaddr begin, size_t size, ui
 static uint64_t mmio_read_wrapper(struct uc_struct *uc, void *opaque, hwaddr addr, unsigned size)
 {
     mmio_cbs* cbs = (mmio_cbs*)opaque;
-    
+
     // We have to care about 32bit target.
     addr = addr & ( (target_ulong)(-1) );
     if (cbs->read) {
         return cbs->read(uc, addr, size, cbs->user_data_read);
     } else {
-        uc->invalid_error = UC_ERR_READ_PROT;
         return 0;
     }
 }
@@ -101,8 +100,6 @@ static void mmio_write_wrapper(struct uc_struct *uc, void *opaque, hwaddr addr,
     addr = addr & ( (target_ulong)(-1) );
     if (cbs->write) {
         cbs->write(uc, addr, size, data, cbs->user_data_write);
-    } else {
-        uc->invalid_error = UC_ERR_WRITE_PROT;
     }
 }