summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cgcalc.c10
-rw-r--r--cgconst.h26
-rw-r--r--cgiconst.h16
-rw-r--r--cgopt.c12
4 files changed, 29 insertions, 35 deletions
diff --git a/cgcalc.c b/cgcalc.c
index ac23a76..c0c75b2 100644
--- a/cgcalc.c
+++ b/cgcalc.c
@@ -2307,8 +2307,8 @@ void calculate_graph_register_uses (INSTRUCTION_GRAPH graph)
calculate_eor_operator (graph);
return;
case GCNOT:
-#if defined (I486) || defined (G_POWER)
case GNEG:
+#if defined (I486) || defined (G_POWER)
case GNOT:
#endif
calculate_cnot_operator (graph);
@@ -2342,9 +2342,7 @@ void calculate_graph_register_uses (INSTRUCTION_GRAPH graph)
case GFEXP:
case GFSQRT:
case GFNEG:
-#if defined (I486) || defined (G_POWER)
case GFABS:
-#endif
calculate_monadic_float_operator (graph);
return;
case GFLOAD_ID:
@@ -2538,9 +2536,9 @@ void count_graph (INSTRUCTION_GRAPH graph)
case GFEXP:
case GFSQRT:
case GFNEG:
-#if defined (I486) || defined (G_POWER)
case GFABS:
case GNEG:
+#if defined (I486) || defined (G_POWER)
case GNOT:
#endif
case GBEFORE0:
@@ -2704,9 +2702,9 @@ void mark_graph_2 (register INSTRUCTION_GRAPH graph)
case GFEXP:
case GFSQRT:
case GFNEG:
-#if defined (I486) || defined (G_POWER)
case GFABS:
case GNEG:
+#if defined (I486) || defined (G_POWER)
case GNOT:
#endif
case GBEFORE0:
@@ -2882,8 +2880,8 @@ void mark_graph_1 (register INSTRUCTION_GRAPH graph)
case GFEXP:
case GFSQRT:
case GFNEG:
-#if defined (I486) || defined (G_POWER)
case GFABS:
+#if defined (I486) || defined (G_POWER)
case GNEG:
case GNOT:
#endif
diff --git a/cgconst.h b/cgconst.h
index 4d53f14..34e902d 100644
--- a/cgconst.h
+++ b/cgconst.h
@@ -3,20 +3,20 @@ enum {
GADD, GADD_O, GAND, GALLOCATE, GASR, GBEFORE,
GBEFORE0, GBOUNDS, GCMP_EQ, GCMP_GT, GCMP_GTU, GCMP_LT,
GCMP_LTU, GCNOT, GCOPY, GCREATE, GCREATE_R, GDIV,
- GEOR, GFACOS, GFADD, GFASIN, GFCMP_EQ, GFCMP_GT,
- GFATAN, GFCMP_LT, GFCOS, GFDIV, GFEXP, GFHIGH,
- GFITOR, GFJOIN, GFKEEP, GFLN, GFLOAD, GFLOAD_I,
- GFLOAD_ID, GFLOAD_X, GFLOG10, GFLOW, GFMOVEMI, GFMUL,
- GFNEG, GFREM, GFRTOI, GFSIN, GFSUB, GFILL,
- GFILL_R, GFREGISTER, GFSQRT, GFSTORE, GFSTORE_R, GFSTORE_X,
- GFTAN, GGFREGISTER, GGREGISTER, GKEEP, GINDIRECTION, GLEA,
- GLOAD, GLOAD_I, GLOAD_ID, GLOAD_X, GLOAD_B_ID, GLOAD_B_X,
- GLOAD_DES_ID, GLOAD_DES_I, GLSL, GLSR, GMOD, GMOVEM,
- GMOVEMI, GMUL, GMUL_O, GOR, GREGISTER, GSTORE,
- GSTORE_R, GSTORE_B_X, GSTORE_X, GSUB, GSUB_O, GTEST_O,
- GEXIT_IF
+ GEOR, GFABS, GFACOS, GFADD, GFASIN, GFCMP_EQ,
+ GFCMP_GT, GFATAN, GFCMP_LT, GFCOS, GFDIV, GFEXP,
+ GFHIGH, GFITOR, GFJOIN, GFKEEP, GFLN, GFLOAD,
+ GFLOAD_I, GFLOAD_ID, GFLOAD_X, GFLOG10, GFLOW, GFMOVEMI,
+ GFMUL, GFNEG, GFREM, GFRTOI, GFSIN, GFSUB,
+ GFILL, GFILL_R, GFREGISTER, GFSQRT, GFSTORE, GFSTORE_R,
+ GFSTORE_X, GFTAN, GGFREGISTER, GGREGISTER, GKEEP, GINDIRECTION,
+ GLEA, GLOAD, GLOAD_I, GLOAD_ID, GLOAD_X, GLOAD_B_ID,
+ GLOAD_B_X, GLOAD_DES_ID, GLOAD_DES_I, GLSL, GLSR, GMOD,
+ GMOVEM, GMOVEMI, GMUL, GMUL_O, GNEG, GOR,
+ GREGISTER, GSTORE, GSTORE_R, GSTORE_B_X, GSTORE_X, GSUB,
+ GSUB_O, GTEST_O, GEXIT_IF
#if defined (I486) || defined (G_POWER)
- ,GFABS, GNEG, GNOT
+ GNOT
#endif
#ifdef G_POWER
,GCREATE_S, GUMULH
diff --git a/cgiconst.h b/cgiconst.h
index 89dbbc2..90ddb80 100644
--- a/cgiconst.h
+++ b/cgiconst.h
@@ -14,13 +14,13 @@ enum {
IBGTU, IBLE, IBLEU, IBLT, IBLTU, IBNE, IBNO,
IBO, ICMP, ICMPW, IDIV, IEOR, IEXG, IEXT,
IFADD, IFBEQ, IFBGE, IFBGT, IFBLE, IFBLT, IFBNE,
- IFCMP, IFCOS, IFDIV, IFMUL, IFNEG, IFREM, IFSEQ,
- IFSGE, IFSGT, IFSIN, IFSLE, IFSLT, IFSNE, IFSUB,
- IFTAN, IFTST, IFMOVE, IFMOVEL, IJMP, IJSR, ILEA,
- ILSL, ILSR, IMOD, IMOVE, IMOVEB, IMOVEW, IMUL,
- IOR, IRTS, ISCHEDULE, ISEQ, ISGE, ISGEU, ISGT,
- ISGTU, ISLE, ISLEU, ISLT, ISLTU, ISNE, ISNO,
- ISO, ISUB, ITST, IWORD
+ IFABS, IFCMP, IFCOS, IFDIV, IFMUL, IFNEG, IFREM,
+ IFSEQ, IFSGE, IFSGT, IFSIN, IFSLE, IFSLT, IFSNE,
+ IFSUB, IFTAN, IFTST, IFMOVE, IFMOVEL, IJMP, IJSR,
+ ILEA, ILSL, ILSR, IMOD, IMOVE, IMOVEB, IMOVEW,
+ IMUL, INEG, IOR, IRTS, ISCHEDULE, ISEQ, ISGE,
+ ISGEU, ISGT, ISGTU, ISLE, ISLEU, ISLT, ISLTU,
+ ISNE, ISNO, ISO, ISUB, ITST, IWORD
#if !defined (G_POWER)
,IFSQRT
#endif
@@ -49,7 +49,7 @@ enum {
,IMULO
#endif
#if defined (G_POWER) || defined (I486)
- ,IJMPP ,IRTSP, IFABS, INEG, INOT
+ ,IJMPP ,IRTSP, INOT
#endif
#if defined (I486) && defined (FP_STACK_OPTIMIZATIONS)
,IFEXG
diff --git a/cgopt.c b/cgopt.c
index 0ae48e7..c5c7dc5 100644
--- a/cgopt.c
+++ b/cgopt.c
@@ -419,9 +419,7 @@ IF_G_POWER ( case IUMULH: )
#if !defined (G_POWER)
case IFSQRT:
#endif
-#if defined (G_POWER) || defined (I486)
case IFABS:
-#endif
return 8;
default:
return 0;
@@ -1574,9 +1572,7 @@ IF_G_POWER ( case IUMULH: )
#if !defined (G_POWER)
case IFSQRT:
#endif
-#if defined (G_POWER) || defined (I486)
case IFABS:
-#endif
IF_G_SPARC (case IFMOVEHI: case IFMOVELO:)
IF_G_RISC (case IADDI: case ILSLI:)
define_parameter (&instruction->instruction_parameters[1]);
@@ -1586,8 +1582,9 @@ IF_G_RISC (case IADDI: case ILSLI:)
#if defined (M68000) || defined (G_POWER)
case IEXTB:
#endif
+ case INEG:
#if defined (I486) || defined (G_POWER)
- case INEG: case INOT:
+ case INOT:
#endif
/* case IJMP: case IJSR: */
use_parameter (&instruction->instruction_parameters[0]);
@@ -3860,9 +3857,7 @@ IF_G_POWER (case ICMPLW:)
#if !defined (G_POWER)
case IFSQRT:
#endif
-#if defined (G_POWER) || defined (I486)
case IFABS:
-#endif
IF_G_SPARC (case IFMOVEHI: case IFMOVELO:)
IF_G_RISC (case IADDI: case ILSLI:)
@@ -3881,8 +3876,9 @@ IF_G_RISC (case IADDI: case ILSLI:)
#if defined (M68000) || defined (G_POWER)
case IEXTB:
#endif
+ case INEG:
#if defined (I486) || defined (G_POWER)
- case INEG: case INOT:
+ case INOT:
#endif
instruction_usedef (instruction);
break;