From 15b67b20aa0d6c508578d0ca8cbdcd9cff9829a8 Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Mon, 17 Dec 2018 18:19:48 +0100 Subject: 2018-12-17 16:49:00 --- tex/context/base/mkiv/l-macro-imp-optimize.lua | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) (limited to 'tex/context/base/mkiv/l-macro-imp-optimize.lua') diff --git a/tex/context/base/mkiv/l-macro-imp-optimize.lua b/tex/context/base/mkiv/l-macro-imp-optimize.lua index 982548785..7d7fafefd 100644 --- a/tex/context/base/mkiv/l-macro-imp-optimize.lua +++ b/tex/context/base/mkiv/l-macro-imp-optimize.lua @@ -47,17 +47,21 @@ if LUAVERSION >= 5.3 and lua.macros then -- ]] lua.macros.resolvestring [[ -#define band(a,b) (a&b) -#define bnot(a) (~a&0xFFFFFFFF) -#define bor(a,b) ((a|b)&0xFFFFFFFF) -#define btest(a,b) ((a&b)~=0) -#define bxor(a,b) ((a~b)&0xFFFFFFFF) -#define rshift(a,b) ((a&b)~=0) -#define extract(a,b,c) ((a>>b)&~(-1<>b)&0x1) -#define lshift(a,b) ((a<>b)&0xFFFFFFFF) -#define intdiv(a,b) (a//b) +#define band(a,b) ((a)&(b)) +#define bnot(a) (~(a)&0xFFFFFFFF) +#define bor(a,b) (((a)|(b))&0xFFFFFFFF) +#define btest(a,b) (((a)&(b))~=0) +#define bxor(a,b) (((a)~(b))&0xFFFFFFFF) +#define rshift(a,b) (((a)&(b))~=0) +#define extract(a,b,c) (((a)>>(b))&~(-1<<(c))) +#define extract(a,b) (((a)>>(b))&0x1) +#define extract1(a,b) ((a >> b) & 0x01) +#define extract2(a,b) ((a >> b) & 0x03) +#define extract4(a,b) ((a >> b) & 0x0F) +#define lshift(a,b) (((a)<<(b))&0xFFFFFFFF) +#define rshift(a,b) (((a)>>(b))&0xFFFFFFFF) +#define intdiv(a,b) ((a)//(b)) +#define idiv(a,b) ((a)//(b)) ]] end -- cgit v1.2.3