summaryrefslogtreecommitdiffstats
path: root/target-s390x
diff options
context:
space:
mode:
authorStefan Weil2011-05-27 19:03:25 +0200
committerAlexander Graf2011-06-03 13:34:01 +0200
commitbe82ee2aca363753888fe777215849a86f4e737c (patch)
treec99ae18156ee8f5b8d69a7444a8b09e621653fcf /target-s390x
parenttarget-s390x: Fix build for non-linux hosts (diff)
downloadqemu-be82ee2aca363753888fe777215849a86f4e737c.tar.gz
qemu-be82ee2aca363753888fe777215849a86f4e737c.tar.xz
qemu-be82ee2aca363753888fe777215849a86f4e737c.zip
target-s390x: Fix wrong argument in call of tcg_gen_shl_i64()
tcg_gen_shl_i64 needs a 3rd argument of type TCGv_i64. Set tmp4 so it can be used here. v2: Don't call tcg_const_i64() inside of the loop because it creates additional code. Signed-off-by: Stefan Weil <weil@mail.berlios.de> Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'target-s390x')
-rw-r--r--target-s390x/translate.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/target-s390x/translate.c b/target-s390x/translate.c
index 8e71df3d26..865a9dfa53 100644
--- a/target-s390x/translate.c
+++ b/target-s390x/translate.c
@@ -2056,7 +2056,7 @@ do_mh:
even for very long ones... */
tmp = get_address(s, 0, b2, d2);
tmp3 = tcg_const_i64(stm_len);
- tmp4 = tcg_const_i64(32);
+ tmp4 = tcg_const_i64(op == 0x26 ? 32 : 4);
for (i = r1;; i = (i + 1) % 16) {
switch (op) {
case 0x4:
@@ -2070,7 +2070,7 @@ do_mh:
#else
tmp2 = tcg_temp_new_i64();
tcg_gen_qemu_ld32u(tmp2, tmp, get_mem_index(s));
- tcg_gen_shl_i64(tmp2, tmp2, 4);
+ tcg_gen_shl_i64(tmp2, tmp2, tmp4);
tcg_gen_ext32u_i64(regs[i], regs[i]);
tcg_gen_or_i64(regs[i], regs[i], tmp2);
#endif
'>| | * | nfp: bpf: don't stop offload if replace failedJakub Kicinski2018-06-251-3/+3 | * | | hv_netvsc: split sub-channel setup into async and syncStephen Hemminger2018-06-304-52/+65 | * | | alx: take rtnl before calling __alx_open from resumeSabrina Dubroca2018-06-301-1/+7 | * | | sfc: correctly initialise filter rwsem for farchBert Kenward2018-06-301-0/+1 | * | | net: phy: DP83TC811: Fix disabling interruptsDan Murphy2018-06-301-1/+1 | * | | dpaa_eth: DPAA SGT needs to be 256BMadalin Bucur2018-06-301-7/+8 | * | | fsl/fman: fix parser reporting bad checksum on short framesMadalin Bucur2018-06-301-0/+8 | * | | bnx2x: Fix receiving tx-timeout in error or recovery state.Sudarsana Reddy Kalluru2018-06-303-0/+13 | * | | cnic: tidy up a size calculationDan Carpenter2018-06-301-1/+1 | * | | net: stmmac: Set DMA buffer size in HWJose Abreu2018-06-284-0/+19 | * | | Merge tag 'mlx5-fixes-2018-06-26' of git://git.kernel.org/pub/scm/linux/kerne...David S. Miller2018-06-2811-33/+41 | |\ \ \ | | * | | net/mlx5: Fix command interface race in polling modeAlex Vesker2018-06-271-1/+3 | | * | | net/mlx5: Fix incorrect raw command length parsingAlex Vesker2018-06-271-3/+1Star | | * | | net/mlx5: Fix wrong size allocation for QoS ETC TC regitsterShay Agroskin2018-06-271-2/+2 | | * | | net/mlx5: Fix required capability for manipulating MPFSEli Cohen2018-06-271-4/+5 | | * | | net/mlx5: E-Switch, Disallow vlan/spoofcheck setup if not being esw managerEli Cohen2018-06-272-9/+5Star | | * | | net/mlx5e: Avoid dealing with vport representors if not being e-switch managerOr Gerlitz2018-06-273-9/+9 | | * | | net/mlx5: E-Switch, Avoid setup attempt if not being e-switch managerOr Gerlitz2018-06-275-6/+13 | | * | | net/mlx5e: Don't attempt to dereference the ppriv struct if not being eswitch...Or Gerlitz2018-06-271-1/+5 | | | |/ | | |/| | * | | virtio_net: split XDP_TX kick and XDP_REDIRECT map flushingJesper Dangaard Brouer2018-06-281-11/+19 | * | | i40e: split XDP_TX tail and XDP_REDIRECT map flushingJesper Dangaard Brouer2018-06-281-9/+15 | * | | ixgbe: split XDP_TX tail and XDP_REDIRECT map flushingJesper Dangaard Brouer2018-06-281-10/+14 | * | | net: macb: initialize bp->queues[0].bp for at91rm9200Alexandre Belloni2018-06-281-0/+2 | * | | hinic: reset irq affinity before freeing irqWei Yongjun2018-06-281-0/+1 | * | | nfp: cast sizeof() to int when comparing with error codeChengguang Xu2018-06-271-1/+1 | * | | nfp: reject binding to shared blocksJohn Hurley2018-06-272-0/+6 | * | | nfp: flower: fix mpls ether type detectionPieter Jansen van Vuuren2018-06-272-0/+22 | * | | net: lan78xx: Use s/w csum check on VLANs without tag strippingDave Stevenson2018-06-261-1/+6 | * | | net: lan78xx: Add support for VLAN tag stripping.Dave Stevenson2018-06-261-0/+22 | * | | net: lan78xx: Add support for VLAN filtering.Dave Stevenson2018-06-261-1/+4 | * | | net: lan78xx: Allow for VLAN headers in timeout calcsDave Stevenson2018-06-261-2/+3 | * | | r8152: napi hangup fix after disconnectJiri Slaby2018-06-261-1/+2 * | | | Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLLLinus Torvalds2018-06-281-1/+1 |/ / / * | | sfc: make function efx_rps_hash_bucket staticColin Ian King2018-06-241-0/+1 * | | qmi_wwan: add support for the Dell Wireless 5821e moduleAleksander Morgado2018-06-24