← Back to branch summary

~fboudra/qemu-linaro/new-upstream-release-1.2.0-2012.09-0ubuntu1

« back to all changes in this revision

Viewing changes to gen-icount.h

  • Committer: Fathi Boudra
  • Author(s): Fathi Boudra
  • Date: 2012-08-21 06:47:11 UTC
  • mfrom: (0.1.16)
  • Revision ID: fathi.boudra@linaro.org-20120821064711-7yxmubp2v8a44xce
Tags: 1.1.50-2012.08-0ubuntu1
https://launchpad.net/bugs/1030588
https://launchpad.net/bugs/1030594
* New upstream release.
  - support emulated systems with more than 2G of memory. (LP: #1030588)
* Drop powerpc-missing-include.patch - merged upstream.
* Update debian/control: 
  - drop perl build dependency.
  - add libfdt-dev build dependency.
* Update debian/qemu-keymaps.install file.
* Update debian/rules:
  - update QEMU_CPU for ARM architecture: armv4l -> armv7l.
  - update conf_audio_drv: default to PulseAudio since PA is the default on
    Ubuntu.
  - enable KVM on ARM architecture.
  - enable flat device tree support (--enable-fdt). (LP: #1030594)

Show diffs side-by-side

added added

removed removed

Lines of Context:
gen-icount.h
14
14
 
15
15
    icount_label = gen_new_label();
16
16
    count = tcg_temp_local_new_i32();
17
 
    tcg_gen_ld_i32(count, cpu_env, offsetof(CPUState, icount_decr.u32));
 
17
    tcg_gen_ld_i32(count, cpu_env, offsetof(CPUArchState, icount_decr.u32));
18
18
    /* This is a horrid hack to allow fixing up the value later.  */
19
19
    icount_arg = gen_opparam_ptr + 1;
20
20
    tcg_gen_subi_i32(count, count, 0xdeadbeef);
21
21
 
22
22
    tcg_gen_brcondi_i32(TCG_COND_LT, count, 0, icount_label);
23
 
    tcg_gen_st16_i32(count, cpu_env, offsetof(CPUState, icount_decr.u16.low));
 
23
    tcg_gen_st16_i32(count, cpu_env, offsetof(CPUArchState, icount_decr.u16.low));
24
24
    tcg_temp_free_i32(count);
25
25
}
26
26
 
36
36
static inline void gen_io_start(void)
37
37
{
38
38
    TCGv_i32 tmp = tcg_const_i32(1);
39
 
    tcg_gen_st_i32(tmp, cpu_env, offsetof(CPUState, can_do_io));
 
39
    tcg_gen_st_i32(tmp, cpu_env, offsetof(CPUArchState, can_do_io));
40
40
    tcg_temp_free_i32(tmp);
41
41
}
42
42
 
43
43
static inline void gen_io_end(void)
44
44
{
45
45
    TCGv_i32 tmp = tcg_const_i32(0);
46
 
    tcg_gen_st_i32(tmp, cpu_env, offsetof(CPUState, can_do_io));
 
46
    tcg_gen_st_i32(tmp, cpu_env, offsetof(CPUArchState, can_do_io));
47
47
    tcg_temp_free_i32(tmp);
48
48
}