← Back to branch summary

~ubuntu-branches/ubuntu/trusty/qemu/trusty

« back to all changes in this revision

Viewing changes to tcg/tcg-op.h

  • Committer: Package Import Robot
  • Author(s): Serge Hallyn
  • Date: 2013-10-22 22:47:07 UTC
  • mfrom: (1.8.3) (10.1.42 sid)
  • Revision ID: package-import@ubuntu.com-20131022224707-1lya34fw3k3f24tv
Tags: 1.6.0+dfsg-2ubuntu1
http://bugs.debian.org/709241
* Merge 1.6.0~rc0+dfsg-2exp from debian experimental.  Remaining changes:
  - debian/control
    * update maintainer
    * remove libiscsi, usb-redir, vde, vnc-jpeg, and libssh2-1-dev
      from build-deps
    * enable rbd
    * add qemu-system and qemu-common B/R to qemu-keymaps
    * add D:udev, R:qemu, R:qemu-common and B:qemu-common to
      qemu-system-common
    * qemu-system-arm, qemu-system-ppc, qemu-system-sparc:
      - add qemu-kvm to Provides
      - add qemu-common, qemu-kvm, kvm to B/R
      - remove openbios-sparc from qemu-system-sparc D
      - drop openbios-ppc and openhackware Depends to Suggests (for now)
    * qemu-system-x86:
      - add qemu-common to Breaks/Replaces.
      - add cpu-checker to Recommends.
    * qemu-user: add B/R:qemu-kvm
    * qemu-kvm:
      - add armhf armel powerpc sparc to Architecture
      - C/R/P: qemu-kvm-spice
    * add qemu-common package
    * drop qemu-slof which is not packaged in ubuntu
  - add qemu-system-common.links for tap ifup/down scripts and OVMF link.
  - qemu-system-x86.links:
    * remove pxe rom links which are in kvm-ipxe
    * add symlink for kvm.1 manpage
  - debian/rules
    * add kvm-spice symlink to qemu-kvm
    * call dh_installmodules for qemu-system-x86
    * update dh_installinit to install upstart script
    * run dh_installman (Closes: #709241) (cherrypicked from 1.5.0+dfsg-2)
  - Add qemu-utils.links for kvm-* symlinks.
  - Add qemu-system-x86.qemu-kvm.upstart and .default
  - Add qemu-system-x86.modprobe to set nesting=1
  - Add qemu-system-common.preinst to add kvm group
  - qemu-system-common.postinst: remove bad group acl if there, then have
    udev relabel /dev/kvm.
  - New linaro patches from qemu-linaro rebasing branch
  - Dropped patches:
    * xen-simplify-xen_enabled.patch
    * sparc-linux-user-fix-missing-symbols-in-.rel-.rela.plt-sections.patch
    * main_loop-do-not-set-nonblocking-if-xen_enabled.patch
    * xen_machine_pv-do-not-create-a-dummy-CPU-in-machine-.patch
    * virtio-rng-fix-crash
  - Kept patches:
    * expose_vms_qemu64cpu.patch - updated
    * linaro arm patches from qemu-linaro rebasing branch
  - New patches:
    * fix-pci-add: change CONFIG variable in ifdef to make sure that
      pci_add is defined.
* Add linaro patches
* Add experimental mach-virt patches for arm virtualization.
* qemu-system-common.install: add debian/tmp/usr/lib to install the
  qemu-bridge-helper

Show diffs side-by-side

added added

removed removed

Lines of Context:
tcg/tcg-op.h
731
731
 
732
732
static inline void tcg_gen_rem_i32(TCGv_i32 ret, TCGv_i32 arg1, TCGv_i32 arg2)
733
733
{
734
 
    if (TCG_TARGET_HAS_div_i32) {
 
734
    if (TCG_TARGET_HAS_rem_i32) {
735
735
        tcg_gen_op3_i32(INDEX_op_rem_i32, ret, arg1, arg2);
 
736
    } else if (TCG_TARGET_HAS_div_i32) {
 
737
        TCGv_i32 t0 = tcg_temp_new_i32();
 
738
        tcg_gen_op3_i32(INDEX_op_div_i32, t0, arg1, arg2);
 
739
        tcg_gen_mul_i32(t0, t0, arg2);
 
740
        tcg_gen_sub_i32(ret, arg1, t0);
 
741
        tcg_temp_free_i32(t0);
736
742
    } else if (TCG_TARGET_HAS_div2_i32) {
737
743
        TCGv_i32 t0 = tcg_temp_new_i32();
738
744
        tcg_gen_sari_i32(t0, arg1, 31);
769
775
 
770
776
static inline void tcg_gen_remu_i32(TCGv_i32 ret, TCGv_i32 arg1, TCGv_i32 arg2)
771
777
{
772
 
    if (TCG_TARGET_HAS_div_i32) {
 
778
    if (TCG_TARGET_HAS_rem_i32) {
773
779
        tcg_gen_op3_i32(INDEX_op_remu_i32, ret, arg1, arg2);
 
780
    } else if (TCG_TARGET_HAS_div_i32) {
 
781
        TCGv_i32 t0 = tcg_temp_new_i32();
 
782
        tcg_gen_op3_i32(INDEX_op_divu_i32, t0, arg1, arg2);
 
783
        tcg_gen_mul_i32(t0, t0, arg2);
 
784
        tcg_gen_sub_i32(ret, arg1, t0);
 
785
        tcg_temp_free_i32(t0);
774
786
    } else if (TCG_TARGET_HAS_div2_i32) {
775
787
        TCGv_i32 t0 = tcg_temp_new_i32();
776
788
        tcg_gen_movi_i32(t0, 0);
1361
1373
 
1362
1374
static inline void tcg_gen_rem_i64(TCGv_i64 ret, TCGv_i64 arg1, TCGv_i64 arg2)
1363
1375
{
1364
 
    if (TCG_TARGET_HAS_div_i64) {
 
1376
    if (TCG_TARGET_HAS_rem_i64) {
1365
1377
        tcg_gen_op3_i64(INDEX_op_rem_i64, ret, arg1, arg2);
 
1378
    } else if (TCG_TARGET_HAS_div_i64) {
 
1379
        TCGv_i64 t0 = tcg_temp_new_i64();
 
1380
        tcg_gen_op3_i64(INDEX_op_div_i64, t0, arg1, arg2);
 
1381
        tcg_gen_mul_i64(t0, t0, arg2);
 
1382
        tcg_gen_sub_i64(ret, arg1, t0);
 
1383
        tcg_temp_free_i64(t0);
1366
1384
    } else if (TCG_TARGET_HAS_div2_i64) {
1367
1385
        TCGv_i64 t0 = tcg_temp_new_i64();
1368
1386
        tcg_gen_sari_i64(t0, arg1, 63);
1399
1417
 
1400
1418
static inline void tcg_gen_remu_i64(TCGv_i64 ret, TCGv_i64 arg1, TCGv_i64 arg2)
1401
1419
{
1402
 
    if (TCG_TARGET_HAS_div_i64) {
 
1420
    if (TCG_TARGET_HAS_rem_i64) {
1403
1421
        tcg_gen_op3_i64(INDEX_op_remu_i64, ret, arg1, arg2);
 
1422
    } else if (TCG_TARGET_HAS_div_i64) {
 
1423
        TCGv_i64 t0 = tcg_temp_new_i64();
 
1424
        tcg_gen_op3_i64(INDEX_op_divu_i64, t0, arg1, arg2);
 
1425
        tcg_gen_mul_i64(t0, t0, arg2);
 
1426
        tcg_gen_sub_i64(ret, arg1, t0);
 
1427
        tcg_temp_free_i64(t0);
1404
1428
    } else if (TCG_TARGET_HAS_div2_i64) {
1405
1429
        TCGv_i64 t0 = tcg_temp_new_i64();
1406
1430
        tcg_gen_movi_i64(t0, 0);