diff options
| author | Peter Maydell | 2014-06-29 19:09:51 +0200 |
|---|---|---|
| committer | Peter Maydell | 2014-06-29 19:09:51 +0200 |
| commit | 9328cfd2fe4a7ff86a41b2c26ea33974241d7d4e (patch) | |
| tree | 3f877873730540d63eb0cf5901aedefaffa4f238 /target-openrisc | |
| parent | Merge remote-tracking branch 'remotes/riku/linux-user-for-upstream' into staging (diff) | |
| parent | tests: add human format test for string output visitor (diff) | |
| download | qemu-9328cfd2fe4a7ff86a41b2c26ea33974241d7d4e.tar.gz qemu-9328cfd2fe4a7ff86a41b2c26ea33974241d7d4e.tar.xz qemu-9328cfd2fe4a7ff86a41b2c26ea33974241d7d4e.zip | |
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
pc,vhost,virtio fixes, enhancements
virtio bi-endian support
new command to resync RTC
misc bugfixes and cleanups
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Sun 29 Jun 2014 17:41:13 BST using RSA key ID D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg: aka "Michael S. Tsirkin <mst@redhat.com>"
* remotes/mst/tags/for_upstream: (37 commits)
tests: add human format test for string output visitor
vhost-net: disable when cross-endian
target-ppc: enable virtio endian ambivalent support
virtio-9p: use virtio wrappers to access headers
virtio-serial-bus: use virtio wrappers to access headers
virtio-scsi: use virtio wrappers to access headers
virtio-blk: use virtio wrappers to access headers
virtio-balloon: use virtio wrappers to access page frame numbers
virtio-net: use virtio wrappers to access headers
virtio: allow byte swapping for vring
virtio: memory accessors for endian-ambivalent targets
virtio: add endian-ambivalent support to VirtIODevice
cpu: introduce CPUClass::virtio_is_big_endian()
exec: introduce target_words_bigendian() helper
virtio: add subsections to the migration stream
virtio-rng: implement per-device migration calls
virtio-balloon: implement per-device migration calls
virtio-serial: implement per-device migration calls
virtio-blk: implement per-device migration calls
virtio-net: implement per-device migration calls
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target-openrisc')
| -rw-r--r-- | target-openrisc/translate.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target-openrisc/translate.c b/target-openrisc/translate.c index b728718b64..55ff935d5e 100644 --- a/target-openrisc/translate.c +++ b/target-openrisc/translate.c @@ -531,14 +531,14 @@ static void dec_calc(DisasContext *dc, uint32_t insn) TCGv_i64 high = tcg_temp_new_i64(); TCGv_i32 sr_ove = tcg_temp_local_new_i32(); int lab = gen_new_label(); - /* Calculate the each result. */ + /* Calculate each result. */ tcg_gen_extu_i32_i64(tra, cpu_R[ra]); tcg_gen_extu_i32_i64(trb, cpu_R[rb]); tcg_gen_mul_i64(result, tra, trb); tcg_temp_free_i64(tra); tcg_temp_free_i64(trb); tcg_gen_shri_i64(high, result, TARGET_LONG_BITS); - /* Overflow or not. */ + /* Overflow or not. */ tcg_gen_brcondi_i64(TCG_COND_EQ, high, 0x00000000, lab); tcg_gen_ori_tl(cpu_sr, cpu_sr, (SR_OV | SR_CY)); tcg_gen_andi_tl(sr_ove, cpu_sr, SR_OVE); |