From: Michael Roth <mdroth@linux.vnet.ibm.com>
To: qemu-devel@nongnu.org
Cc: qemu-stable@nongnu.org
Subject: [Qemu-devel] [PATCH 36/38] tci: Fix qemu-alpha on 32 bit hosts (wrong assertions)
Date: Wed, 25 Sep 2013 07:58:04 -0500 [thread overview]
Message-ID: <1380113886-16845-37-git-send-email-mdroth@linux.vnet.ibm.com> (raw)
In-Reply-To: <1380113886-16845-1-git-send-email-mdroth@linux.vnet.ibm.com>
From: Stefan Weil <sw@weilnetz.de>
Debian busybox-static for alpha has a load address of 0x0000000120000000
which is mapped to 0x0000000020000000 for 32 bit hosts.
qemu-alpha uses the TCG opcodes qemu_ld32, qemu_ld64, qemu_st32 and
qemu_st64 which all raise the assertion (taddr == host_addr).
Remove all assertions of this type because they are either wrong or
unnecessary (when sizeof(tcg_target_ulong) >= sizeof(target_ulong)).
Cc: qemu-stable <qemu-stable@nongnu.org>
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Reviewed-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
(cherry picked from commit 07ac4dc5db22a31e47b149abdbc5ea99013cf4de)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---
tci.c | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/tci.c b/tci.c
index c742c8d..af58576 100644
--- a/tci.c
+++ b/tci.c
@@ -1085,7 +1085,6 @@ tcg_target_ulong tcg_qemu_tb_exec(CPUArchState *env, uint8_t *tb_ptr)
tmp8 = helper_ldb_mmu(env, taddr, tci_read_i(&tb_ptr));
#else
host_addr = (tcg_target_ulong)taddr;
- assert(taddr == host_addr);
tmp8 = *(uint8_t *)(host_addr + GUEST_BASE);
#endif
tci_write_reg8(t0, tmp8);
@@ -1097,7 +1096,6 @@ tcg_target_ulong tcg_qemu_tb_exec(CPUArchState *env, uint8_t *tb_ptr)
tmp8 = helper_ldb_mmu(env, taddr, tci_read_i(&tb_ptr));
#else
host_addr = (tcg_target_ulong)taddr;
- assert(taddr == host_addr);
tmp8 = *(uint8_t *)(host_addr + GUEST_BASE);
#endif
tci_write_reg8s(t0, tmp8);
@@ -1109,7 +1107,6 @@ tcg_target_ulong tcg_qemu_tb_exec(CPUArchState *env, uint8_t *tb_ptr)
tmp16 = helper_ldw_mmu(env, taddr, tci_read_i(&tb_ptr));
#else
host_addr = (tcg_target_ulong)taddr;
- assert(taddr == host_addr);
tmp16 = tswap16(*(uint16_t *)(host_addr + GUEST_BASE));
#endif
tci_write_reg16(t0, tmp16);
@@ -1121,7 +1118,6 @@ tcg_target_ulong tcg_qemu_tb_exec(CPUArchState *env, uint8_t *tb_ptr)
tmp16 = helper_ldw_mmu(env, taddr, tci_read_i(&tb_ptr));
#else
host_addr = (tcg_target_ulong)taddr;
- assert(taddr == host_addr);
tmp16 = tswap16(*(uint16_t *)(host_addr + GUEST_BASE));
#endif
tci_write_reg16s(t0, tmp16);
@@ -1134,7 +1130,6 @@ tcg_target_ulong tcg_qemu_tb_exec(CPUArchState *env, uint8_t *tb_ptr)
tmp32 = helper_ldl_mmu(env, taddr, tci_read_i(&tb_ptr));
#else
host_addr = (tcg_target_ulong)taddr;
- assert(taddr == host_addr);
tmp32 = tswap32(*(uint32_t *)(host_addr + GUEST_BASE));
#endif
tci_write_reg32(t0, tmp32);
@@ -1146,7 +1141,6 @@ tcg_target_ulong tcg_qemu_tb_exec(CPUArchState *env, uint8_t *tb_ptr)
tmp32 = helper_ldl_mmu(env, taddr, tci_read_i(&tb_ptr));
#else
host_addr = (tcg_target_ulong)taddr;
- assert(taddr == host_addr);
tmp32 = tswap32(*(uint32_t *)(host_addr + GUEST_BASE));
#endif
tci_write_reg32s(t0, tmp32);
@@ -1159,7 +1153,6 @@ tcg_target_ulong tcg_qemu_tb_exec(CPUArchState *env, uint8_t *tb_ptr)
tmp32 = helper_ldl_mmu(env, taddr, tci_read_i(&tb_ptr));
#else
host_addr = (tcg_target_ulong)taddr;
- assert(taddr == host_addr);
tmp32 = tswap32(*(uint32_t *)(host_addr + GUEST_BASE));
#endif
tci_write_reg32(t0, tmp32);
@@ -1174,7 +1167,6 @@ tcg_target_ulong tcg_qemu_tb_exec(CPUArchState *env, uint8_t *tb_ptr)
tmp64 = helper_ldq_mmu(env, taddr, tci_read_i(&tb_ptr));
#else
host_addr = (tcg_target_ulong)taddr;
- assert(taddr == host_addr);
tmp64 = tswap64(*(uint64_t *)(host_addr + GUEST_BASE));
#endif
tci_write_reg(t0, tmp64);
@@ -1190,7 +1182,6 @@ tcg_target_ulong tcg_qemu_tb_exec(CPUArchState *env, uint8_t *tb_ptr)
helper_stb_mmu(env, taddr, t0, t2);
#else
host_addr = (tcg_target_ulong)taddr;
- assert(taddr == host_addr);
*(uint8_t *)(host_addr + GUEST_BASE) = t0;
#endif
break;
@@ -1202,7 +1193,6 @@ tcg_target_ulong tcg_qemu_tb_exec(CPUArchState *env, uint8_t *tb_ptr)
helper_stw_mmu(env, taddr, t0, t2);
#else
host_addr = (tcg_target_ulong)taddr;
- assert(taddr == host_addr);
*(uint16_t *)(host_addr + GUEST_BASE) = tswap16(t0);
#endif
break;
@@ -1214,7 +1204,6 @@ tcg_target_ulong tcg_qemu_tb_exec(CPUArchState *env, uint8_t *tb_ptr)
helper_stl_mmu(env, taddr, t0, t2);
#else
host_addr = (tcg_target_ulong)taddr;
- assert(taddr == host_addr);
*(uint32_t *)(host_addr + GUEST_BASE) = tswap32(t0);
#endif
break;
@@ -1226,7 +1215,6 @@ tcg_target_ulong tcg_qemu_tb_exec(CPUArchState *env, uint8_t *tb_ptr)
helper_stq_mmu(env, taddr, tmp64, t2);
#else
host_addr = (tcg_target_ulong)taddr;
- assert(taddr == host_addr);
*(uint64_t *)(host_addr + GUEST_BASE) = tswap64(tmp64);
#endif
break;
--
1.7.9.5
next prev parent reply other threads:[~2013-09-25 12:59 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-25 12:57 [Qemu-devel] Patch Round-up for stable 1.6.1, freeze on 2013-09-30 Michael Roth
2013-09-25 12:57 ` [Qemu-devel] [PATCH 01/38] block: ensure bdrv_drain_all() works during bdrv_delete() Michael Roth
2013-09-25 12:57 ` [Qemu-devel] [PATCH 02/38] gdbstub: Fix gdb_register_coprocessor() register counting Michael Roth
2013-09-25 12:57 ` [Qemu-devel] [PATCH 03/38] target-ppc: fix bit extraction for FPBF and FPL Michael Roth
2013-09-25 12:57 ` [Qemu-devel] [PATCH 04/38] rdma: silly ipv6 bugfix Michael Roth
2013-09-25 12:57 ` [Qemu-devel] [PATCH 05/38] scripts/qapi.py: Avoid syntax not supported by Python 2.4 Michael Roth
2013-09-25 12:57 ` [Qemu-devel] [PATCH 06/38] usb/dev-hid: Modified usb-tablet category from Misc to Input Michael Roth
2013-09-25 12:57 ` [Qemu-devel] [PATCH 07/38] scsi: Fix scsi_bus_legacy_add_drive() scsi-generic with serial Michael Roth
2013-09-25 12:57 ` [Qemu-devel] [PATCH 08/38] pc: fix regression for 64 bit PCI memory Michael Roth
2013-09-25 12:57 ` [Qemu-devel] [PATCH 09/38] pseries: Fix stalls on hypervisor virtual console Michael Roth
2013-09-25 12:57 ` [Qemu-devel] [PATCH 10/38] virtio: virtqueue_get_avail_bytes: fix desc_pa when loop over the indirect descriptor table Michael Roth
2013-09-25 12:57 ` [Qemu-devel] [PATCH 11/38] xhci: fix endpoint interval calculation Michael Roth
2013-09-25 13:41 ` Gerd Hoffmann
2013-09-25 12:57 ` [Qemu-devel] [PATCH 12/38] Revert "usb-hub: report status changes only once" Michael Roth
2013-09-25 12:57 ` [Qemu-devel] [PATCH 13/38] block: expect errors from bdrv_co_is_allocated Michael Roth
2013-09-25 21:27 ` [Qemu-devel] [Qemu-stable] " Doug Goldstein
2013-09-26 20:51 ` Paolo Bonzini
2013-09-25 12:57 ` [Qemu-devel] [PATCH 14/38] target-i386: fix disassembly with PAE=1, PG=0 Michael Roth
2013-09-25 12:57 ` [Qemu-devel] [PATCH 15/38] adlib: sort offsets in portio registration Michael Roth
2013-09-25 12:57 ` [Qemu-devel] [PATCH 16/38] exec: fix writing to MMIO area with non-power-of-two length Michael Roth
2013-09-25 12:57 ` [Qemu-devel] [PATCH 17/38] virtio_pci: fix level interrupts with irqfd Michael Roth
2013-09-25 12:57 ` [Qemu-devel] [PATCH 18/38] exec: always use MADV_DONTFORK Michael Roth
2013-09-25 12:57 ` [Qemu-devel] [PATCH 19/38] xhci: reset port when disabling slot Michael Roth
2013-09-25 12:57 ` [Qemu-devel] [PATCH 20/38] usb: parallelize usb3 streams Michael Roth
2013-09-25 12:57 ` [Qemu-devel] [PATCH 21/38] w32: Fix access to host devices (regression) Michael Roth
2013-09-25 12:57 ` [Qemu-devel] [PATCH 22/38] memory: Provide separate handling of unassigned io ports accesses Michael Roth
2013-09-25 12:57 ` [Qemu-devel] [PATCH 23/38] Revert "memory: Return -1 again on reads from unsigned regions" Michael Roth
2013-09-25 12:57 ` [Qemu-devel] [PATCH 24/38] exec: check offset_within_address_space for register subpage Michael Roth
2013-09-25 12:57 ` [Qemu-devel] [PATCH 25/38] ne2000: mark I/O as LITTLE_ENDIAN Michael Roth
2013-09-25 12:57 ` [Qemu-devel] [PATCH 26/38] ehci: save device pointer in EHCIState Michael Roth
2013-09-25 12:57 ` [Qemu-devel] [PATCH 27/38] qxl: fix local renderer Michael Roth
2013-09-25 12:57 ` [Qemu-devel] [PATCH 28/38] pc: Initializing ram_memory under Xen Michael Roth
2013-09-25 12:57 ` [Qemu-devel] [PATCH 29/38] pc_q35: Initialize Xen Michael Roth
2013-09-25 12:57 ` [Qemu-devel] [PATCH 30/38] qapi-types.py: Fix enum struct sizes on i686 Michael Roth
2013-09-25 12:57 ` [Qemu-devel] [PATCH 31/38] pcnet-pci: mark I/O and MMIO as LITTLE_ENDIAN Michael Roth
2013-09-25 12:58 ` [Qemu-devel] [PATCH 32/38] chardev: fix pty_chr_timer Michael Roth
2013-09-25 12:58 ` [Qemu-devel] [PATCH 33/38] kvmvapic: Catch invalid ROM size Michael Roth
2013-09-25 12:58 ` [Qemu-devel] [PATCH 34/38] kvmvapic: Enter inactive state on hardware reset Michael Roth
2013-09-25 12:58 ` [Qemu-devel] [PATCH 35/38] kvmvapic: Clear also physical ROM address when entering INACTIVE state Michael Roth
2013-09-25 12:58 ` Michael Roth [this message]
2013-09-25 12:58 ` [Qemu-devel] [PATCH 37/38] blockdev: do not default cache.no-flush to true Michael Roth
2013-09-25 12:58 ` [Qemu-devel] [PATCH 38/38] virtio-blk: do not relay a previous driver's WCE configuration to the current Michael Roth
2013-09-25 13:54 ` [Qemu-devel] [Qemu-stable] Patch Round-up for stable 1.6.1, freeze on 2013-09-30 Cole Robinson
2013-09-25 21:43 ` Doug Goldstein
2013-09-26 20:53 ` Paolo Bonzini
2013-09-26 4:53 ` [Qemu-devel] " Stefan Weil
2013-09-26 5:22 ` Fam Zheng
2013-09-26 19:38 ` Stefan Weil
2013-09-27 7:30 ` Michael Tokarev
2013-09-27 8:07 ` [Qemu-devel] [Qemu-stable] " Michael Tokarev
2013-09-27 8:11 ` Michael Tokarev
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1380113886-16845-37-git-send-email-mdroth@linux.vnet.ibm.com \
--to=mdroth@linux.vnet.ibm.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-stable@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).