Commit 70c4c5b5 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'filippov/tags/20131108-xtensa' into staging 



Two small fixes for 1.7:

- add missing debug feature to dc233c xtensa core;
- fix qemu abort caused by gdb attempt to invalidate a breakpoint by
  virtual address for which there's no mapping.

# gpg: Signature made Thu 07 Nov 2013 09:32:19 PM PST using RSA key ID F83FA044
# gpg: Can't check signature: public key not found

# By Max Filippov
# Via Max Filippov
* filippov/tags/20131108-xtensa:
  target-xtensa: add missing DEBUG section to dc233c config
  exec: fix breakpoint_invalidate when pc may not be translated

Message-id: 1383889643-21621-1-git-send-email-jcmvbkbc@gmail.com
Signed-off-by: default avatarAnthony Liguori <aliguori@amazon.com>
parents 9f43a3f5 ebbfd5a0

exec.c

+4 −2
Original line number Diff line number Diff line
@@ -409,8 +409,10 @@ static void breakpoint_invalidate(CPUState *cpu, target_ulong pc) 
#else

static void breakpoint_invalidate(CPUState *cpu, target_ulong pc)

{

    tb_invalidate_phys_addr(cpu_get_phys_page_debug(cpu, pc) |

            (pc & ~TARGET_PAGE_MASK));

    hwaddr phys = cpu_get_phys_page_debug(cpu, pc);

    if (phys != -1) {

        tb_invalidate_phys_addr(phys | (pc & ~TARGET_PAGE_MASK));

    }

}

#endif

#endif /* TARGET_HAS_ICE */

target-xtensa/core-dc233c.c

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ static const XtensaConfig dc233c = { 
    EXCEPTIONS_SECTION,

    INTERRUPTS_SECTION,

    TLB_SECTION,

    DEBUG_SECTION,

    .clock_freq_khz = 10000,

};