ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJSfHdjAAoJEFH5zJH4P6BEaVIP/1PQIpsbsESuc6LNebScQhi4
 FnjNxBAkDy3v0D3fi5ltG/MxMA9KEykr5iwuQB61ypD2J6b5jLbpSPWjgy2P4n4T
 R3z8ZYvhiJBT8DmBLrK/wwvvw1hXhKrCxiBbz3TWmYB1Iz2dCeYAwVPvdZYP6AB1
 5UUMebd8Wg2Fgy/CO92IraVrhZVEHxFbJpWMq1OaQf81s01EQUVgor1kUPaPXLdg
 I3SEvym9lEEtrAaleZjf2WbhLAytgim5x6fhRUQgR/JaU+gNHmjZEtGj97ufKRBw
 QWUbvKq1Dh9Ryz6+X7XwedR9YBxX6ww6TuPL3pQZbY1Sp5qXxNR107he5FAuoDn8
 Z/BCl95qoIfD49J2mofQbAG7r37E4RHHkF2QvECAPf61h7Rf6G6rZac49SWbYRqb
 LU5PuWd9vzaJ/J6lRHcbnlwweTQDEwXe1EsaeMmKGkSp8Z1Je9KoZwpxI0/OdTIX
 LmicmB6LvWxUWXa4tfNGPLhTFSNQKcbt0c3peULbl52+96AnYEIqDXi5c2hc3Hhr
 DQip7wzwngZx9i1TcF+VLf8sE6hU6lDYQFCvW/G5bx9e9fyqqPHiJbNKID8/f/hG
 sePWG6+WrdMIfQ/eqvlrtGeIPfH+HKJKvDL3rUwkSH3Mx6M6q+OqM/6Tra1TWrP6
 /0492SeVzPOPJmE+7S2a
 =6DLv
 -----END PGP SIGNATURE-----

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: Anthony Liguori <aliguori@amazon.com>
This commit is contained in:
Anthony Liguori 2013-11-13 11:47:06 -08:00
parent 9f43a3f541 ebbfd5a094
commit 70c4c5b562
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
exec.c
View File

@ -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 */

1
target-xtensa/core-dc233c.c
View File

@ -49,6 +49,7 @@ static const XtensaConfig dc233c = {
EXCEPTIONS_SECTION,
INTERRUPTS_SECTION,
TLB_SECTION,
DEBUG_SECTION,
.clock_freq_khz = 10000,
};