From 07ddf036fa66bca279590c09fe1c46bcdcc5bcff Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Mon, 11 Sep 2017 12:08:13 -0700 Subject: [PATCH] tcg: Remove tcg_regset_{or,and,andnot,not} MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- tcg/tcg.c | 2 +- tcg/tcg.h | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/tcg/tcg.c b/tcg/tcg.c index a4badcc85f..dff9999bc6 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -2216,7 +2216,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 ? indirect_reg_alloc_order : tcg_target_reg_alloc_order; /* first try free registers */ diff --git a/tcg/tcg.h b/tcg/tcg.h index 5bf67678d5..006e988788 100644 --- a/tcg/tcg.h +++ b/tcg/tcg.h @@ -190,10 +190,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"