diff options
| author |   Marcelo Tosatti <mtosatti@redhat.com> | 2009-09-03 12:12:48 -0300 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2009-09-03 12:12:48 -0300 |
| commit | 624ea2eebd685642ed7b33e22c65c7a6554c975c (patch) | |
| tree | 75ea10a92c7fbc99a6adece9048aa9bc76d5ed4a /exec.c | |
| parent | qemu-kvm: Install built option roms (diff) | |
| parent | microblaze: Compute masks for alignment checks at translation time. (diff) | |
| download | qemu-kvm-624ea2eebd685642ed7b33e22c65c7a6554c975c.tar.gz qemu-kvm-624ea2eebd685642ed7b33e22c65c7a6554c975c.tar.bz2 qemu-kvm-624ea2eebd685642ed7b33e22c65c7a6554c975c.zip | |
Merge commit '3aa80988430f41847e1b78d165440ac03503b6d0' into upstream-merge
* commit '3aa80988430f41847e1b78d165440ac03503b6d0':
microblaze: Compute masks for alignment checks at translation time.
microblaze: Trap on bus accesses to unmapped areas.
microblaze: MMU shows more respect to synthesis config.
microblaze: Trap on unaligned data accesses.
microblaze: Trap on divizions by zero.
microblaze: Correct mfs into r0.
microblaze: Catch illegal insns and privilege violations.
microblaze: Add infrastructure for supporting hw exceptions.
microblaze: Clear exception in dslot ESR bit if not in dslot.
microblaze: Correct MMU debug log.
Fix warning on x86_64
Sparc32: port sun4c interrupt controller to VMState design
Sparc32: port timers to VMState design
Sparc32: timer field is never NULL
Add VMState support for ptimers
esp (sparc32) Extra scsi data.
Fix compiler warnings
Fix breakage due to __thread
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'exec.c')
| -rw-r--r-- | exec.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -2620,7 +2620,7 @@ static uint32_t unassigned_mem_readb(void *opaque, target_phys_addr_t addr) #ifdef DEBUG_UNASSIGNED printf("Unassigned mem read " TARGET_FMT_plx "\n", addr); #endif -#if defined(TARGET_SPARC) +#if defined(TARGET_SPARC) || defined(TARGET_MICROBLAZE) do_unassigned_access(addr, 0, 0, 0, 1); #endif return 0; @@ -2631,7 +2631,7 @@ static uint32_t unassigned_mem_readw(void *opaque, target_phys_addr_t addr) #ifdef DEBUG_UNASSIGNED printf("Unassigned mem read " TARGET_FMT_plx "\n", addr); #endif -#if defined(TARGET_SPARC) +#if defined(TARGET_SPARC) || defined(TARGET_MICROBLAZE) do_unassigned_access(addr, 0, 0, 0, 2); #endif return 0; @@ -2642,7 +2642,7 @@ static uint32_t unassigned_mem_readl(void *opaque, target_phys_addr_t addr) #ifdef DEBUG_UNASSIGNED printf("Unassigned mem read " TARGET_FMT_plx "\n", addr); #endif -#if defined(TARGET_SPARC) +#if defined(TARGET_SPARC) || defined(TARGET_MICROBLAZE) do_unassigned_access(addr, 0, 0, 0, 4); #endif return 0; @@ -2653,7 +2653,7 @@ static void unassigned_mem_writeb(void *opaque, target_phys_addr_t addr, uint32_ #ifdef DEBUG_UNASSIGNED printf("Unassigned mem write " TARGET_FMT_plx " = 0x%x\n", addr, val); #endif -#if defined(TARGET_SPARC) +#if defined(TARGET_SPARC) || defined(TARGET_MICROBLAZE) do_unassigned_access(addr, 1, 0, 0, 1); #endif } @@ -2663,7 +2663,7 @@ static void unassigned_mem_writew(void *opaque, target_phys_addr_t addr, uint32_ #ifdef DEBUG_UNASSIGNED printf("Unassigned mem write " TARGET_FMT_plx " = 0x%x\n", addr, val); #endif -#if defined(TARGET_SPARC) +#if defined(TARGET_SPARC) || defined(TARGET_MICROBLAZE) do_unassigned_access(addr, 1, 0, 0, 2); #endif } @@ -2673,7 +2673,7 @@ static void unassigned_mem_writel(void *opaque, target_phys_addr_t addr, uint32_ #ifdef DEBUG_UNASSIGNED printf("Unassigned mem write " TARGET_FMT_plx " = 0x%x\n", addr, val); #endif -#if defined(TARGET_SPARC) +#if defined(TARGET_SPARC) || defined(TARGET_MICROBLAZE) do_unassigned_access(addr, 1, 0, 0, 4); #endif } |