AVR: sync changes from "dev" branch (a78d690).

This fixes CI tests on MingW64.

Signed-off-by: Glenn Baker <[email protected]>

Author: glennsec

qemu/avr.h

@@ -50,6 +50,7 @@
 #define vm_start vm_start_avr
 #define address_space_dispatch_compact address_space_dispatch_compact_avr
 #define flatview_translate flatview_translate_avr
+#define flatview_copy flatview_copy_avr
 #define address_space_translate_for_iotlb address_space_translate_for_iotlb_avr
 #define qemu_get_cpu qemu_get_cpu_avr
 #define cpu_address_space_init cpu_address_space_init_avr
@@ -86,6 +87,7 @@
 #define iotlb_to_section iotlb_to_section_avr
 #define address_space_dispatch_new address_space_dispatch_new_avr
 #define address_space_dispatch_free address_space_dispatch_free_avr
+#define address_space_dispatch_clear address_space_dispatch_clear_avr
 #define flatview_read_continue flatview_read_continue_avr
 #define address_space_read_full address_space_read_full_avr
 #define address_space_write address_space_write_avr

qemu/target/avr/cpu.c

@@ -420,16 +420,17 @@ AVRCPU *cpu_avr_init(struct uc_struct *uc)
     CPUClass *cc;
     ObjectClass *oc;
 
-    cpu = calloc(1, sizeof(*cpu));
+    cpu = qemu_memalign(8, sizeof(*cpu));
     if (cpu == NULL) {
         return NULL;
     }
+    memset((void *)cpu, 0, sizeof(*cpu));
 
     if (uc->cpu_model == INT_MAX)
         uc->cpu_model = UC_CPU_AVR_ATMEGA128;
     const AVRCPUInfo *const cip = avr_cpu_info_get(uc->cpu_model);
     if (!cip) {
-        free(cpu);
+        qemu_vfree(cpu);
         return NULL;
     }
 

qemu/target/avr/unicorn.c

@@ -118,6 +118,8 @@ uc_err reg_read(void *_env, int mode, unsigned int regid, void *value,
         break;
     }
     }
+
+    CHECK_RET_DEPRECATE(ret, regid);
     return ret;
 }
 
@@ -200,6 +202,8 @@ uc_err reg_write(void *_env, int mode, unsigned int regid, const void *value,
         }
     }
     }
+
+    CHECK_RET_DEPRECATE(ret, regid);
     return ret;
 }