* [PATCH 2/3 committed] sim: ppc: fix -Wmisleading-indentation warnings
2023-12-05 4:46 [PATCH 1/3 committed] sim: ppc: cleanup getrusage decls Mike Frysinger
@ 2023-12-05 4:46 ` Mike Frysinger
2023-12-05 4:46 ` [PATCH 3/3 committed] sim: ppc: fix implicit enum conversion Mike Frysinger
1 sibling, 0 replies; 3+ messages in thread
From: Mike Frysinger @ 2023-12-05 4:46 UTC (permalink / raw)
To: gdb-patches
Fix building with -Wmisleading-indentation.
---
sim/ppc/igen.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sim/ppc/igen.c b/sim/ppc/igen.c
index 445afb9ee00d..8aa19c757f59 100644
--- a/sim/ppc/igen.c
+++ b/sim/ppc/igen.c
@@ -233,7 +233,7 @@ gen_semantics_c(insn_table *table,
lf_printf(file, " option_mpc860c0 = 0;\n");
lf_printf(file, " if (tree_find_property(root, \"/options/mpc860c0\"))\n");
lf_printf(file, " option_mpc860c0 = tree_find_integer_property(root, \"/options/mpc860c0\");\n");
- lf_printf(file, " option_mpc860c0 *= 4; /* convert word count to byte count */\n");
+ lf_printf(file, " option_mpc860c0 *= 4; /* convert word count to byte count */\n");
lf_printf(file, "}\n");
lf_printf(file, "\n");
if (generate_expanded_instructions)
--
2.43.0
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 3/3 committed] sim: ppc: fix implicit enum conversion
2023-12-05 4:46 [PATCH 1/3 committed] sim: ppc: cleanup getrusage decls Mike Frysinger
2023-12-05 4:46 ` [PATCH 2/3 committed] sim: ppc: fix -Wmisleading-indentation warnings Mike Frysinger
@ 2023-12-05 4:46 ` Mike Frysinger
1 sibling, 0 replies; 3+ messages in thread
From: Mike Frysinger @ 2023-12-05 4:46 UTC (permalink / raw)
To: gdb-patches
This code tries to use attach_type enums as hw_phb_decode, and while
they're setup to have compatible values, the compiler doesn't like it
when the cast is missing. So cast it explicitly and then use that.
sim/ppc/hw_phb.c:322:28: error:
implicit conversion from enumeration type 'attach_type'
(aka 'enum _attach_type') to different enumeration type
'hw_phb_decode' [-Werror,-Wenum-conversion]
---
sim/ppc/hw_phb.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sim/ppc/hw_phb.c b/sim/ppc/hw_phb.c
index a3c192642351..ec1119ee7d9b 100644
--- a/sim/ppc/hw_phb.c
+++ b/sim/ppc/hw_phb.c
@@ -303,6 +303,7 @@ hw_phb_attach_address(device *me,
{
hw_phb_device *phb = device_data(me);
phb_space *pci_space;
+ hw_phb_decode phb_type = (hw_phb_decode)type;
/* sanity checks */
if (space < 0 || space >= nr_hw_phb_spaces)
device_error(me, "attach space (%d) specified by %s invalid",
@@ -312,14 +313,13 @@ hw_phb_attach_address(device *me,
|| addr < pci_space->my_base)
device_error(me, "attach addr (0x%lx) specified by %s outside of bus address range",
(unsigned long)addr, device_path(client));
- if ((hw_phb_decode)type != hw_phb_normal_decode
- && (hw_phb_decode)type != hw_phb_subtractive_decode)
+ if (phb_type != hw_phb_normal_decode && phb_type != hw_phb_subtractive_decode)
device_error(me, "attach type (%d) specified by %s invalid",
type, device_path(client));
/* attach it to the relevent bus */
DTRACE(phb, ("attach %s - %s %s:0x%lx (0x%lx bytes)\n",
device_path(client),
- hw_phb_decode_name(type),
+ hw_phb_decode_name(phb_type),
pci_space->name,
(unsigned long)addr,
(unsigned long)nr_bytes));
--
2.43.0
^ permalink raw reply [flat|nested] 3+ messages in thread