From cbbb73f4f9b0d7890c045fe8e159f651fbdca685 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sun, 31 Dec 2023 14:55:58 -0700 Subject: sim: fix pervasive typo I noticed a typo in a sim constant. This patch fixes it. permenant -> permanent --- 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(-) (limited to 'sim') diff --git a/sim/common/hw-ports.c b/sim/common/hw-ports.c index 3d90e05..226b47e 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 42b4d3a..52aad17 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 139ec17..a993732 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 78ba8c7..5bf4dc6 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 9b3de41..5779da9 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 7c54b73..d4abbc5 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 45dda89..6d093cb 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 05532bb..c2fe917 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 6e278d9..d514b01 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. */ -- cgit v1.1