From e4f526be5c305c278eab9bf322978a431fa97fe9 Mon Sep 17 00:00:00 2001 From: Cyrill Gorcunov Date: Sun, 18 Oct 2009 12:41:14 +0400 Subject: [PATCH] continue using is_class helper Signed-off-by: Cyrill Gorcunov --- assemble.c | 2 +- disasm.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/assemble.c b/assemble.c index 821f0190f..ca2b90997 100644 --- a/assemble.c +++ b/assemble.c @@ -2557,7 +2557,7 @@ static void add_asp(insn *ins, int addrbits) } for (j = 0; j < ins->operands; j++) { - if (!(MEMORY & ~ins->oprs[j].type)) { + if (is_class(MEMORY, ins->oprs[j].type)) { opflags_t i, b; /* Verify as Register */ diff --git a/disasm.c b/disasm.c index ede485ac8..561851abc 100644 --- a/disasm.c +++ b/disasm.c @@ -1180,7 +1180,7 @@ int32_t disasm(uint8_t *data, char *output, int outbufsize, int segsize, /* If it's a mem-only EA but we have a register, die. */ ((tmp_ins.oprs[i].segment & SEG_RMREG) && - !(MEMORY & ~(*p)->opd[i])) || + is_class(MEMORY, (*p)->opd[i])) || /* If it's a reg-only EA but we have a memory ref, die. */ (!(tmp_ins.oprs[i].segment & SEG_RMREG) && @@ -1343,7 +1343,7 @@ int32_t disasm(uint8_t *data, char *output, int outbufsize, int segsize, o->disp_size == 32 ? "dword " : o->disp_size == 16 ? "word " : ""), offs); segover = NULL; - } else if (!(REGMEM & ~t)) { + } else if (is_class(REGMEM, t)) { int started = false; if (t & BITS8) slen +=