From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 6C7C7385801A for ; Wed, 10 Aug 2022 14:24:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 6C7C7385801A Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-290-YKJcwjLKNIWr1yGydwlh2w-1; Wed, 10 Aug 2022 10:24:45 -0400 X-MC-Unique: YKJcwjLKNIWr1yGydwlh2w-1 Received: by mail-wm1-f70.google.com with SMTP id v24-20020a7bcb58000000b003a37681b861so667787wmj.9 for ; Wed, 10 Aug 2022 07:24:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=65QQkWVgegz5e0gNSSyAofG2htrRSY1bDJu5alpiO1s=; b=MurhXkgnHkFPjoDzw0LkJDABu45ayHS6knyHdlEI10V7s+iAc4aXbm7anBpOfNTHCF 6xmNvPsvKkhHCVgfc7wDEuqPC8PJe2chIOq7utXQuwy/XT8MLRlyfFW5yiYvpfmqM+Sf rUOdH+avx1Fox3nIRYT2xR/AHV7vErTIjwqKWW6oLqxSUBgCTTE20n1d5cj7lCB1MpD1 PWV7P2sC4omdiLgfvzvfIXEFpPPbnRlmK1RkEpR554hxMlWkGd6Nh7gw0C5Hj5KQZbDQ T+Zim2DOwIM8fKb7VrhVIFqS80vkMf+dVzhUNx95nDLMADUUPFOZnUNtDQA+NbFrv2hT BQiA== X-Gm-Message-State: ACgBeo3LNrJ4Sm3fFWkQHPUyhYKeCBWsIg9NWHxWHx2YmSSBUKAXUZnG Cq8sR7ftzJ4R+HigdMzAFo9n8+L8ZxRJEImDduGVOGnOBBzKqflGI8oAkXKG4C1Vca13Ed42FZI HkB/vNO4zhD7w4IF13Sa80Yppm75+bp2EvR1eHkTwRdTfRGyRvRkaNVHZ9SZ10YWQd4lXAw== X-Received: by 2002:a05:6000:1704:b0:220:69a7:ec2b with SMTP id n4-20020a056000170400b0022069a7ec2bmr18302633wrc.436.1660141483872; Wed, 10 Aug 2022 07:24:43 -0700 (PDT) X-Google-Smtp-Source: AA6agR6j1d5mbezobyluNywN3s79Yeaa4oi2xIFvYx0BxZo7WYaDlmzfWAWHri4ji4aGLZlje1hfKw== X-Received: by 2002:a05:6000:1704:b0:220:69a7:ec2b with SMTP id n4-20020a056000170400b0022069a7ec2bmr18302623wrc.436.1660141483669; Wed, 10 Aug 2022 07:24:43 -0700 (PDT) Received: from localhost (15.72.115.87.dyn.plus.net. [87.115.72.15]) by smtp.gmail.com with ESMTPSA id o36-20020a05600c512400b003a5317f07b4sm2800252wms.37.2022.08.10.07.24.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Aug 2022 07:24:43 -0700 (PDT) From: Andrew Burgess To: binutils@sourceware.org Cc: Andrew Burgess Subject: [PATCH 1/3] objdump: fix extended (256) disassembler colors Date: Wed, 10 Aug 2022 15:24:37 +0100 Message-Id: <091335e069804270ba8d9e217285c70743100603.1660139020.git.aburgess@redhat.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Spam-Status: No, score=-10.3 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Aug 2022 14:24:48 -0000 After commit: commit a88c79b77036e4778e70d62081c3cfd1044bb8e3 Date: Tue Aug 9 14:57:48 2022 +0100 Default to enabling colored disassembly if output is to a terminal. The 256 extended-color support for --disassembler-color was broken. This is fixed in this commit. PR 29457 * objdump (objdump_styled_sprintf): Check disassembler_color against an enum value, don't treat it as a bool. --- binutils/objdump.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/binutils/objdump.c b/binutils/objdump.c index 08c335476ff..9259c76c716 100644 --- a/binutils/objdump.c +++ b/binutils/objdump.c @@ -2247,7 +2247,7 @@ objdump_styled_sprintf (SFILE *f, enum disassembler_style style, { size_t space = f->alloc - f->pos; - if (disassembler_color) + if (disassembler_color == on) n = snprintf (f->buffer + f->pos, space, "\033[%dm", color); else n = snprintf (f->buffer + f->pos, space, "\033[38;5;%dm", color); -- 2.25.4