From patchwork Thu Jan 18 11:28:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Georg-Johann Lay X-Patchwork-Id: 84337 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 29238385F024 for ; Thu, 18 Jan 2024 11:28:58 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mo4-p00-ob.smtp.rzone.de (mo4-p00-ob.smtp.rzone.de [81.169.146.220]) by sourceware.org (Postfix) with ESMTPS id 7F82C385ED72 for ; Thu, 18 Jan 2024 11:28:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7F82C385ED72 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=gjlay.de Authentication-Results: sourceware.org; spf=none smtp.mailfrom=gjlay.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 7F82C385ED72 Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=81.169.146.220 ARC-Seal: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1705577307; cv=pass; b=xXHMtwfzRL0udbh3wUiNXEVeDd1B6VCLiUZ/zZ34ATfn3njwxL+74RZgyGyqTPTSAvJ/S5wMitUcMIc6orevMS5+SemZNcFokI7gqAMKFGKdMFMyn1osZLOPlbDwZ7xfd0ancjPI8CY+6qc3BkJ24IERLVkTmas1DohaDAS55lg= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1705577307; c=relaxed/simple; bh=ZVTJxbVC/gw3N5b37FdngVSeZt4tZp/dOCaVJPnHAT0=; h=DKIM-Signature:DKIM-Signature:Message-ID:Date:MIME-Version:From: To:Subject; b=NkV7vTcVxHckup0bnprtNWJ0vdKd+sEf5Y5XSuDZ3spvujZ3XfRwgYhNQ5a4W6fE8C8tnQPgRGliPO+ns1ATQ75XWLHVQU/uOeTWj1bwtn6utDpvfLNgWcwg5/lfZ5o29F5lRtLMzZ/kHMgNNFH/isWUGqAgNrioYqnZenwHfec= ARC-Authentication-Results: i=2; server2.sourceware.org ARC-Seal: i=1; a=rsa-sha256; t=1705577302; cv=none; d=strato.com; s=strato-dkim-0002; b=K9aPwG/Y3AhlPu5hkmS+5cUamqCY3F5RgXn1GjgUrRdp1Wy7UTK2j9X/MgS6RWhYs5 wK2DEhksNc4F43q4u1q/4myxRJYz3vHnGx2dMndd4S9iaLQjaxRr18IynmLd4nJdjpFw iPxB+zUc+crt9octkf5ElBZE1vv9eR/EkkrRkZal104AwXuT4abHmUfbipLHsN9dq3Tc 2OLq5RCLjpDDP0J1OFiLgoEYvRSsmYReDwJxWh5nRM2cwXEb5ihjAOzR2QpZgNBYER4L Wg1WKcr9pcHTn2TA1DYTgNLV/AA6r9S/k0w9hHi74wq7hBB/6iPmw2d6uPujCTwko25B TlbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1705577302; s=strato-dkim-0002; d=strato.com; h=Subject:To:From:Date:Message-ID:Cc:Date:From:Subject:Sender; bh=x32Ene5A+4NV1RkQAxtfq1z6dSZKTN3un/z9VYWTeO8=; b=RW1NRroWi70zY1LeQvd/d/yHlcQ8dUZJzDauy3B5fSj1Ely7zNbU8b+1NcMl5GyIdV sMwnPC+5hJq4AoQG/Qvfa0tbNJEeANLAMG4JIz5AbMU5oO0Dm20DDOVMNJs5LWX6BfMb 80kilpY6Fqw/i89O3bMSMaLxUW+6B1XnLyYZF3QqzcHSlN8I/jJg1bBTLTj4ozeEKDUF FE0B9etw86KQItaDoPFCJyVF86Hy56P/5GjUGEBLp4J3dLpewtn3wVA8m19lIX/GP6T4 RZfeOPFXya7ik2gsN0Tb7AFirGWv9xqDZaHjFbZk3iSFnk1eIeUdI5PR0anpvHbWJHlk hmww== ARC-Authentication-Results: i=1; strato.com; arc=none; dkim=none X-RZG-CLASS-ID: mo00 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1705577302; s=strato-dkim-0002; d=gjlay.de; h=Subject:To:From:Date:Message-ID:Cc:Date:From:Subject:Sender; bh=x32Ene5A+4NV1RkQAxtfq1z6dSZKTN3un/z9VYWTeO8=; b=OsktqD9TRck1tIy8H3+NKuQa+xAWHiyu6PL8Awf73LaIzmSxJCevBS3InL/QZG2nVC 8sSz+XIdV17+WfGUybrLkodJX4klmDuBGS6NX9b9AM4l5oqeIvXrlH/Xp59Qsx+4v0B7 MgSuCiw2sGI/czGD6Q7ehyXJmigMoecHywUOmI1spYvyJ+5xoTN+ytjlrB+PLBj2kfyp e3no6Mk1aparRdMTHjPF11hnWcG1XjDZlAmeQr7OfBgyYZQGoVdZ6gTlAlram+Ow7ki2 8LYB96dqPbuZ6m1EEy2NLOMbqJdmQ8OFyDvR+PB8c9H72AVUkORIt5hnMR+qtYDXJj25 KPFw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1705577301; s=strato-dkim-0003; d=gjlay.de; h=Subject:To:From:Date:Message-ID:Cc:Date:From:Subject:Sender; bh=x32Ene5A+4NV1RkQAxtfq1z6dSZKTN3un/z9VYWTeO8=; b=UtezO4NfEfkn6m6LuPPju4ggHAfB55fUK0PjbYwBpW9XWYzon3glg8Z+cj8E+boWRK 5t8Bf4SntbALcBRZTeBQ== X-RZG-AUTH: ":LXoWVUeid/7A29J/hMvvT3koxZnKT7Qq0xotTetVnKkSjsSjq3WhKPVxx3mY" Received: from [192.168.2.102] by smtp.strato.de (RZmta 49.10.2 DYNA|AUTH) with ESMTPSA id g5de8600IBSLuYA (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate) for ; Thu, 18 Jan 2024 12:28:21 +0100 (CET) Message-ID: <41992b8b-c527-4971-8ed7-706b29e65171@gjlay.de> Date: Thu, 18 Jan 2024 12:28:20 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US From: Georg-Johann Lay To: gcc-patches@gcc.gnu.org Subject: [patch,avr,applied] Tabify some files. X-Spam-Status: No, score=-11.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, 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: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org The C++ files in the avr backend are a mix of TABS and 8 spaces for indentation. This patch rectifies that according to the coding rules. I applied this prior to the advent of the v14 branch so that back-porting will be easier, at least from the new master to v14. Johann --- gcc/ * config/avr/avr-log.cc: Tabify. * config/avr/avr-devices.cc: Tabify. * config/avr/avr-c.cc: Tabify. * config/avr/driver-avr.cc: Tabify. * config/avr/gen-avr-mmcu-texi.cc: Tabify. * config/avr/gen-avr-mmcu-specs.cc: Tabify. diff --git a/gcc/config/avr/avr-log.cc b/gcc/config/avr/avr-log.cc index 395e6e64f83..d702c5f3fd8 100644 --- a/gcc/config/avr/avr-log.cc +++ b/gcc/config/avr/avr-log.cc @@ -85,7 +85,7 @@ int avr_vdump (FILE *stream, const char *caller, ...) { va_list ap; - + if (stream == NULL && dump_file) stream = dump_file; @@ -112,161 +112,161 @@ avr_log_vadump (FILE *file, const char *caller, va_list ap) while (*fmt) { switch (*fmt++) - { - default: - fputc (*(fmt-1), file); - break; - - case '\\': - bs[1] = *fmt++; - fputs (bs, file); - break; - - case '%': - switch (*fmt++) - { - case '%': - fputc ('%', file); - break; - - case 't': - { - tree t = va_arg (ap, tree); - if (NULL_TREE == t) - fprintf (file, ""); - else - { - if (stderr == file) - debug_tree (t); - else - { - print_node (file, "", t, 0); - putc ('\n', file); - } - } - break; - } - - case 'T': - { - tree t = va_arg (ap, tree); - if (NULL_TREE == t) - fprintf (file, ""); - else - print_node_brief (file, "", t, 3); - } - break; - - case 'd': - fprintf (file, "%d", va_arg (ap, int)); - break; - - case 'x': - fprintf (file, "%x", va_arg (ap, int)); - break; - - case 'b': - fprintf (file, "%s", va_arg (ap, int) ? "true" : "false"); - break; - - case 'c': - fputc (va_arg (ap, int), file); - break; - - case 'r': - print_inline_rtx (file, va_arg (ap, rtx), 0); - break; - - case 'L': - { - rtx_insn *insn = safe_as_a (va_arg (ap, rtx)); - - while (insn) - { - print_inline_rtx (file, insn, 0); - fprintf (file, "\n"); - insn = NEXT_INSN (insn); - } - break; - } - - case 'f': - if (cfun && cfun->decl) - fputs (current_function_name(), file); - break; - - case 's': - { - const char *str = va_arg (ap, char*); - fputs (str ? str : "(null)", file); - } - break; - - case 'm': - fputs (GET_MODE_NAME ((machine_mode) va_arg (ap, int)), - file); - break; - - case 'C': - fputs (rtx_name[va_arg (ap, int)], file); - break; - - case 'R': - fputs (reg_class_names[va_arg (ap, int)], file); - break; - - case 'F': - fputs (caller, file); - break; - - case 'H': - { - location_t loc = va_arg (ap, location_t); - - if (BUILTINS_LOCATION == loc) - fprintf (file, ""); - else if (UNKNOWN_LOCATION == loc) - fprintf (file, ""); - else - fprintf (file, "%s:%d", - LOCATION_FILE (loc), LOCATION_LINE (loc)); - - break; - } - - case '!': - if (!current_pass) - return; - /* FALLTHRU */ - - case '?': - avr_vdump (file, caller, "%F[%f:%P]"); - break; - - case 'P': - if (current_pass) - fprintf (file, "%s(%d)", - current_pass->name, - current_pass->static_pass_number); - else - fprintf (file, "pass=?"); - - break; - - case 'A': - fflush (file); - abort(); - - default: - /* Unknown %-code: Stop printing */ - - fprintf (file, "??? %%%c ???%s\n", *(fmt-1), fmt); - fmt = ""; - - break; - } - break; /* % */ - } + { + default: + fputc (*(fmt-1), file); + break; + + case '\\': + bs[1] = *fmt++; + fputs (bs, file); + break; + + case '%': + switch (*fmt++) + { + case '%': + fputc ('%', file); + break; + + case 't': + { + tree t = va_arg (ap, tree); + if (NULL_TREE == t) + fprintf (file, ""); + else + { + if (stderr == file) + debug_tree (t); + else + { + print_node (file, "", t, 0); + putc ('\n', file); + } + } + break; + } + + case 'T': + { + tree t = va_arg (ap, tree); + if (NULL_TREE == t) + fprintf (file, ""); + else + print_node_brief (file, "", t, 3); + } + break; + + case 'd': + fprintf (file, "%d", va_arg (ap, int)); + break; + + case 'x': + fprintf (file, "%x", va_arg (ap, int)); + break; + + case 'b': + fprintf (file, "%s", va_arg (ap, int) ? "true" : "false"); + break; + + case 'c': + fputc (va_arg (ap, int), file); + break; + + case 'r': + print_inline_rtx (file, va_arg (ap, rtx), 0); + break; + + case 'L': + { + rtx_insn *insn = safe_as_a (va_arg (ap, rtx)); + + while (insn) + { + print_inline_rtx (file, insn, 0); + fprintf (file, "\n"); + insn = NEXT_INSN (insn); + } + break; + } + + case 'f': + if (cfun && cfun->decl) + fputs (current_function_name(), file); + break; + + case 's': + { + const char *str = va_arg (ap, char*); + fputs (str ? str : "(null)", file); + } + break; + + case 'm': + fputs (GET_MODE_NAME ((machine_mode) va_arg (ap, int)), + file); + break; + + case 'C': + fputs (rtx_name[va_arg (ap, int)], file); + break; + + case 'R': + fputs (reg_class_names[va_arg (ap, int)], file); + break; + + case 'F': + fputs (caller, file); + break; + + case 'H': + { + location_t loc = va_arg (ap, location_t); + + if (BUILTINS_LOCATION == loc) + fprintf (file, ""); + else if (UNKNOWN_LOCATION == loc) + fprintf (file, ""); + else + fprintf (file, "%s:%d", + LOCATION_FILE (loc), LOCATION_LINE (loc)); + + break; + } + + case '!': + if (!current_pass) + return; + /* FALLTHRU */ + + case '?': + avr_vdump (file, caller, "%F[%f:%P]"); + break; + + case 'P': + if (current_pass) + fprintf (file, "%s(%d)", + current_pass->name, + current_pass->static_pass_number); + else + fprintf (file, "pass=?"); + + break; + + case 'A': + fflush (file); + abort(); + + default: + /* Unknown %-code: Stop printing */ + + fprintf (file, "??? %%%c ???%s\n", *(fmt-1), fmt); + fmt = ""; + + break; + } + break; /* % */ + } } fflush (file); @@ -283,7 +283,7 @@ avr_log_set_avr_log (void) if (all) avr_log_details = "all"; - + if (all || avr_log_details) { /* Adding , at beginning and end of string makes searching easier. */ @@ -298,13 +298,13 @@ avr_log_set_avr_log (void) info = strstr (str, ",?,") != NULL; if (info) - fprintf (stderr, "\n-mlog="); + fprintf (stderr, "\n-mlog="); #define SET_DUMP_DETAIL(S) \ do { \ avr_log.S = (all || strstr (str, "," #S ",") != NULL); \ - if (info) \ - fprintf (stderr, #S ","); \ + if (info) \ + fprintf (stderr, #S ","); \ } while (0) SET_DUMP_DETAIL (address_cost); @@ -320,6 +320,6 @@ avr_log_set_avr_log (void) #undef SET_DUMP_DETAIL if (info) - fprintf (stderr, "?\n\n"); + fprintf (stderr, "?\n\n"); } }