[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 6/6] tcg: Complete handling of ALWAYS and NEVER
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PULL 6/6] tcg: Complete handling of ALWAYS and NEVER |
Date: |
Fri, 13 Mar 2015 13:23:13 -0700 |
Missing from movcond, and brcondi_i32 (but not brcondi_i64).
Signed-off-by: Richard Henderson <address@hidden>
---
tcg/tcg-op.c | 22 +++++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c
index 6674bb4..f7a2767 100644
--- a/tcg/tcg-op.c
+++ b/tcg/tcg-op.c
@@ -286,9 +286,13 @@ void tcg_gen_brcond_i32(TCGCond cond, TCGv_i32 arg1,
TCGv_i32 arg2, TCGLabel *l)
void tcg_gen_brcondi_i32(TCGCond cond, TCGv_i32 arg1, int32_t arg2, TCGLabel
*l)
{
- TCGv_i32 t0 = tcg_const_i32(arg2);
- tcg_gen_brcond_i32(cond, arg1, t0, l);
- tcg_temp_free_i32(t0);
+ if (cond == TCG_COND_ALWAYS) {
+ tcg_gen_br(l);
+ } else if (cond != TCG_COND_NEVER) {
+ TCGv_i32 t0 = tcg_const_i32(arg2);
+ tcg_gen_brcond_i32(cond, arg1, t0, l);
+ tcg_temp_free_i32(t0);
+ }
}
void tcg_gen_setcond_i32(TCGCond cond, TCGv_i32 ret,
@@ -546,7 +550,11 @@ void tcg_gen_deposit_i32(TCGv_i32 ret, TCGv_i32 arg1,
TCGv_i32 arg2,
void tcg_gen_movcond_i32(TCGCond cond, TCGv_i32 ret, TCGv_i32 c1,
TCGv_i32 c2, TCGv_i32 v1, TCGv_i32 v2)
{
- if (TCG_TARGET_HAS_movcond_i32) {
+ if (cond == TCG_COND_ALWAYS) {
+ tcg_gen_mov_i32(ret, v1);
+ } else if (cond == TCG_COND_NEVER) {
+ tcg_gen_mov_i32(ret, v2);
+ } else if (TCG_TARGET_HAS_movcond_i32) {
tcg_gen_op6i_i32(INDEX_op_movcond_i32, ret, c1, c2, v1, v2, cond);
} else {
TCGv_i32 t0 = tcg_temp_new_i32();
@@ -1590,7 +1598,11 @@ void tcg_gen_deposit_i64(TCGv_i64 ret, TCGv_i64 arg1,
TCGv_i64 arg2,
void tcg_gen_movcond_i64(TCGCond cond, TCGv_i64 ret, TCGv_i64 c1,
TCGv_i64 c2, TCGv_i64 v1, TCGv_i64 v2)
{
- if (TCG_TARGET_REG_BITS == 32) {
+ if (cond == TCG_COND_ALWAYS) {
+ tcg_gen_mov_i64(ret, v1);
+ } else if (cond == TCG_COND_NEVER) {
+ tcg_gen_mov_i64(ret, v2);
+ } else if (TCG_TARGET_REG_BITS == 32) {
TCGv_i32 t0 = tcg_temp_new_i32();
TCGv_i32 t1 = tcg_temp_new_i32();
tcg_gen_op6i_i32(INDEX_op_setcond2_i32, t0,
--
2.1.0
- [Qemu-devel] [PULL 0/6] Use tcg_malloc more; tcg_cond_always fix, Richard Henderson, 2015/03/13
- [Qemu-devel] [PULL 6/6] tcg: Complete handling of ALWAYS and NEVER,
Richard Henderson <=
- [Qemu-devel] [PULL 1/6] tcg: Use tcg_malloc to allocate TCGLabelQemuLdst, Richard Henderson, 2015/03/13
- [Qemu-devel] [PULL 2/6] tcg-ia64: Use tcg_malloc to allocate TCGLabelQemuLdst, Richard Henderson, 2015/03/13
- [Qemu-devel] [PULL 5/6] tcg: Use tcg_malloc to allocate TCGLabel, Richard Henderson, 2015/03/13
- [Qemu-devel] [PULL 4/6] tcg: Change generator-side labels to a pointer, Richard Henderson, 2015/03/13
- [Qemu-devel] [PULL 3/6] tcg: Change translator-side labels to a pointer, Richard Henderson, 2015/03/13
- Re: [Qemu-devel] [PULL 0/6] Use tcg_malloc more; tcg_cond_always fix, Patchew Tool, 2015/03/13
- Re: [Qemu-devel] [PULL 0/6] Use tcg_malloc more; tcg_cond_always fix, Peter Maydell, 2015/03/16
- Re: [Qemu-devel] [PULL 0/6] Use tcg_malloc more; tcg_cond_always fix, Peter Maydell, 2015/03/16