Remove GCC specific `0x...LL', replace with SIGNED64 (0x...).

diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog
index d09aae52cbe799bebd57e3f15e1ed295fc3e2cac..56bf29176430cabc71ad8c7418404e230f6bb1c1 100644 (file)
--- a/sim/mips/ChangeLog
+++ b/sim/mips/ChangeLog
@@ -1,3 +1,9 @@
+Tue Sep  9 16:28:28 1997  Andrew Cagney  <cagney@b1.cygnus.com>
+
+       * gencode.c (build_instruction): Use SIGNED64 for 64 bit
+       constants.
+       (build_instruction): Ditto for LL.
+
 start-sanitize-tx19
 Sun Sep  7 16:05:46 1997  Gavin Koch  <gavin@cygnus.com>
 

diff --git a/sim/mips/gencode.c b/sim/mips/gencode.c
index f5221ae0265d88355f56b2cc340f023fe35c18eb..d2ca7496b42e6a832b3d802b3b7d08b178ad2edc 100644 (file)
--- a/sim/mips/gencode.c
+++ b/sim/mips/gencode.c
@@ -2266,12 +2266,12 @@ build_instruction (doisa, features, mips16, insn)
         printf("   %sword64 d2 = op2;\n", (boolU ? "u" : ""));
         printf("   if (d2 == 0)\n");
         printf("     {\n");
-        printf("     LO%s = 0x8000000000000000LL;\n", pipe);
+        printf("     LO%s = SIGNED64 (0x8000000000000000);\n", pipe);
         printf("     HI%s = 0;\n", pipe);
         printf("     }\n");
-        printf("   else if (d2 == -1 && d1 == 0x8000000000000000LL)\n");
+        printf("   else if (d2 == -1 && d1 == SIGNED64 (0x8000000000000000))\n");
         printf("     {\n");
-        printf("     LO%s = 0x8000000000000000LL;\n", pipe);
+        printf("     LO%s = SIGNED64 (0x8000000000000000);\n", pipe);
         printf("     HI%s = 0;\n", pipe);
         printf("     }\n");
         printf("   else\n");
@@ -3936,19 +3936,16 @@ build_instruction (doisa, features, mips16, insn)
      printf("           definition on page B-113 */\n");
      printf("  signed64 t = ((unsigned64)HI_UW(0) << 32) | (unsigned64)LO_UW(0);\n");
      printf("  signed64 u = ((unsigned64)HI_UW(2) << 32) | (unsigned64)LO_UW(2);\n");
-     printf("  signed64 x000000007FFFFFFF = LSMASK64 (31);\n");
-     printf("  signed64 x0000000080000000 = x000000007FFFFFFF + 1;\n");
-     printf("  signed64 minus0000000080000000 = -x0000000080000000;\n");
-     printf("  if ( t > x000000007FFFFFFF )\n");
-     printf("    GPR_SD(destreg,0) = x000000007FFFFFFF;\n");
-     printf("  else if ( t < minus0000000080000000 )\n");
-     printf("    GPR_SD(destreg,0) = minus0000000080000000;\n");
+     printf("  if ( t > SIGNED64 (0x000000007FFFFFFF) )\n");
+     printf("    GPR_SD(destreg,0) = SIGNED64 (0x000000007FFFFFFF);\n");
+     printf("  else if ( t < - SIGNED64 (0x0000000080000000) )\n");
+     printf("    GPR_SD(destreg,0) = - SIGNED64 (0x0000000080000000);\n");
      printf("  else\n");
      printf("    GPR_SD(destreg,0) = t;\n");
-     printf("  if ( u > x000000007FFFFFFF )\n");
-     printf("    GPR_SD(destreg,1) = x000000007FFFFFFF;\n");
-     printf("  else if ( u < minus0000000080000000 )\n");
-     printf("    GPR_SD(destreg,1) = minus0000000080000000;\n");
+     printf("  if ( u > SIGNED64 (0x000000007FFFFFFF) )\n");
+     printf("    GPR_SD(destreg,1) = SIGNED64 (0x000000007FFFFFFF);\n");
+     printf("  else if ( u < - SIGNED64 (0x0000000080000000) )\n");
+     printf("    GPR_SD(destreg,1) = - SIGNED64 (0x0000000080000000);\n");
      printf("  else\n");
      printf("    GPR_SD(destreg,1) = u;\n");
      printf("  }\n");