← Back to branch summary

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

« back to all changes in this revision

Viewing changes to target-microblaze/translate.c

  • 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:
target-microblaze/translate.c
1737
1737
}
1738
1738
 
1739
1739
/* generate intermediate code for basic block 'tb'.  */
1740
 
static void
1741
 
gen_intermediate_code_internal(CPUMBState *env, TranslationBlock *tb,
1742
 
                               int search_pc)
 
1740
static inline void
 
1741
gen_intermediate_code_internal(MicroBlazeCPU *cpu, TranslationBlock *tb,
 
1742
                               bool search_pc)
1743
1743
{
 
1744
    CPUState *cs = CPU(cpu);
 
1745
    CPUMBState *env = &cpu->env;
1744
1746
    uint16_t *gen_opc_end;
1745
1747
    uint32_t pc_start;
1746
1748
    int j, lj;
1765
1767
        dc->jmp = JMP_INDIRECT;
1766
1768
    }
1767
1769
    dc->pc = pc_start;
1768
 
    dc->singlestep_enabled = env->singlestep_enabled;
 
1770
    dc->singlestep_enabled = cs->singlestep_enabled;
1769
1771
    dc->cpustate_changed = 0;
1770
1772
    dc->abort_at_next_insn = 0;
1771
1773
    dc->nr_nops = 0;
1776
1778
    if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)) {
1777
1779
#if !SIM_COMPAT
1778
1780
        qemu_log("--------------\n");
1779
 
        log_cpu_state(env, 0);
 
1781
        log_cpu_state(CPU(cpu), 0);
1780
1782
#endif
1781
1783
    }
1782
1784
 
1858
1860
                break;
1859
1861
            }
1860
1862
        }
1861
 
        if (env->singlestep_enabled)
 
1863
        if (cs->singlestep_enabled) {
1862
1864
            break;
 
1865
        }
1863
1866
    } while (!dc->is_jmp && !dc->cpustate_changed
1864
1867
         && tcg_ctx.gen_opc_ptr < gen_opc_end
1865
1868
                 && !singlestep
1886
1889
    }
1887
1890
    t_sync_flags(dc);
1888
1891
 
1889
 
    if (unlikely(env->singlestep_enabled)) {
 
1892
    if (unlikely(cs->singlestep_enabled)) {
1890
1893
        TCGv_i32 tmp = tcg_const_i32(EXCP_DEBUG);
1891
1894
 
1892
1895
        if (dc->is_jmp != DISAS_JUMP) {
1941
1944
 
1942
1945
void gen_intermediate_code (CPUMBState *env, struct TranslationBlock *tb)
1943
1946
{
1944
 
    gen_intermediate_code_internal(env, tb, 0);
 
1947
    gen_intermediate_code_internal(mb_env_get_cpu(env), tb, false);
1945
1948
}
1946
1949
 
1947
1950
void gen_intermediate_code_pc (CPUMBState *env, struct TranslationBlock *tb)
1948
1951
{
1949
 
    gen_intermediate_code_internal(env, tb, 1);
 
1952
    gen_intermediate_code_internal(mb_env_get_cpu(env), tb, true);
1950
1953
}
1951
1954
 
1952
 
void cpu_dump_state (CPUMBState *env, FILE *f, fprintf_function cpu_fprintf,
1953
 
                     int flags)
 
1955
void mb_cpu_dump_state(CPUState *cs, FILE *f, fprintf_function cpu_fprintf,
 
1956
                       int flags)
1954
1957
{
 
1958
    MicroBlazeCPU *cpu = MICROBLAZE_CPU(cs);
 
1959
    CPUMBState *env = &cpu->env;
1955
1960
    int i;
1956
1961
 
1957
1962
    if (!env || !f)