Remove dependency on mthdecls.h where not really needed

gklimowicz · gklimowicz · commit 70adb4fb96fd · 2018-09-13T12:15:43.000-07:00
Convert LONGLONG_T to int64_t.
diff --git a/runtime/flang/iishft.c b/runtime/flang/iishft.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2017-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
  *
  */
 
-#include "mthdecls.h"
 /** \brief  IISHFT intrinsic  */
 int
 ftn_i_iishft(int i, int j)
diff --git a/runtime/flang/ileadz.c b/runtime/flang/ileadz.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2017-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +15,6 @@
  *
  */
 
-#include "mthdecls.h"
-
 int
 __mth_i_ileadz(int i)
 {
diff --git a/runtime/flang/ileadzi.c b/runtime/flang/ileadzi.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2017-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +15,6 @@
  *
  */
 
-#include "mthdecls.h"
-
 int
 __mth_i_ileadzi(int i, int size)
 {
diff --git a/runtime/flang/ipopcnt.c b/runtime/flang/ipopcnt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2017-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  *
  */
 
-#include "mthdecls.h"
+#include <stdint.h>
 
 int
 __mth_i_ipopcnt(int i)
diff --git a/runtime/flang/ipopcnti.c b/runtime/flang/ipopcnti.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2017-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +15,6 @@
  *
  */
 
-#include "mthdecls.h"
-
 int
 __mth_i_ipopcnti(int i, int size)
 {
diff --git a/runtime/flang/ipoppar.c b/runtime/flang/ipoppar.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2017-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +15,6 @@
  *
  */
 
-#include "mthdecls.h"
-
 int
 __mth_i_ipoppar(int ii)
 {
diff --git a/runtime/flang/ipoppari.c b/runtime/flang/ipoppari.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2017-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +15,6 @@
  *
  */
 
-#include "mthdecls.h"
-
 int
 __mth_i_ipoppari(int ii, int size)
 {
diff --git a/runtime/flang/kabs.c b/runtime/flang/kabs.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2017-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,10 +15,10 @@
  *
  */
 
-#include "mthdecls.h"
+#include <stdint.h>
 
-_LONGLONG_T
-ftn_i_kabs(_LONGLONG_T i0)
+int64_t
+ftn_i_kabs(int64_t i0)
 {
   if (i0 >= 0)
     return i0;
diff --git a/runtime/flang/kidim.c b/runtime/flang/kidim.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2017-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,12 +15,12 @@
  *
  */
 
-#include "mthdecls.h"
+#include <stdint.h>
 
-_LONGLONG_T
-ftn_i_kidim(_LONGLONG_T i, long long j)
+int64_t
+ftn_i_kidim(int64_t i, int64_t j)
 {
-  _LONGLONG_T h;
+  int64_t h;
 
   h = i - j;
   return h > 0 ? h : 0;
diff --git a/runtime/flang/kisign.c b/runtime/flang/kisign.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2017-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,12 +15,12 @@
  *
  */
 
-#include "mthdecls.h"
+#include <stdint.h>
 
-_LONGLONG_T
-ftn_i_kisign(_LONGLONG_T i, long long j)
+int64_t
+ftn_i_kisign(int64_t i, int64_t j)
 {
-  _LONGLONG_T absi;
+  int64_t absi;
 
   absi = i >= 0 ? i : -i;
   if (j >= 0)
diff --git a/runtime/flang/kleadz.c b/runtime/flang/kleadz.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2017-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,12 +15,12 @@
  *
  */
 
-#include "mthdecls.h"
+#include <stdint.h>
 
-_LONGLONG_T
-__mth_i_kleadz(_LONGLONG_T i)
+int64_t
+__mth_i_kleadz(int64_t i)
 {
-  _ULONGLONG_T ui; /* unsigned representation of 'i' */
+  uint64_t ui; /* unsigned representation of 'i' */
   int nz;          /* number of leading zero bits in 'i' */
   int k;
 
diff --git a/runtime/flang/kmax.c b/runtime/flang/kmax.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2014-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,10 @@
  *
  */
 
-#include "mthdecls.h"
+#include <stdint.h>
 
-_LONGLONG_T
-ftn_i_kmax(_LONGLONG_T i, long long j) { return i >= j ? i : j; }
+int64_t
+ftn_i_kmax(int64_t i, int64_t j)
+{
+  return i >= j ? i : j;
+}
diff --git a/runtime/flang/kmin.c b/runtime/flang/kmin.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2014-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,10 @@
  *
  */
 
-#include "mthdecls.h"
+#include <stdint.h>
 
-_LONGLONG_T
-ftn_i_kmin(_LONGLONG_T i, long long j) { return i <= j ? i : j; }
+int64_t
+ftn_i_kmin(int64_t i, int64_t j)
+{
+  return i <= j ? i : j;
+}
diff --git a/runtime/flang/kpopcnt.c b/runtime/flang/kpopcnt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2017-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,10 +15,10 @@
  *
  */
 
-#include "mthdecls.h"
+#include <stdint.h>
 
-_LONGLONG_T
-__mth_i_kpopcnt(_LONGLONG_T i)
+int64_t
+__mth_i_kpopcnt(int64_t i)
 {
   unsigned ui, uj;
 
diff --git a/runtime/flang/kpoppar.c b/runtime/flang/kpoppar.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2017-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,12 +15,12 @@
  *
  */
 
-#include "mthdecls.h"
+#include <stdint.h>
 
-_LONGLONG_T
-__mth_i_kpoppar(_LONGLONG_T ll)
+int64_t
+__mth_i_kpoppar(int64_t ll)
 {
-  _LONGLONG_T ii;
+  int64_t ii;
 
   ii = ll ^ ll >> 32;
   ii ^= ii >> 16;
diff --git a/runtime/flangrti/kidnnt.c b/runtime/flangrti/kidnnt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2017-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,15 +15,13 @@
  *
  */
 
-#include "mthdecls.h"
+#include <stdint.h>
 
-_LONGLONG_T
+int64_t
 __mth_i_kidnnt(double d)
 {
   if (d > 0)
-    return ((d < 4503599627370496.0) ? (_LONGLONG_T)(d + 0.5)
-                                     : (_LONGLONG_T)(d));
+    return ((d < 4503599627370496.0) ? (int64_t)(d + 0.5) : (int64_t)(d));
   else
-    return ((d > -4503599627370496.0) ? (_LONGLONG_T)(d - 0.5)
-                                      : (_LONGLONG_T)(d));
+    return ((d > -4503599627370496.0) ? (int64_t)(d - 0.5) : (int64_t)(d));
 }
diff --git a/runtime/flangrti/knint.c b/runtime/flangrti/knint.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2014-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,13 +15,13 @@
  *
  */
 
-#include "mthdecls.h"
+#include <stdint.h>
 
-_LONGLONG_T
+int64_t
 __mth_i_knint(float d)
 {
   if (d > 0)
-    return ((d < 8388608.f) ? (_LONGLONG_T)(d + 0.5f) : (_LONGLONG_T)(d));
+    return ((d < 8388608.f) ? (int64_t)(d + 0.5f) : (int64_t)(d));
   else
-    return ((d > -8388608.f) ? (_LONGLONG_T)(d - 0.5f) : (_LONGLONG_T)(d));
+    return ((d > -8388608.f) ? (int64_t)(d - 0.5f) : (int64_t)(d));
 }
diff --git a/runtime/libpgmath/lib/common/kidnnt.c b/runtime/libpgmath/lib/common/kidnnt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2017-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,15 +15,13 @@
  *
  */
 
-#include "mthdecls.h"
+#include <stdint.h>
 
-_LONGLONG_T
+int64_t
 __mth_i_kidnnt(double d)
 {
   if (d > 0)
-    return ((d < 4503599627370496.0) ? (_LONGLONG_T)(d + 0.5)
-                                     : (_LONGLONG_T)(d));
+    return ((d < 4503599627370496.0) ? (int64_t)(d + 0.5) : (int64_t)(d));
   else
-    return ((d > -4503599627370496.0) ? (_LONGLONG_T)(d - 0.5)
-                                      : (_LONGLONG_T)(d));
+    return ((d > -4503599627370496.0) ? (int64_t)(d - 0.5) : (int64_t)(d));
 }
diff --git a/runtime/libpgmath/lib/generic/knint.c b/runtime/libpgmath/lib/generic/knint.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2014-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,13 +15,13 @@
  *
  */
 
-#include "mthdecls.h"
+#include <stdint.h>
 
-_LONGLONG_T
+int64_t
 __mth_i_knint(float d)
 {
   if (d > 0)
-    return ((d < 8388608.f) ? (_LONGLONG_T)(d + 0.5f) : (_LONGLONG_T)(d));
+    return ((d < 8388608.f) ? (int64_t)(d + 0.5f) : (int64_t)(d));
   else
-    return ((d > -8388608.f) ? (_LONGLONG_T)(d - 0.5f) : (_LONGLONG_T)(d));
+    return ((d > -8388608.f) ? (int64_t)(d - 0.5f) : (int64_t)(d));
 }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved.`
	`2`	`+ * Copyright (c) 2017-2018, NVIDIA CORPORATION. All rights reserved.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -15,7 +15,6 @@`
`15`	`15`	`*`
`16`	`16`	`*/`
`17`	`17`
`18`		`-#include "mthdecls.h"`
`19`	`18`	`/** \brief IISHFT intrinsic */`
`20`	`19`	`int`
`21`	`20`	`ftn_i_iishft(int i, int j)`