From 3f9232d5de481ae994a9311e926faf08c30398b3 Mon Sep 17 00:00:00 2001 From: pancake Date: Fri, 28 Jul 2017 02:40:51 +0200 Subject: [PATCH] Handle asm.bits=27 in rasm2 -L --- binr/rasm2/rasm2.c | 12 ++++++++---- libr/debug/debug.c | 5 ----- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/binr/rasm2/rasm2.c b/binr/rasm2/rasm2.c index ff2e025bfa..4b4d4c2974 100644 --- a/binr/rasm2/rasm2.c +++ b/binr/rasm2/rasm2.c @@ -91,10 +91,14 @@ static void rasm2_list(RAsm *la, const char *arch) { } } else { bits[0] = 0; - if (h->bits & 8) strcat (bits, "8 "); - if (h->bits & 16) strcat (bits, "16 "); - if (h->bits & 32) strcat (bits, "32 "); - if (h->bits & 64) strcat (bits, "64 "); + if (h->bits == 27) { + strcat (bits, "27"); + } else { + if (h->bits & 8) strcat (bits, "8 "); + if (h->bits & 16) strcat (bits, "16 "); + if (h->bits & 32) strcat (bits, "32 "); + if (h->bits & 64) strcat (bits, "64 "); + } feat = "__"; if (h->assemble && h->disassemble) feat = "ad"; if (h->assemble && !h->disassemble) feat = "a_"; diff --git a/libr/debug/debug.c b/libr/debug/debug.c index fef6534278..201232c0f8 100644 --- a/libr/debug/debug.c +++ b/libr/debug/debug.c @@ -1441,11 +1441,6 @@ R_API int r_debug_child_clone(RDebug *dbg) { R_API bool r_debug_is_dead (RDebug *dbg) { bool is_dead = (dbg->pid == -1 && strncmp (dbg->h->name, "gdb", 3)) || (dbg->reason.type == R_DEBUG_REASON_DEAD); -#if 0 - if (!strncmp (dbg->h->name, "clcy", 4)) { - return false; - } -#endif if (dbg->pid > 0) { is_dead = !dbg->h->kill (dbg, dbg->pid, false, 0); }