diff options
author | 2009-09-21 15:24:47 +0300 | |
---|---|---|
committer | 2009-09-21 15:24:47 +0300 | |
commit | 7c5b86f066f1bce5942176cb2a091cd60740481b (patch) | |
tree | 695825494a412de61eef2415b54ea1162e0d374f /target-ppc | |
parent | Merge commit '5c637a20e9d13433feb05b804b946690287ffe72' into upstream-merge (diff) | |
parent | Probe for fdatasync() (diff) | |
download | qemu-kvm-7c5b86f066f1bce5942176cb2a091cd60740481b.tar.gz qemu-kvm-7c5b86f066f1bce5942176cb2a091cd60740481b.tar.bz2 qemu-kvm-7c5b86f066f1bce5942176cb2a091cd60740481b.zip |
Merge commit '5f6b9e8fd5b9516170e582d9b6c27c98519a8031' into upstream-merge
* commit '5f6b9e8fd5b9516170e582d9b6c27c98519a8031': (29 commits)
Probe for fdatasync()
PPC: make system bus parent of PCI bus
Fix indentation
ESP: convert to VMState
target-alpha: fix extlh instruction
target-ppc: optimize slw/srw/sld/srd
audio: use correct email address
audio: internal API change
sdlaudio: use correct function names in sdl_XXX calls
oss: use audio_pcm_hw_clip_out
alsa: use audio_pcm_hw_clip_out
audio: introduce audio_pcm_hw_clip_out helper function
audio: use muldiv64 where it makes sense
coreaudio: fix sloppy "posixification" by 1ea879e5580f63414693655fcf0328559cdce138
tcg: fix size of local variables in tcg_gen_bswap64_i64
qemu serial: lost tx irqs (affecting FreeBSD's new uart(4) driver)
fix typo in configure --help
escc: fix IRQ routing, broken by 6c319c82223a1766c5d64a20051e5c6ab7b53951
ide/isa: convert to qdev.
ide/pci: convert to qdev.
...
Conflicts:
configure
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'target-ppc')
-rw-r--r-- | target-ppc/translate.c | 98 |
1 files changed, 49 insertions, 49 deletions
diff --git a/target-ppc/translate.c b/target-ppc/translate.c index 648bf9e18..c8e8b6a4e 100644 --- a/target-ppc/translate.c +++ b/target-ppc/translate.c @@ -1786,21 +1786,24 @@ GEN_PPC64_R4(rldimi, 0x1E, 0x06); /* slw & slw. */ static void gen_slw(DisasContext *ctx) { - TCGv t0; - int l1, l2; - l1 = gen_new_label(); - l2 = gen_new_label(); + TCGv t0, t1; - t0 = tcg_temp_local_new(); - tcg_gen_andi_tl(t0, cpu_gpr[rB(ctx->opcode)], 0x3f); - tcg_gen_brcondi_tl(TCG_COND_LT, t0, 0x20, l1); - tcg_gen_movi_tl(cpu_gpr[rA(ctx->opcode)], 0); - tcg_gen_br(l2); - gen_set_label(l1); - tcg_gen_shl_tl(cpu_gpr[rA(ctx->opcode)], cpu_gpr[rS(ctx->opcode)], t0); - tcg_gen_ext32u_tl(cpu_gpr[rA(ctx->opcode)], cpu_gpr[rA(ctx->opcode)]); - gen_set_label(l2); + t0 = tcg_temp_new(); + /* AND rS with a mask that is 0 when rB >= 0x20 */ +#if defined(TARGET_PPC64) + tcg_gen_shli_tl(t0, cpu_gpr[rB(ctx->opcode)], 0x3a); + tcg_gen_sari_tl(t0, t0, 0x3f); +#else + tcg_gen_shli_tl(t0, cpu_gpr[rB(ctx->opcode)], 0x1a); + tcg_gen_sari_tl(t0, t0, 0x1f); +#endif + tcg_gen_andc_tl(t0, cpu_gpr[rS(ctx->opcode)], t0); + t1 = tcg_temp_new(); + tcg_gen_andi_tl(t1, cpu_gpr[rB(ctx->opcode)], 0x1f); + tcg_gen_shl_tl(cpu_gpr[rA(ctx->opcode)], t0, t1); + tcg_temp_free(t1); tcg_temp_free(t0); + tcg_gen_ext32u_tl(cpu_gpr[rA(ctx->opcode)], cpu_gpr[rA(ctx->opcode)]); if (unlikely(Rc(ctx->opcode) != 0)) gen_set_Rc0(ctx, cpu_gpr[rA(ctx->opcode)]); } @@ -1848,21 +1851,22 @@ static void gen_srawi(DisasContext *ctx) static void gen_srw(DisasContext *ctx) { TCGv t0, t1; - int l1, l2; - l1 = gen_new_label(); - l2 = gen_new_label(); - t0 = tcg_temp_local_new(); - tcg_gen_andi_tl(t0, cpu_gpr[rB(ctx->opcode)], 0x3f); - tcg_gen_brcondi_tl(TCG_COND_LT, t0, 0x20, l1); - tcg_gen_movi_tl(cpu_gpr[rA(ctx->opcode)], 0); - tcg_gen_br(l2); - gen_set_label(l1); + t0 = tcg_temp_new(); + /* AND rS with a mask that is 0 when rB >= 0x20 */ +#if defined(TARGET_PPC64) + tcg_gen_shli_tl(t0, cpu_gpr[rB(ctx->opcode)], 0x3a); + tcg_gen_sari_tl(t0, t0, 0x3f); +#else + tcg_gen_shli_tl(t0, cpu_gpr[rB(ctx->opcode)], 0x1a); + tcg_gen_sari_tl(t0, t0, 0x1f); +#endif + tcg_gen_andc_tl(t0, cpu_gpr[rS(ctx->opcode)], t0); + tcg_gen_ext32u_tl(t0, t0); t1 = tcg_temp_new(); - tcg_gen_ext32u_tl(t1, cpu_gpr[rS(ctx->opcode)]); - tcg_gen_shr_tl(cpu_gpr[rA(ctx->opcode)], t1, t0); + tcg_gen_andi_tl(t1, cpu_gpr[rB(ctx->opcode)], 0x1f); + tcg_gen_shr_tl(cpu_gpr[rA(ctx->opcode)], t0, t1); tcg_temp_free(t1); - gen_set_label(l2); tcg_temp_free(t0); if (unlikely(Rc(ctx->opcode) != 0)) gen_set_Rc0(ctx, cpu_gpr[rA(ctx->opcode)]); @@ -1872,19 +1876,17 @@ static void gen_srw(DisasContext *ctx) /* sld & sld. */ static void gen_sld(DisasContext *ctx) { - TCGv t0; - int l1, l2; - l1 = gen_new_label(); - l2 = gen_new_label(); + TCGv t0, t1; - t0 = tcg_temp_local_new(); - tcg_gen_andi_tl(t0, cpu_gpr[rB(ctx->opcode)], 0x7f); - tcg_gen_brcondi_tl(TCG_COND_LT, t0, 0x40, l1); - tcg_gen_movi_tl(cpu_gpr[rA(ctx->opcode)], 0); - tcg_gen_br(l2); - gen_set_label(l1); - tcg_gen_shl_tl(cpu_gpr[rA(ctx->opcode)], cpu_gpr[rS(ctx->opcode)], t0); - gen_set_label(l2); + t0 = tcg_temp_new(); + /* AND rS with a mask that is 0 when rB >= 0x40 */ + tcg_gen_shli_tl(t0, cpu_gpr[rB(ctx->opcode)], 0x39); + tcg_gen_sari_tl(t0, t0, 0x3f); + tcg_gen_andc_tl(t0, cpu_gpr[rS(ctx->opcode)], t0); + t1 = tcg_temp_new(); + tcg_gen_andi_tl(t1, cpu_gpr[rB(ctx->opcode)], 0x3f); + tcg_gen_shl_tl(cpu_gpr[rA(ctx->opcode)], t0, t1); + tcg_temp_free(t1); tcg_temp_free(t0); if (unlikely(Rc(ctx->opcode) != 0)) gen_set_Rc0(ctx, cpu_gpr[rA(ctx->opcode)]); @@ -1939,19 +1941,17 @@ static void gen_sradi1(DisasContext *ctx) /* srd & srd. */ static void gen_srd(DisasContext *ctx) { - TCGv t0; - int l1, l2; - l1 = gen_new_label(); - l2 = gen_new_label(); + TCGv t0, t1; - t0 = tcg_temp_local_new(); - tcg_gen_andi_tl(t0, cpu_gpr[rB(ctx->opcode)], 0x7f); - tcg_gen_brcondi_tl(TCG_COND_LT, t0, 0x40, l1); - tcg_gen_movi_tl(cpu_gpr[rA(ctx->opcode)], 0); - tcg_gen_br(l2); - gen_set_label(l1); - tcg_gen_shr_tl(cpu_gpr[rA(ctx->opcode)], cpu_gpr[rS(ctx->opcode)], t0); - gen_set_label(l2); + t0 = tcg_temp_new(); + /* AND rS with a mask that is 0 when rB >= 0x40 */ + tcg_gen_shli_tl(t0, cpu_gpr[rB(ctx->opcode)], 0x39); + tcg_gen_sari_tl(t0, t0, 0x3f); + tcg_gen_andc_tl(t0, cpu_gpr[rS(ctx->opcode)], t0); + t1 = tcg_temp_new(); + tcg_gen_andi_tl(t1, cpu_gpr[rB(ctx->opcode)], 0x3f); + tcg_gen_shr_tl(cpu_gpr[rA(ctx->opcode)], t0, t1); + tcg_temp_free(t1); tcg_temp_free(t0); if (unlikely(Rc(ctx->opcode) != 0)) gen_set_Rc0(ctx, cpu_gpr[rA(ctx->opcode)]); |