From 9a9c2ede4a2d8beac84ea1aef7483da93ab9cc3a Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Sun, 4 Mar 2018 23:34:12 -0500 Subject: [PATCH] tcg: Remove tcg_regset_{or,and,andnot,not} Backports commit 07ddf036fa66bca279590c09fe1c46bcdcc5bcff from qemu --- qemu/tcg/tcg.c | 2 +- qemu/tcg/tcg.h | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/qemu/tcg/tcg.c b/qemu/tcg/tcg.c index 7c10af7c..09d0841e 100644 --- a/qemu/tcg/tcg.c +++ b/qemu/tcg/tcg.c @@ -2296,7 +2296,7 @@ static TCGReg tcg_reg_alloc(TCGContext *s, TCGRegSet desired_regs, TCGReg reg; TCGRegSet reg_ct; - tcg_regset_andnot(reg_ct, desired_regs, allocated_regs); + reg_ct = desired_regs & ~allocated_regs; order = rev ? s->indirect_reg_alloc_order : tcg_target_reg_alloc_order; /* first try free registers */ diff --git a/qemu/tcg/tcg.h b/qemu/tcg/tcg.h index 9559a4cd..157d25a7 100644 --- a/qemu/tcg/tcg.h +++ b/qemu/tcg/tcg.h @@ -193,10 +193,6 @@ typedef enum TCGOpcode { #define tcg_regset_set_reg(d, r) (d) |= 1L << (r) #define tcg_regset_reset_reg(d, r) (d) &= ~(1L << (r)) #define tcg_regset_test_reg(d, r) (((d) >> (r)) & 1) -#define tcg_regset_or(d, a, b) (d) = (a) | (b) -#define tcg_regset_and(d, a, b) (d) = (a) & (b) -#define tcg_regset_andnot(d, a, b) (d) = (a) & ~(b) -#define tcg_regset_not(d, a) (d) = ~(a) #ifndef TCG_TARGET_INSN_UNIT_SIZE # error "Missing TCG_TARGET_INSN_UNIT_SIZE"