X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qdefs.h;h=fb942a4543126e6a99c0986e49946967d329d0f5;hb=19c04c281a90a3ef11f53b12f9ef30c9fd0abd99;hp=1996d86fbcb6bad629ede75c4b4e9674c4f6a01d;hpb=20a31a160b9dbb9788b943d3284a26c873a62c3b;p=xonotic%2Fdarkplaces.git

diff --git a/qdefs.h b/qdefs.h
index 1996d86f..fb942a45 100644
--- a/qdefs.h
+++ b/qdefs.h
@@ -1,14 +1,30 @@
 #ifndef QDEFS_H
 #define QDEFS_H
 
+#if defined (__GNUC__) || defined (__clang__) || defined (__TINYC__)
+#define DP_GCC_COMPATIBLE
+#endif
+
 #if (__GNUC__ > 2) || defined (__clang__) || (__TINYC__)
 #define DP_FUNC_PRINTF(n) __attribute__ ((format (printf, n, n+1)))
 #define DP_FUNC_PURE      __attribute__ ((pure))
 #define DP_FUNC_NORETURN  __attribute__ ((noreturn))
+#define DP_FUNC_ALWAYSINLINE inline __attribute__((always_inline))
 #else
 #define DP_FUNC_PRINTF(n)
 #define DP_FUNC_PURE
 #define DP_FUNC_NORETURN
+# if defined (MSVC)
+# define DP_FUNC_ALWAYSINLINE __forceinline
+# else
+# define DP_FUNC_ALWAYS_INLINE inline
+# endif
+#endif
+
+#ifdef DP_GCC_COMPATIBLE
+#define Q_typeof(var) typeof(var)
+#elif defined (MSVC)
+#define Q_typeof(var) decltype(var)
 #endif
 
 #define MAX_NUM_ARGVS	50
@@ -90,7 +106,7 @@
 #define	CMDBUFSIZE				655360 ///< maximum script size that can be loaded by the exec command (8192 in Quake)
 #define	MAX_ARGS				80 ///< maximum number of parameters to a console command or alias
 
-#define	NET_MAXMESSAGE			131072 ///< max reliable packet size (sent as multiple fragments of MAX_PACKETFRAGMENT)
+#define	NET_MAXMESSAGE			65536 ///< max reliable packet size (sent as multiple fragments of MAX_PACKETFRAGMENT)
 #define	MAX_PACKETFRAGMENT		1024 ///< max length of packet fragment
 #define	MAX_EDICTS				32768 ///< max number of objects in game world at once (32768 protocol limit)
 #define	MAX_MODELS				8192 ///< max number of models loaded at once (including during level transitions)
@@ -176,15 +192,13 @@
 // This also includes extended characters, and ALL control chars
 #define ISWHITESPACEORCONTROL(ch) ((signed char) (ch) <= (signed char) ' ')
 
-#ifdef PRVM_64
-#define FLOAT_IS_TRUE_FOR_INT(x) ((x) & 0x7FFFFFFFFFFFFFFF) // also match "negative zero" doubles of value 0x8000000000000000
-#define FLOAT_LOSSLESS_FORMAT "%.17g"
-#define VECTOR_LOSSLESS_FORMAT "%.17g %.17g %.17g"
-#else
+#define DOUBLE_IS_TRUE_FOR_INT(x) ((x) & 0x7FFFFFFFFFFFFFFF) // also match "negative zero" doubles of value 0x8000000000000000
+#define DOUBLE_LOSSLESS_FORMAT "%.17g"
+#define DOUBLE_VECTOR_LOSSLESS_FORMAT "%.17g %.17g %.17g"
+
 #define FLOAT_IS_TRUE_FOR_INT(x) ((x) & 0x7FFFFFFF) // also match "negative zero" floats of value 0x80000000
 #define FLOAT_LOSSLESS_FORMAT "%.9g"
-#define VECTOR_LOSSLESS_FORMAT "%.9g %.9g %.9g"
-#endif
+#define FLOAT_VECTOR_LOSSLESS_FORMAT "%.9g %.9g %.9g"
 
 // originally this was _MSC_VER
 // but here we want to test the system libc, which on win32 is borked, and NOT the compiler
@@ -198,4 +212,22 @@
 #define INT_LOSSLESS_FORMAT_CONVERT_U(x) ((uintmax_t)(x))
 #endif
 
+// simple safe library to handle integer overflows when doing buffer size calculations
+// Usage:
+//   - calculate data size using INTOVERFLOW_??? macros
+//   - compare: calculated-size <= INTOVERFLOW_NORMALIZE(buffersize)
+// Functionality:
+//   - all overflows (values > INTOVERFLOW_MAX) and errors are mapped to INTOVERFLOW_MAX
+//   - if any input of an operation is INTOVERFLOW_MAX, INTOVERFLOW_MAX will be returned
+//   - otherwise, regular arithmetics apply
+
+#define INTOVERFLOW_MAX 2147483647
+
+#define INTOVERFLOW_ADD(a,b) (((a) < INTOVERFLOW_MAX && (b) < INTOVERFLOW_MAX && (a) < INTOVERFLOW_MAX - (b)) ? ((a) + (b)) : INTOVERFLOW_MAX)
+#define INTOVERFLOW_SUB(a,b) (((a) < INTOVERFLOW_MAX && (b) < INTOVERFLOW_MAX && (b) <= (a))                  ? ((a) - (b)) : INTOVERFLOW_MAX)
+#define INTOVERFLOW_MUL(a,b) (((a) < INTOVERFLOW_MAX && (b) < INTOVERFLOW_MAX && (a) < INTOVERFLOW_MAX / (b)) ? ((a) * (b)) : INTOVERFLOW_MAX)
+#define INTOVERFLOW_DIV(a,b) (((a) < INTOVERFLOW_MAX && (b) < INTOVERFLOW_MAX && (b) > 0)                     ? ((a) / (b)) : INTOVERFLOW_MAX)
+
+#define INTOVERFLOW_NORMALIZE(a) (((a) < INTOVERFLOW_MAX) ? (a) : (INTOVERFLOW_MAX - 1))
+
 #endif