mirror of
https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git
synced 2024-11-22 03:04:34 +01:00
8c784bb8cf
Merge commit '755d9301ca89f02956fd17858b9d4d821ab5c972' from the vendor branch. This updates us from lua 5.4.2 to 5.4.4. In addition, it switches around how we flavor liblua for the boot loader and flua. This is done to reduce diffs with upstream and make it easier to import new versions (the current method has too many conflicts to resolve by hand): we include luaconf.local.h from luaconf.h (the only change to this file is now that #include at the end). We then define what we need to: for flua (which does very little) and one for stand (which creates the new FLOAT type out of int64). Sponsored by: Netflix
74 lines
1.7 KiB
C
74 lines
1.7 KiB
C
/*
|
|
* Copyright (c) 2023, Netflix, Inc
|
|
*
|
|
* SPDX-License-Identifier: BSD-2-Clause
|
|
*/
|
|
|
|
#pragma once
|
|
/*
|
|
* We need to always define this. For the boot loader, we use it. For flua
|
|
* we don't, but it needs to be defined to keep some ifdefs happy.
|
|
*/
|
|
#define LUA_FLOAT_INT64 4
|
|
|
|
/* set the paths we want */
|
|
#undef LUA_ROOT
|
|
#undef LUA_LDIR
|
|
#undef LUA_CDIR
|
|
#define LUA_ROOT LUA_PATH "/" LUA_VDIR "/"
|
|
#define LUA_LDIR LUA_ROOT "share/"
|
|
#define LUA_CDIR LUA_ROOT "lib/"
|
|
|
|
/* Simplify this, since it's always an int */
|
|
#undef lua_numbertointeger
|
|
#define lua_numbertointeger(n,p) \
|
|
(*(p) = (LUA_INTEGER)(n), 1)
|
|
|
|
/* Define our number type by brute force, but first undo the default defines */
|
|
#undef panic
|
|
#undef LUA_NUMBER
|
|
#undef l_floatatt
|
|
#undef LUAI_UACNUMBER
|
|
#undef LUA_NUMBER_FRMLEN
|
|
#undef LUA_NUMBER_FMT
|
|
#undef l_mathop
|
|
#undef lua_str2number
|
|
#undef lua_getlocaledecpoint
|
|
|
|
#undef LUA_FLOAT_TYPE
|
|
#define LUA_FLOAT_TYPE LUA_FLOAT_INT64
|
|
|
|
#include "lstd.h"
|
|
|
|
#include <machine/_inttypes.h>
|
|
|
|
#define panic lua_panic
|
|
/* Hack to use int64 as the LUA_NUMBER from ZFS code, kinda */
|
|
|
|
#define LUA_NUMBER int64_t
|
|
|
|
#define l_floatatt(n) (LUA_FLOAT_INT_HACK_##n)
|
|
#define LUA_FLOAT_INT_HACK_MANT_DIG 32
|
|
#define LUA_FLOAT_INT_HACK_MAX_10_EXP 32
|
|
|
|
#define LUAI_UACNUMBER int64_t
|
|
|
|
#define LUA_NUMBER_FRMLEN ""
|
|
#define LUA_NUMBER_FMT "%" PRId64
|
|
|
|
#define l_mathop(x) (lstd_ ## x)
|
|
|
|
#define lua_str2number(s,p) strtoll((s), (p), 0)
|
|
|
|
#define lua_getlocaledecpoint() '.'
|
|
|
|
/* Better buffer size */
|
|
#undef LUAL_BUFFERSIZE
|
|
#define LUAL_BUFFERSIZE 128
|
|
|
|
/* Maxalign can't reference double */
|
|
#undef LUAI_MAXALIGN
|
|
#define LUAI_MAXALIGN lua_Number n; void *s; lua_Integer i; long l
|
|
|
|
#define LUA_AVOID_FLOAT
|