From 88cfc9ddaab5577260293fcbd4f7413fbd4aba21 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 24 Mar 2016 13:57:58 -0400 Subject: [PATCH] glapi: Add the safe_{add,mul,pad} functions from xserver We're about to update the generator scripts to use these, easier not to vary between client and server. Reviewed-by: Eric Anholt Signed-off-by: Adam Jackson --- src/mapi/glapi/gen/glX_proto_send.py | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/mapi/glapi/gen/glX_proto_send.py b/src/mapi/glapi/gen/glX_proto_send.py index 2b3303078a2..8b3d8d756b8 100644 --- a/src/mapi/glapi/gen/glX_proto_send.py +++ b/src/mapi/glapi/gen/glX_proto_send.py @@ -174,6 +174,7 @@ class PrintGlxProtoStubs(glX_proto_common.glx_print_proto): print '#include ' print '#include ' print '#include ' + print '#include ' print '' print '#define __GLX_PAD(n) (((n) + 3) & ~3)' @@ -181,6 +182,29 @@ class PrintGlxProtoStubs(glX_proto_common.glx_print_proto): self.printFastcall() self.printNoinline() print '' + + print 'static _X_INLINE int safe_add(int a, int b)' + print '{' + print ' if (a < 0 || b < 0) return -1;' + print ' if (INT_MAX - a < b) return -1;' + print ' return a + b;' + print '}' + print 'static _X_INLINE int safe_mul(int a, int b)' + print '{' + print ' if (a < 0 || b < 0) return -1;' + print ' if (a == 0 || b == 0) return 0;' + print ' if (a > INT_MAX / b) return -1;' + print ' return a * b;' + print '}' + print 'static _X_INLINE int safe_pad(int a)' + print '{' + print ' int ret;' + print ' if (a < 0) return -1;' + print ' if ((ret = safe_add(a, 3)) < 0) return -1;' + print ' return ret & (GLuint)~3;' + print '}' + print '' + print '#ifndef __GNUC__' print '# define __builtin_expect(x, y) x' print '#endif' -- 2.30.2