From patchwork Sun Dec 31 21:55:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 83065 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 DDD543858422 for ; Sun, 31 Dec 2023 21:56:41 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from omta40.uswest2.a.cloudfilter.net (omta40.uswest2.a.cloudfilter.net [35.89.44.39]) by sourceware.org (Postfix) with ESMTPS id E46763858D1E for ; Sun, 31 Dec 2023 21:56:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E46763858D1E Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org E46763858D1E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=35.89.44.39 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704059779; cv=none; b=K7lYe4ebsBgsBSlIEXiq3jW+0CAFTGwr+5krrjXOl+E7bK9CD63xonl/V+BpjxS5TGZ9rHEjgGAxFBoG4kaJxRw9j4eetiND8R2RUO896wmyIHwoXh9zTr7p2QU63m1Z8tb9HUXSCYt+XNBam/r9nJtsQVOJWwwoNcxrNCSgJ/o= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704059779; c=relaxed/simple; bh=BZ/4YCzyuwzsJHsRGyN0Qml3XSR7hqYiyuiGiyyVXrM=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=ZH7ah55FIwKCy9BwNtWK0CdFZ0o0iMn4AfvUjbpCLCkgWRgQVHJF70xFVwaB6JG3+848Tww8dh5ch/M2zRvuVfQq+99jQBpbGWMOZ56rJlNDjUINBliM5ee24XeNYvSUX0YwQkQKg8NFSNPK+Ml7I8D2xhXmnEbABq8jNqEPU9c= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from eig-obgw-6004a.ext.cloudfilter.net ([10.0.30.197]) by cmsmtp with ESMTPS id K1VKreSjUL9AgK3n3rEzk2; Sun, 31 Dec 2023 21:56:13 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id K3n2rxgo7RGmSK3n3r8p5c; Sun, 31 Dec 2023 21:56:13 +0000 X-Authority-Analysis: v=2.4 cv=efcuwpIH c=1 sm=1 tr=0 ts=6591e37d a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=OWjo9vPv0XrRhIrVQ50Ab3nP57M=:19 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=e2cXIFwxEfEA:10 a=Qbun_eYptAEA:10 a=qd5jYb0dw39AH8YjyqMA:9 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Transfer-Encoding:MIME-Version:Message-ID:Date:Subject: Cc:To:From:Sender:Reply-To:Content-Type:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=rp6CeELRQzMP1HpPlWgOHMLyy++BvZ8QeA4NiFz1m1Y=; b=VC3imxqhGgpbHrjp+N9H7/qS2m ZXmkR3Z496+sJl3q8HRNLECA45vHsexZT/f7wl9IoYRo5k5B/OeX26+tKi+7HrnV6d3ZA3Wb5WdeN yUUsrWvbb6fFbhT5Qp/m2YS1L; Received: from 71-211-161-25.hlrn.qwest.net ([71.211.161.25]:46306 helo=localhost.localdomain) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96.2) (envelope-from ) id 1rK3n2-003LDg-1I; Sun, 31 Dec 2023 14:56:12 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH] [sim] Fix pervasive typo Date: Sun, 31 Dec 2023 14:55:58 -0700 Message-ID: <20231231215558.1142220-1-tom@tromey.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 71.211.161.25 X-Source-L: No X-Exim-ID: 1rK3n2-003LDg-1I X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 71-211-161-25.hlrn.qwest.net (localhost.localdomain) [71.211.161.25]:46306 X-Source-Auth: tom+tromey.com X-Email-Count: 1 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfJCWGQTRmQJNG3ERwCdJdOPhn0n/8MvaVQcFAdh53rTHfugUtvguze2rNxcAfn+hrocp3lrD4Qhq/pRYlt09YEJ0cFBoX/ysQTNSIO68tayuf+TMBOVv /+HdIPPaiDt3UDZOnizYIACI7gwDVIZmEY8bCZjSymRYzvSqR86ggXoPWmV27LpLa8IrjXMxNGHWJ4p4HpgYBRyz4EBn5KJj5Ps= X-Spam-Status: No, score=-3022.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, 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: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org I noticed a typo in a sim constant. This patch fixes it. --- sim/common/hw-ports.c | 6 +++--- sim/common/hw-properties.c | 30 +++++++++++++++--------------- sim/common/hw-tree.c | 2 +- sim/common/sim-basics.h | 2 +- sim/common/sim-core.c | 2 +- sim/ppc/basics.h | 2 +- sim/ppc/device.c | 36 ++++++++++++++++++------------------ sim/ppc/tree.c | 2 +- sim/ppc/tree.h | 2 +- 9 files changed, 42 insertions(+), 42 deletions(-) diff --git a/sim/common/hw-ports.c b/sim/common/hw-ports.c index 3d90e05038e..226b47ebb0e 100644 --- a/sim/common/hw-ports.c +++ b/sim/common/hw-ports.c @@ -120,8 +120,8 @@ detach_hw_port_edge (struct hw *me, && old_edge->dest_port == dest_port && old_edge->my_port == my_port) { - if (old_edge->disposition == permenant_object) - hw_abort (me, "attempt to delete permenant port edge"); + if (old_edge->disposition == permanent_object) + hw_abort (me, "attempt to delete permanent port edge"); *list = old_edge->next; hw_free (me, old_edge); return; @@ -140,7 +140,7 @@ clean_hw_port_edges (struct hw_port_edge **list) struct hw_port_edge *old_edge = *list; switch (old_edge->disposition) { - case permenant_object: + case permanent_object: list = &old_edge->next; break; case temporary_object: diff --git a/sim/common/hw-properties.c b/sim/common/hw-properties.c index 42b4d3a7426..52aad17e0c4 100644 --- a/sim/common/hw-properties.c +++ b/sim/common/hw-properties.c @@ -171,7 +171,7 @@ clean_hw_properties (struct hw *me) struct hw_property_data *current = *delete_point; switch (current->property->disposition) { - case permenant_object: + case permanent_object: /* zap the current value, will be initialized later */ ASSERT (current->init_array != NULL); if (current->property->array != NULL) @@ -208,7 +208,7 @@ hw_init_static_properties (SIM_DESC sd, { ASSERT (property->init_array != NULL); ASSERT (property->property->array == NULL); - ASSERT (property->property->disposition == permenant_object); + ASSERT (property->property->disposition == permanent_object); switch (property->property->type) { case array_property: @@ -247,7 +247,7 @@ hw_init_runtime_properties (SIM_DESC sd, { switch (property->property->disposition) { - case permenant_object: + case permanent_object: switch (property->property->type) { #if 0 @@ -336,7 +336,7 @@ hw_add_array_property (struct hw *me, { hw_add_property (me, property, array_property, array, sizeof_array, array, sizeof_array, - NULL, permenant_object); + NULL, permanent_object); } void @@ -372,7 +372,7 @@ hw_add_boolean_property (struct hw *me, hw_add_property (me, property, boolean_property, &new_boolean, sizeof (new_boolean), &new_boolean, sizeof (new_boolean), - NULL, permenant_object); + NULL, permanent_object); } int @@ -403,7 +403,7 @@ hw_add_ihandle_runtime_property (struct hw *me, hw_add_property (me, property, ihandle_property, ihandle->full_path, strlen (ihandle->full_path) + 1, NULL, 0, - NULL, permenant_object); + NULL, permanent_object); } #endif @@ -417,7 +417,7 @@ hw_find_ihandle_runtime_property (struct hw *me, if (entry == NULL) hw_abort (me, "property \"%s\" not found", property); if (entry->property->type != ihandle_property - || entry->property->disposition != permenant_object) + || entry->property->disposition != permanent_object) hw_abort (me, "property \"%s\" of wrong type", property); ASSERT (entry->init_array != NULL); /* the full path */ @@ -476,7 +476,7 @@ hw_add_integer_property (struct hw *me, hw_add_property (me, property, integer_property, &integer, sizeof (integer), &integer, sizeof (integer), - NULL, permenant_object); + NULL, permanent_object); } signed_cell @@ -601,7 +601,7 @@ hw_add_range_array_property (struct hw *me, hw_add_property (me, property, range_array_property, cells, sizeof_cells, cells, sizeof_cells, - NULL, permenant_object); + NULL, permanent_object); hw_free (me, cells); } @@ -691,7 +691,7 @@ hw_add_reg_array_property (struct hw *me, hw_add_property (me, property, reg_array_property, cells, sizeof_cells, cells, sizeof_cells, - NULL, permenant_object); + NULL, permanent_object); hw_free (me, cells); } @@ -746,7 +746,7 @@ hw_add_string_property (struct hw *me, hw_add_property (me, property, string_property, string, strlen (string) + 1, string, strlen (string) + 1, - NULL, permenant_object); + NULL, permanent_object); } const char * @@ -799,7 +799,7 @@ hw_add_string_array_property (struct hw *me, hw_add_property (me, property, string_array_property, array, sizeof_array, array, sizeof_array, - NULL, permenant_object); + NULL, permanent_object); } int @@ -873,8 +873,8 @@ hw_add_duplicate_property (struct hw *me, const struct hw_property *original) { struct hw_property_data *master; - if (original->disposition != permenant_object) - hw_abort (me, "Can only duplicate permenant objects"); + if (original->disposition != permanent_object) + hw_abort (me, "Can only duplicate permanent objects"); /* find the original's master */ master = original->owner->properties_of_hw; while (master->property != original) @@ -887,5 +887,5 @@ hw_add_duplicate_property (struct hw *me, original->type, master->init_array, master->sizeof_init_array, original->array, original->sizeof_array, - original, permenant_object); + original, permanent_object); } diff --git a/sim/common/hw-tree.c b/sim/common/hw-tree.c index 139ec17931a..a993732719a 100644 --- a/sim/common/hw-tree.c +++ b/sim/common/hw-tree.c @@ -849,7 +849,7 @@ hw_tree_vparse (struct hw *current, my_port, dest, dest_port, - permenant_object); + permanent_object); break; } default: diff --git a/sim/common/sim-basics.h b/sim/common/sim-basics.h index 78ba8c76489..5bf4dc678b1 100644 --- a/sim/common/sim-basics.h +++ b/sim/common/sim-basics.h @@ -86,7 +86,7 @@ enum { /* disposition of an object when things are reset */ typedef enum { - permenant_object, + permanent_object, temporary_object, } object_disposition; diff --git a/sim/common/sim-core.c b/sim/common/sim-core.c index 9b3de419f91..5779da96281 100644 --- a/sim/common/sim-core.c +++ b/sim/common/sim-core.c @@ -670,7 +670,7 @@ sim_core_set_xor (SIM_DESC sd, else { if (is_xor) sim_engine_abort (sd, NULL, NULL_CIA, - "Attempted to enable xor-endian mode when permenantly disabled."); + "Attempted to enable xor-endian mode when permanently disabled."); } } #endif diff --git a/sim/ppc/basics.h b/sim/ppc/basics.h index 7c54b734d93..d4abbc5a531 100644 --- a/sim/ppc/basics.h +++ b/sim/ppc/basics.h @@ -54,7 +54,7 @@ typedef enum { /* disposition of an object when things are next restarted */ typedef enum { - permenant_object, + permanent_object, tempoary_object, } object_disposition; diff --git a/sim/ppc/device.c b/sim/ppc/device.c index 45dda89caa8..6d093cb43d4 100644 --- a/sim/ppc/device.c +++ b/sim/ppc/device.c @@ -90,8 +90,8 @@ detach_device_interrupt_edge(device *me, if (old_edge->dest == dest && old_edge->dest_port == dest_port && old_edge->my_port == my_port) { - if (old_edge->disposition == permenant_object) - device_error(me, "attempt to delete permenant interrupt"); + if (old_edge->disposition == permanent_object) + device_error(me, "attempt to delete permanent interrupt"); *list = old_edge->next; free(old_edge); return; @@ -107,7 +107,7 @@ clean_device_interrupt_edges(device_interrupt_edge **list) while (*list != NULL) { device_interrupt_edge *old_edge = *list; switch (old_edge->disposition) { - case permenant_object: + case permanent_object: list = &old_edge->next; break; case tempoary_object: @@ -806,7 +806,7 @@ clean_device_properties(device *me) while (*delete_point != NULL) { device_property_entry *current = *delete_point; switch (current->value->disposition) { - case permenant_object: + case permanent_object: /* zap the current value, will be initialized later */ ASSERT(current->init_array != NULL); if (current->value->array != NULL) { @@ -840,7 +840,7 @@ device_init_static_properties(device *me, property = property->next) { ASSERT(property->init_array != NULL); ASSERT(property->value->array == NULL); - ASSERT(property->value->disposition == permenant_object); + ASSERT(property->value->disposition == permanent_object); switch (property->value->type) { case array_property: case boolean_property: @@ -872,7 +872,7 @@ device_init_runtime_properties(device *me, property != NULL; property = property->next) { switch (property->value->disposition) { - case permenant_object: + case permanent_object: switch (property->value->type) { case ihandle_property: { @@ -956,7 +956,7 @@ device_add_array_property(device *me, { device_add_property(me, property, array_property, array, sizeof_array, array, sizeof_array, - NULL, permenant_object); + NULL, permanent_object); } INLINE_DEVICE\ @@ -993,7 +993,7 @@ device_add_boolean_property(device *me, device_add_property(me, property, boolean_property, &new_boolean, sizeof(new_boolean), &new_boolean, sizeof(new_boolean), - NULL, permenant_object); + NULL, permanent_object); } INLINE_DEVICE\ @@ -1023,7 +1023,7 @@ device_add_ihandle_runtime_property(device *me, device_add_property(me, property, ihandle_property, ihandle->full_path, strlen(ihandle->full_path) + 1, NULL, 0, - NULL, permenant_object); + NULL, permanent_object); } INLINE_DEVICE\ @@ -1038,7 +1038,7 @@ device_find_ihandle_runtime_property(device *me, me, property)); if (entry == NULL || entry->value->type != ihandle_property - || entry->value->disposition != permenant_object) + || entry->value->disposition != permanent_object) device_error(me, "property %s not found or of wrong type", property); ASSERT(entry->init_array != NULL); /* the full path */ @@ -1093,7 +1093,7 @@ device_add_integer_property(device *me, device_add_property(me, property, integer_property, &integer, sizeof(integer), &integer, sizeof(integer), - NULL, permenant_object); + NULL, permanent_object); } INLINE_DEVICE\ @@ -1225,7 +1225,7 @@ device_add_range_array_property(device *me, device_add_property(me, property, range_array_property, cells, sizeof_cells, cells, sizeof_cells, - NULL, permenant_object); + NULL, permanent_object); free(cells); } @@ -1316,7 +1316,7 @@ device_add_reg_array_property(device *me, device_add_property(me, property, reg_array_property, cells, sizeof_cells, cells, sizeof_cells, - NULL, permenant_object); + NULL, permanent_object); free(cells); } @@ -1372,7 +1372,7 @@ device_add_string_property(device *me, device_add_property(me, property, string_property, string, strlen(string) + 1, string, strlen(string) + 1, - NULL, permenant_object); + NULL, permanent_object); } INLINE_DEVICE\ @@ -1424,7 +1424,7 @@ device_add_string_array_property(device *me, device_add_property(me, property, string_array_property, array, sizeof_array, array, sizeof_array, - NULL, permenant_object); + NULL, permanent_object); } INLINE_DEVICE\ @@ -1497,8 +1497,8 @@ device_add_duplicate_property(device *me, TRACE(trace_devices, ("device_add_duplicate_property(me=%p, property=%s, ...)\n", me, property)); - if (original->disposition != permenant_object) - device_error(me, "Can only duplicate permenant objects"); + if (original->disposition != permanent_object) + device_error(me, "Can only duplicate permanent objects"); /* find the original's master */ master = original->owner->properties; while (master->value != original) { @@ -1510,7 +1510,7 @@ device_add_duplicate_property(device *me, original->type, master->init_array, master->sizeof_init_array, original->array, original->sizeof_array, - original, permenant_object); + original, permanent_object); } diff --git a/sim/ppc/tree.c b/sim/ppc/tree.c index 05532bb47ee..c2fe9176e05 100644 --- a/sim/ppc/tree.c +++ b/sim/ppc/tree.c @@ -830,7 +830,7 @@ tree_parse(device *current, my_port, dest, dest_port, - permenant_object); + permanent_object); } break; default: diff --git a/sim/ppc/tree.h b/sim/ppc/tree.h index 6e278d9d145..d514b014526 100644 --- a/sim/ppc/tree.h +++ b/sim/ppc/tree.h @@ -35,7 +35,7 @@ This function accepts a printf style formatted string as the argument that describes the entry. Any properties or interrupt connections added to a device tree using this function are marked - as having a permenant disposition. When the tree is (re) + as having a permanent disposition. When the tree is (re) initialized they will be restored to their initial value. */