From 5a4ce7aea038e899df2ffa68e2fa945a3bb5c622 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sat, 26 Jun 2021 22:07:04 -0400
Subject: [PATCH] sim: cgen: sync prototypes with implementation

These prototype blocks are not normally used, so they've fallen out
of sync with the actual function definitions.  Resync them all.
---
 sim/common/ChangeLog  |  9 +++++++++
 sim/common/cgen-ops.h | 35 ++++++++++++++++++-----------------
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 18d37bd17c6..028c6073862 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,12 @@
+2021-06-27  Mike Frysinger  <vapier@gentoo.org>
+
+	* cgen-ops.h (SUBWORDSIQI): Add int 2nd argument.
+	(SUBWORDSIHI, SUBWORDSIUQI, SUBWORDDIUQI): Likewise.
+	(ADDCFSI): Change return type to BI.
+	(ADDOFSI, SUBCFSI, SUBOFSI, ADDCFHI, ADDOFHI, SUBCFHI, SUBOFHI,
+	ADDCFQI, ADDOFQI, SUBCFQI, SUBOFQI): Likewise.
+	(MUL1OFSI): Change SI arguments to USI.
+
 2021-06-23  Mike Frysinger  <vapier@gentoo.org>
 
 	* sim-syscall.c (sim_syscall_multi): Handle CB_SYS_kill.
diff --git a/sim/common/cgen-ops.h b/sim/common/cgen-ops.h
index 86a483528a3..ddd3855924b 100644
--- a/sim/common/cgen-ops.h
+++ b/sim/common/cgen-ops.h
@@ -463,8 +463,8 @@ JOINSITF (SI x0, SI x1, SI x2, SI x3)
 
 #else
 
-QI SUBWORDSIQI (SI);
-HI SUBWORDSIHI (HI);
+QI SUBWORDSIQI (SI, int);
+HI SUBWORDSIHI (SI, int);
 SI SUBWORDSFSI (SF);
 SF SUBWORDSISF (SI);
 DI SUBWORDDFDI (DF);
@@ -476,8 +476,8 @@ SI SUBWORDDFSI (DF, int);
 SI SUBWORDXFSI (XF, int);
 SI SUBWORDTFSI (TF, int);
 
-UQI SUBWORDSIUQI (SI);
-UQI SUBWORDDIUQI (DI);
+UQI SUBWORDSIUQI (SI, int);
+UQI SUBWORDDIUQI (DI, int);
 
 DI JOINSIDI (SI, SI);
 DF JOINSIDF (SI, SI);
@@ -679,27 +679,28 @@ SUBOFDI (DI a, DI b, BI c)
 	    && ((a < 0) != (tmp < 0)));
   return res;
 }
+
 #else
 
 SI ADDCSI (SI, SI, BI);
-UBI ADDCFSI (SI, SI, BI);
-UBI ADDOFSI (SI, SI, BI);
+BI ADDCFSI (SI, SI, BI);
+BI ADDOFSI (SI, SI, BI);
 SI SUBCSI (SI, SI, BI);
-UBI SUBCFSI (SI, SI, BI);
-UBI SUBOFSI (SI, SI, BI);
+BI SUBCFSI (SI, SI, BI);
+BI SUBOFSI (SI, SI, BI);
 HI ADDCHI (HI, HI, BI);
-UBI ADDCFHI (HI, HI, BI);
-UBI ADDOFHI (HI, HI, BI);
+BI ADDCFHI (HI, HI, BI);
+BI ADDOFHI (HI, HI, BI);
 HI SUBCHI (HI, HI, BI);
-UBI SUBCFHI (HI, HI, BI);
-UBI SUBOFHI (HI, HI, BI);
+BI SUBCFHI (HI, HI, BI);
+BI SUBOFHI (HI, HI, BI);
 QI ADDCQI (QI, QI, BI);
-UBI ADDCFQI (QI, QI, BI);
-UBI ADDOFQI (QI, QI, BI);
+BI ADDCFQI (QI, QI, BI);
+BI ADDOFQI (QI, QI, BI);
 QI SUBCQI (QI, QI, BI);
-UBI SUBCFQI (QI, QI, BI);
-UBI SUBOFQI (QI, QI, BI);
-BI MUL1OFSI (SI a, SI b);
+BI SUBCFQI (QI, QI, BI);
+BI SUBOFQI (QI, QI, BI);
+BI MUL1OFSI (USI a, USI b);
 BI MUL2OFSI (SI a, SI b);
 BI ADDCFDI (DI a, DI b, BI c);
 BI ADDOFDI (DI a, DI b, BI c);
-- 
2.30.2