CVS commit: src/external/mit/lua/dist/src
Module Name:src
Committed By: lneto
Date: Thu Jan 28 17:23:21 UTC 2016
Modified Files:
src/external/mit/lua/dist/src: lvm.c
Log Message:
fixed metatable access to deallocated field
author: Lua.org
see: http://www.lua.org/bugs.html#5.3.2-1
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/mit/lua/dist/src/lvm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/lua/dist/src/lvm.c
diff -u src/external/mit/lua/dist/src/lvm.c:1.9 src/external/mit/lua/dist/src/lvm.c:1.10
--- src/external/mit/lua/dist/src/lvm.c:1.9 Thu Jan 28 14:41:39 2016
+++ src/external/mit/lua/dist/src/lvm.c Thu Jan 28 17:23:21 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: lvm.c,v 1.9 2016/01/28 14:41:39 lneto Exp $ */
+/* $NetBSD: lvm.c,v 1.10 2016/01/28 17:23:21 lneto Exp $ */
/*
** Id: lvm.c,v 2.265 2015/11/23 11:30:45 roberto Exp
@@ -203,18 +203,19 @@ void luaV_finishset (lua_State *L, const
for (loop = 0; loop < MAXTAGLOOP; loop++) {
const TValue *tm;
if (oldval != NULL) {
- lua_assert(ttistable(t) && ttisnil(oldval));
+ Table *h = hvalue(t); /* save 't' table */
+ lua_assert(ttisnil(oldval));
/* must check the metamethod */
- if ((tm = fasttm(L, hvalue(t)->metatable, TM_NEWINDEX)) == NULL &&
+ if ((tm = fasttm(L, h->metatable, TM_NEWINDEX)) == NULL &&
/* no metamethod; is there a previous entry in the table? */
(oldval != luaO_nilobject ||
/* no previous entry; must create one. (The next test is
always true; we only need the assignment.) */
- (oldval = luaH_newkey(L, hvalue(t), key), 1))) {
+ (oldval = luaH_newkey(L, h, key), 1))) {
/* no metamethod and (now) there is an entry with given key */
setobj2t(L, cast(TValue *, oldval), val);
-invalidateTMcache(hvalue(t));
-luaC_barrierback(L, hvalue(t), val);
+invalidateTMcache(h);
+luaC_barrierback(L, h, val);
return;
}
/* else will try the metamethod */
CVS import: src/external/mit/lua/dist
Module Name:src Committed By: lneto Date: Tue Jan 26 14:37:05 UTC 2016 Update of /cvsroot/src/external/mit/lua/dist In directory ivanova.netbsd.org:/tmp/cvs-serv28256 Log Message: Lua 5.3.2 Status: Vendor Tag: LUA Release Tags: LUA_5_3_2 N src/external/mit/lua/dist/._doc C src/external/mit/lua/dist/Makefile N src/external/mit/lua/dist/._Makefile C src/external/mit/lua/dist/README N src/external/mit/lua/dist/._README N src/external/mit/lua/dist/._src U src/external/mit/lua/dist/doc/contents.html N src/external/mit/lua/dist/doc/._contents.html U src/external/mit/lua/dist/doc/index.css N src/external/mit/lua/dist/doc/._index.css U src/external/mit/lua/dist/doc/logo.gif N src/external/mit/lua/dist/doc/._logo.gif U src/external/mit/lua/dist/doc/lua.1 N src/external/mit/lua/dist/doc/._lua.1 C src/external/mit/lua/dist/doc/lua.css N src/external/mit/lua/dist/doc/._lua.css U src/external/mit/lua/dist/doc/luac.1 N src/external/mit/lua/dist/doc/._luac.1 U src/external/mit/lua/dist/doc/manual.css N src/external/mit/lua/dist/doc/._manual.css C src/external/mit/lua/dist/doc/manual.html N src/external/mit/lua/dist/doc/._manual.html U src/external/mit/lua/dist/doc/osi-certified-72x60.png N src/external/mit/lua/dist/doc/._osi-certified-72x60.png U src/external/mit/lua/dist/doc/readme.html N src/external/mit/lua/dist/doc/._readme.html C src/external/mit/lua/dist/src/lapi.c N src/external/mit/lua/dist/src/._lapi.c U src/external/mit/lua/dist/src/lapi.h N src/external/mit/lua/dist/src/._lapi.h C src/external/mit/lua/dist/src/lauxlib.c N src/external/mit/lua/dist/src/._lauxlib.c C src/external/mit/lua/dist/src/lauxlib.h N src/external/mit/lua/dist/src/._lauxlib.h C src/external/mit/lua/dist/src/lbaselib.c N src/external/mit/lua/dist/src/._lbaselib.c C src/external/mit/lua/dist/src/lbitlib.c N src/external/mit/lua/dist/src/._lbitlib.c C src/external/mit/lua/dist/src/lcode.c N src/external/mit/lua/dist/src/._lcode.c U src/external/mit/lua/dist/src/lcode.h N src/external/mit/lua/dist/src/._lcode.h U src/external/mit/lua/dist/src/lcorolib.c N src/external/mit/lua/dist/src/._lcorolib.c U src/external/mit/lua/dist/src/lctype.c N src/external/mit/lua/dist/src/._lctype.c U src/external/mit/lua/dist/src/lctype.h N src/external/mit/lua/dist/src/._lctype.h C src/external/mit/lua/dist/src/ldblib.c N src/external/mit/lua/dist/src/._ldblib.c C src/external/mit/lua/dist/src/ldo.c C src/external/mit/lua/dist/src/ldebug.c N src/external/mit/lua/dist/src/._ldebug.c U src/external/mit/lua/dist/src/ldebug.h N src/external/mit/lua/dist/src/._ldebug.h N src/external/mit/lua/dist/src/._ldo.c C src/external/mit/lua/dist/src/ldo.h N src/external/mit/lua/dist/src/._ldo.h C src/external/mit/lua/dist/src/ldump.c N src/external/mit/lua/dist/src/._ldump.c U src/external/mit/lua/dist/src/lfunc.c N src/external/mit/lua/dist/src/._lfunc.c U src/external/mit/lua/dist/src/lfunc.h N src/external/mit/lua/dist/src/._lfunc.h C src/external/mit/lua/dist/src/lgc.c N src/external/mit/lua/dist/src/._lgc.c C src/external/mit/lua/dist/src/lgc.h N src/external/mit/lua/dist/src/._lgc.h U src/external/mit/lua/dist/src/linit.c N src/external/mit/lua/dist/src/._linit.c C src/external/mit/lua/dist/src/liolib.c N src/external/mit/lua/dist/src/._liolib.c C src/external/mit/lua/dist/src/llex.c N src/external/mit/lua/dist/src/._llex.c U src/external/mit/lua/dist/src/llex.h N src/external/mit/lua/dist/src/._llex.h C src/external/mit/lua/dist/src/llimits.h N src/external/mit/lua/dist/src/._llimits.h C src/external/mit/lua/dist/src/lmathlib.c N src/external/mit/lua/dist/src/._lmathlib.c U src/external/mit/lua/dist/src/lmem.c N src/external/mit/lua/dist/src/._lmem.c U src/external/mit/lua/dist/src/lmem.h N src/external/mit/lua/dist/src/._lmem.h C src/external/mit/lua/dist/src/loadlib.c N src/external/mit/lua/dist/src/._loadlib.c C src/external/mit/lua/dist/src/lobject.c N src/external/mit/lua/dist/src/._lobject.c C src/external/mit/lua/dist/src/lobject.h N src/external/mit/lua/dist/src/._lobject.h U src/external/mit/lua/dist/src/lopcodes.c N src/external/mit/lua/dist/src/._lopcodes.c U src/external/mit/lua/dist/src/lopcodes.h N src/external/mit/lua/dist/src/._lopcodes.h C src/external/mit/lua/dist/src/loslib.c N src/external/mit/lua/dist/src/._loslib.c C src/external/mit/lua/dist/src/lparser.c N src/external/mit/lua/dist/src/._lparser.c U src/external/mit/lua/dist/src/lparser.h N src/external/mit/lua/dist/src/._lparser.h U src/external/mit/lua/dist/src/lprefix.h N src/external/mit/lua/dist/src/._lprefix.h C src/external/mit/lua/dist/src/lstate.c N src/external/mit/lua/dist/src/._lstate.c C src/external/mit/lua/dist/src/lstate.h N src/external/mit/lua/dist/src/._lstate.h C src/external/mit/lua/dist/src/lstring.c N src/external/mit/lua/dist/src/._lstring.c C src/external/mit/lua/dist/src/lstring.h N src/external/mit/lua/dist/src/._lstring.h C src/external/mit/lua/dist/src/lstrlib.c N src/external/mit/lua/dist/src/._lstrlib.c C src/external/mit
CVS commit: src/external/mit/lua/dist/src
Module Name:src
Committed By: lneto
Date: Thu Feb 19 04:46:22 UTC 2015
Modified Files:
src/external/mit/lua/dist/src: lapi.c ldebug.c llex.c llimits.h
lstrlib.c lua.h luaconf.h lvm.c
Log Message:
lua(4): small fixes in kernel Lua
* fixed hex parsing
* restored lua_isnumber
* removed unwanted macros from luaconf.h
* restored include in ldebug.c
* removed doubles from unions
* removed unused functions
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/lua/dist/src/lapi.c \
src/external/mit/lua/dist/src/ldebug.c \
src/external/mit/lua/dist/src/llex.c \
src/external/mit/lua/dist/src/llimits.h \
src/external/mit/lua/dist/src/lua.h
cvs rdiff -u -r1.6 -r1.7 src/external/mit/lua/dist/src/lstrlib.c
cvs rdiff -u -r1.12 -r1.13 src/external/mit/lua/dist/src/luaconf.h
cvs rdiff -u -r1.4 -r1.5 src/external/mit/lua/dist/src/lvm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/lua/dist/src/lapi.c
diff -u src/external/mit/lua/dist/src/lapi.c:1.3 src/external/mit/lua/dist/src/lapi.c:1.4
--- src/external/mit/lua/dist/src/lapi.c:1.3 Mon Feb 2 14:03:05 2015
+++ src/external/mit/lua/dist/src/lapi.c Thu Feb 19 04:46:22 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: lapi.c,v 1.3 2015/02/02 14:03:05 lneto Exp $ */
+/* $NetBSD: lapi.c,v 1.4 2015/02/19 04:46:22 lneto Exp $ */
/*
** Id: lapi.c,v 2.244 2014/12/26 14:43:45 roberto Exp
@@ -276,13 +276,11 @@ LUA_API int lua_isinteger (lua_State *L,
}
-#ifndef _KERNEL
LUA_API int lua_isnumber (lua_State *L, int idx) {
lua_Number n;
const TValue *o = index2addr(L, idx);
return tonumber(o, &n);
}
-#endif
LUA_API int lua_isstring (lua_State *L, int idx) {
Index: src/external/mit/lua/dist/src/ldebug.c
diff -u src/external/mit/lua/dist/src/ldebug.c:1.3 src/external/mit/lua/dist/src/ldebug.c:1.4
--- src/external/mit/lua/dist/src/ldebug.c:1.3 Mon Feb 2 14:03:05 2015
+++ src/external/mit/lua/dist/src/ldebug.c Thu Feb 19 04:46:22 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ldebug.c,v 1.3 2015/02/02 14:03:05 lneto Exp $ */
+/* $NetBSD: ldebug.c,v 1.4 2015/02/19 04:46:22 lneto Exp $ */
/*
** Id: ldebug.c,v 2.110 2015/01/02 12:52:22 roberto Exp
@@ -12,8 +12,8 @@
#include "lprefix.h"
-#ifndef _KERNEL
#include
+#ifndef _KERNEL
#include
#include
#endif
Index: src/external/mit/lua/dist/src/llex.c
diff -u src/external/mit/lua/dist/src/llex.c:1.3 src/external/mit/lua/dist/src/llex.c:1.4
--- src/external/mit/lua/dist/src/llex.c:1.3 Mon Feb 2 14:03:05 2015
+++ src/external/mit/lua/dist/src/llex.c Thu Feb 19 04:46:22 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: llex.c,v 1.3 2015/02/02 14:03:05 lneto Exp $ */
+/* $NetBSD: llex.c,v 1.4 2015/02/19 04:46:22 lneto Exp $ */
/*
** Id: llex.c,v 2.89 2014/11/14 16:06:09 roberto Exp
@@ -202,7 +202,6 @@ static int check_next1 (LexState *ls, in
}
-#ifndef _KERNEL
/*
** Check whether current char is in set 'set' (with two chars) and
** saves it
@@ -217,6 +216,7 @@ static int check_next2 (LexState *ls, co
}
+#ifndef _KERNEL
/*
** change all characters 'from' in buffer to 'to'
*/
@@ -296,8 +296,11 @@ static int read_numeral (LexState *ls, S
static int read_numeral (LexState *ls, SemInfo *seminfo) {
TValue obj;
+ int first = ls->current;
lua_assert(lisdigit(ls->current));
save_and_next(ls);
+ if (first == '0')
+check_next2(ls, "xX"); /* hexadecimal? */
for (;;) {
if (lisxdigit(ls->current))
save_and_next(ls);
Index: src/external/mit/lua/dist/src/llimits.h
diff -u src/external/mit/lua/dist/src/llimits.h:1.3 src/external/mit/lua/dist/src/llimits.h:1.4
--- src/external/mit/lua/dist/src/llimits.h:1.3 Mon Feb 2 14:03:05 2015
+++ src/external/mit/lua/dist/src/llimits.h Thu Feb 19 04:46:22 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: llimits.h,v 1.3 2015/02/02 14:03:05 lneto Exp $ */
+/* $NetBSD: llimits.h,v 1.4 2015/02/19 04:46:22 lneto Exp $ */
/*
** Id: llimits.h,v 1.125 2014/12/19 13:30:23 roberto Exp
@@ -68,13 +68,19 @@ typedef unsigned char lu_byte;
#if defined(LUAI_USER_ALIGNMENT_T)
typedef LUAI_USER_ALIGNMENT_T L_Umaxalign;
#else
+#ifndef _KERNEL
typedef union { double u; void *s; lua_Integer i; long l; } L_Umaxalign;
+#else /* _KERNEL */
+typedef union { void *s; lua_Integer i; long l; } L_Umaxalign;
+#endif
#endif
/* types of 'usual argument conversions' for lua_Number and lua_Integer */
+#ifndef _KERNEL
typedef LUAI_UACNUMBER l_uacNumber;
+#endif
typedef LUAI_UACINT l_uacInt;
Index: src/external/mit/lua/dist/src/lua.h
diff -u src/external/mit/lua/dist/src/lua.h:1.3 src/external/mit/lua/dist/src/lua.h:1.4
--- src/external/mit/lua/dist/src/lua.h:1.3 Mon Feb 2 14:03:05 2015
+++ src/external/mit/lua/dist/src/lua.h Thu Feb 19 04:46:22 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: lua.h,v 1.3 2015/02/02 14:03:05 lneto Exp $ */
+/* $NetBSD: lua.h,v 1.4 2015/02/19 04:46:22 lneto Exp $ */
/*
** Id: lua.h,v 1.325 2014/12/
CVS commit: src/external/mit/lua/dist/src
Module Name:src Committed By: lneto Date: Wed Feb 4 04:47:57 UTC 2015 Modified Files: src/external/mit/lua/dist/src: luaconf.h Log Message: lua: fixed LUA_ROOT, LUA_PATH_DEFAULT and LUA_CPATH_DEFAULT * reverted from r1.8 (mbalmer) To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/external/mit/lua/dist/src/luaconf.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/lua/dist/src/luaconf.h diff -u src/external/mit/lua/dist/src/luaconf.h:1.11 src/external/mit/lua/dist/src/luaconf.h:1.12 --- src/external/mit/lua/dist/src/luaconf.h:1.11 Mon Feb 2 14:03:05 2015 +++ src/external/mit/lua/dist/src/luaconf.h Wed Feb 4 04:47:57 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: luaconf.h,v 1.11 2015/02/02 14:03:05 lneto Exp $ */ +/* $NetBSD: luaconf.h,v 1.12 2015/02/04 04:47:57 lneto Exp $ */ /* ** Id: luaconf.h,v 1.238 2014/12/29 13:27:55 roberto Exp @@ -753,6 +753,18 @@ #define LUA_MAXINTEGER INTMAX_MAX #define LUA_MININTEGER INTMAX_MIN +/* Path */ +#undef LUA_ROOT +#undef LUA_PATH_DEFAULT +#undef LUA_CPATH_DEFAULT + +#define LUA_ROOT "/usr/" +#define LUA_PATH_DEFAULT \ + LUA_LDIR"?.lua;" LUA_LDIR"?/init.lua;" \ + LUA_CDIR"?.lua;" LUA_CDIR"?/init.lua" +#define LUA_CPATH_DEFAULT \ + LUA_CDIR"?.so;" LUA_CDIR"loadall.so" + #ifndef _KERNEL #include
CVS import: src/external/mit/lua/dist
Module Name:src Committed By: lneto Date: Mon Feb 2 02:01:19 UTC 2015 Update of /cvsroot/src/external/mit/lua/dist In directory ivanova.netbsd.org:/tmp/cvs-serv18467 Log Message: imported Lua 5.3.0 Status: Vendor Tag: LUA Release Tags: LUA_5_3_0 C src/external/mit/lua/dist/README C src/external/mit/lua/dist/Makefile C src/external/mit/lua/dist/src/lobject.h C src/external/mit/lua/dist/src/liolib.c U src/external/mit/lua/dist/src/lctype.h C src/external/mit/lua/dist/src/ltm.h C src/external/mit/lua/dist/src/ldump.c C src/external/mit/lua/dist/src/lopcodes.h C src/external/mit/lua/dist/src/luac.c C src/external/mit/lua/dist/src/lbitlib.c C src/external/mit/lua/dist/src/llimits.h C src/external/mit/lua/dist/src/luaconf.h C src/external/mit/lua/dist/src/lgc.h C src/external/mit/lua/dist/src/lauxlib.c C src/external/mit/lua/dist/src/lstate.h C src/external/mit/lua/dist/src/llex.c C src/external/mit/lua/dist/src/ldblib.c U src/external/mit/lua/dist/src/lcode.h C src/external/mit/lua/dist/src/lstate.c C src/external/mit/lua/dist/src/lua.c C src/external/mit/lua/dist/src/lzio.c C src/external/mit/lua/dist/src/lcode.c C src/external/mit/lua/dist/src/llex.h C src/external/mit/lua/dist/src/lparser.c C src/external/mit/lua/dist/src/linit.c C src/external/mit/lua/dist/src/ldebug.h C src/external/mit/lua/dist/src/lcorolib.c C src/external/mit/lua/dist/src/lbaselib.c C src/external/mit/lua/dist/src/ldebug.c C src/external/mit/lua/dist/src/lutf8lib.c C src/external/mit/lua/dist/src/lapi.c C src/external/mit/lua/dist/src/lua.h C src/external/mit/lua/dist/src/lauxlib.h C src/external/mit/lua/dist/src/lobject.c C src/external/mit/lua/dist/src/lstrlib.c C src/external/mit/lua/dist/src/ltm.c C src/external/mit/lua/dist/src/ltablib.c U src/external/mit/lua/dist/src/lualib.h U src/external/mit/lua/dist/src/lfunc.h C src/external/mit/lua/dist/src/ldo.c C src/external/mit/lua/dist/src/lfunc.c C src/external/mit/lua/dist/src/lctype.c C src/external/mit/lua/dist/src/lvm.c C src/external/mit/lua/dist/src/loadlib.c C src/external/mit/lua/dist/src/ltable.h C src/external/mit/lua/dist/src/lstring.h C src/external/mit/lua/dist/src/ltable.c C src/external/mit/lua/dist/src/lopcodes.c U src/external/mit/lua/dist/src/lua.hpp C src/external/mit/lua/dist/src/lapi.h C src/external/mit/lua/dist/src/lparser.h C src/external/mit/lua/dist/src/lundump.c C src/external/mit/lua/dist/src/Makefile C src/external/mit/lua/dist/src/lmem.h U src/external/mit/lua/dist/src/lundump.h N src/external/mit/lua/dist/src/lprefix.h C src/external/mit/lua/dist/src/lstring.c C src/external/mit/lua/dist/src/lmathlib.c C src/external/mit/lua/dist/src/lvm.h C src/external/mit/lua/dist/src/lgc.c C src/external/mit/lua/dist/src/ldo.h C src/external/mit/lua/dist/src/lzio.h C src/external/mit/lua/dist/src/loslib.c C src/external/mit/lua/dist/src/lmem.c U src/external/mit/lua/dist/doc/manual.css U src/external/mit/lua/dist/doc/luac.1 C src/external/mit/lua/dist/doc/lua.1 C src/external/mit/lua/dist/doc/manual.html U src/external/mit/lua/dist/doc/osi-certified-72x60.png C src/external/mit/lua/dist/doc/readme.html U src/external/mit/lua/dist/doc/logo.gif C src/external/mit/lua/dist/doc/contents.html C src/external/mit/lua/dist/doc/lua.css 62 conflicts created by this import. Use the following command to help the merge: cvs checkout -jLUA:yesterday -jLUA src/external/mit/lua/dist
CVS commit: src/sys/modules/lua
Module Name:src Committed By: lneto Date: Sun Nov 30 19:15:03 UTC 2014 Modified Files: src/sys/modules/lua: lua.c Log Message: lua(4): fixed require To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/modules/lua/lua.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/modules/lua/lua.c diff -u src/sys/modules/lua/lua.c:1.14 src/sys/modules/lua/lua.c:1.15 --- src/sys/modules/lua/lua.c:1.14 Wed Sep 24 14:55:48 2014 +++ src/sys/modules/lua/lua.c Sun Nov 30 19:15:03 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: lua.c,v 1.14 2014/09/24 14:55:48 mbalmer Exp $ */ +/* $NetBSD: lua.c,v 1.15 2014/11/30 19:15:03 lneto Exp $ */ /* * Copyright (c) 2014 by Lourival Vieira Neto . @@ -367,7 +367,11 @@ luaioctl(dev_t dev, u_long cmd, void *da m->mod_name, s->lua_name); klua_lock(s->K); - m->open(s->K->L); + luaL_requiref( + s->K->L, + m->mod_name, + m->open, + 1); klua_unlock(s->K); m->refcount++; LIST_INSERT_HEAD( @@ -507,7 +511,8 @@ lua_require(lua_State *L) device_printf(sc_self, "require module %s\n", md->mod_name); -md->open(L); +luaL_requiref(L, md->mod_name, md->open, 0); + md->refcount++; LIST_INSERT_HEAD(&s->lua_modules, md, mod_next); return 1;
CVS commit: src/sys/sys
Module Name:src Committed By: lneto Date: Sun Nov 30 19:12:59 UTC 2014 Modified Files: src/sys/sys: lua.h Log Message: lua(4): included into sys/lua.h To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/sys/lua.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/sys/lua.h diff -u src/sys/sys/lua.h:1.6 src/sys/sys/lua.h:1.7 --- src/sys/sys/lua.h:1.6 Sat Jul 19 17:20:02 2014 +++ src/sys/sys/lua.h Sun Nov 30 19:12:59 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: lua.h,v 1.6 2014/07/19 17:20:02 lneto Exp $ */ +/* $NetBSD: lua.h,v 1.7 2014/11/30 19:12:59 lneto Exp $ */ /* * Copyright (c) 2014 by Lourival Vieira Neto . @@ -32,6 +32,8 @@ #ifndef _SYS_LUA_H_ #define _SYS_LUA_H_ +#include + #include /* for lua_State */ #ifdef _KERNEL
CVS commit: src/external/mit/lua/dist/src
Module Name:src Committed By: lneto Date: Sun Nov 30 19:00:46 UTC 2014 Modified Files: src/external/mit/lua/dist/src: luaconf.h Log Message: lua(4): fixed Lua stack size To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/external/mit/lua/dist/src/luaconf.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/lua/dist/src/luaconf.h diff -u src/external/mit/lua/dist/src/luaconf.h:1.9 src/external/mit/lua/dist/src/luaconf.h:1.10 --- src/external/mit/lua/dist/src/luaconf.h:1.9 Sat Jul 19 18:38:34 2014 +++ src/external/mit/lua/dist/src/luaconf.h Sun Nov 30 19:00:46 2014 @@ -1,7 +1,7 @@ -/* $NetBSD: luaconf.h,v 1.9 2014/07/19 18:38:34 lneto Exp $ */ +/* $NetBSD: luaconf.h,v 1.10 2014/11/30 19:00:46 lneto Exp $ */ /* -** $Id: luaconf.h,v 1.9 2014/07/19 18:38:34 lneto Exp $ +** $Id: luaconf.h,v 1.10 2014/11/30 19:00:46 lneto Exp $ ** Configuration file for Lua ** See Copyright Notice in lua.h */ @@ -13,6 +13,10 @@ #ifndef _KERNEL #include #include +#else +/* limits.h */ +#include +#include #endif @@ -696,7 +700,6 @@ #ifndef _KERNEL #include #else -#include #undef LUA_NUMBER #undef LUA_NUMBER_FMT @@ -723,9 +726,6 @@ #define BUFSIZ (1024) #define sprintf(s,fmt,...) snprintf(s, sizeof(s), fmt, __VA_ARGS__) -/* limits.h */ -#include - /* string.h */ #define strcoll strcmp
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: lneto Date: Wed Jul 23 02:42:56 UTC 2014 Modified Files: src/distrib/sets/lists/base: ad.arm ad.mips ad.powerpc md.amd64 md.sparc64 mi shl.mi Log Message: fixed removal of Lua 5.1 entries from distrib/sets/lists To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.49 src/distrib/sets/lists/base/ad.arm cvs rdiff -u -r1.44 -r1.45 src/distrib/sets/lists/base/ad.mips cvs rdiff -u -r1.13 -r1.14 src/distrib/sets/lists/base/ad.powerpc cvs rdiff -u -r1.238 -r1.239 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.225 -r1.226 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.1075 -r1.1076 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.708 -r1.709 src/distrib/sets/lists/base/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/ad.arm diff -u src/distrib/sets/lists/base/ad.arm:1.48 src/distrib/sets/lists/base/ad.arm:1.49 --- src/distrib/sets/lists/base/ad.arm:1.48 Sat Jul 19 18:38:33 2014 +++ src/distrib/sets/lists/base/ad.arm Wed Jul 23 02:42:56 2014 @@ -1,4 +1,4 @@ -# $NetBSD: ad.arm,v 1.48 2014/07/19 18:38:33 lneto Exp $ +# $NetBSD: ad.arm,v 1.49 2014/07/23 02:42:56 lneto Exp $ ./lib/oabi base-compat-shlib compat ./lib/oabi/npf base-npf-shlib compat ./lib/oabi/npf/ext_log.so base-npf-shlib compat,pic @@ -333,6 +333,10 @@ ./usr/lib/oabi/libz.so.1 base-compat-shlib compat,pic ./usr/lib/oabi/libz.so.1.0 base-compat-shlib compat,pic ./usr/lib/oabi/luabase-compat-shlib compat +./usr/lib/oabi/lua/5.1base-obsolete obsolete +./usr/lib/oabi/lua/5.1/gpio.so base-obsolete obsolete +./usr/lib/oabi/lua/5.1/sqlite.so base-obsolete obsolete +./usr/lib/oabi/lua/5.1/syslog.so base-obsolete obsolete ./usr/lib/oabi/lua/5.3base-compat-shlib compat ./usr/lib/oabi/lua/5.3/gpio.so base-compat-shlib compat,pic ./usr/lib/oabi/lua/5.3/sqlite.so base-compat-shlib compat,pic Index: src/distrib/sets/lists/base/ad.mips diff -u src/distrib/sets/lists/base/ad.mips:1.44 src/distrib/sets/lists/base/ad.mips:1.45 --- src/distrib/sets/lists/base/ad.mips:1.44 Sat Jul 19 18:38:33 2014 +++ src/distrib/sets/lists/base/ad.mips Wed Jul 23 02:42:56 2014 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips,v 1.44 2014/07/19 18:38:33 lneto Exp $ +# $NetBSD: ad.mips,v 1.45 2014/07/23 02:42:56 lneto Exp $ ./lib/64 base-compat-shlib compat,arch64 ./lib/64/npf base-npf-shlib compat,arch64 ./lib/64/npf/ext_log.sobase-npf-shlib compat,pic,arch64 @@ -329,6 +329,10 @@ ./usr/lib/64/libz.so.1base-compat-shlib compat,pic,arch64 ./usr/lib/64/libz.so.1.0 base-compat-shlib compat,pic,arch64 ./usr/lib/64/luabase-compat-shlib compat,arch64 +./usr/lib/64/lua/5.1base-obsolete obsolete +./usr/lib/64/lua/5.1/gpio.so base-obsolete obsolete +./usr/lib/64/lua/5.1/sqlite.so base-obsolete obsolete +./usr/lib/64/lua/5.1/syslog.so base-obsolete obsolete ./usr/lib/64/lua/5.3base-compat-shlib compat,arch64 ./usr/lib/64/lua/5.3/gpio.so base-compat-shlib compat,pic,arch64 ./usr/lib/64/lua/5.3/sqlite.so base-compat-shlib compat,pic,arch64 @@ -664,6 +668,10 @@ ./usr/lib/o32/libz.so.1base-compat-shlib compat,pic,arch64 ./usr/lib/o32/libz.so.1.0 base-compat-shlib compat,pic,arch64 ./usr/lib/o32/luabase-compat-shlib compat,arch64 +./usr/lib/o32/lua/5.1base-obsolete obsolete +./usr/lib/o32/lua/5.1/gpio.so base-obsolete obsolete +./usr/lib/o32/lua/5.1/sqlite.so base-obsolete obsolete +./usr/lib/o32/lua/5.1/syslog.so base-obsolete obsolete ./usr/lib/o32/lua/5.3base-compat-shlib compat,arch64 ./usr/lib/o32/lua/5.3/gpio.so base-compat-shlib compat,pic,arch64 ./usr/lib/o32/lua/5.3/sqlite.so base-compat-shlib compat,pic,arch64 Index: src/distrib/sets/lists/base/ad.powerpc diff -u src/distrib/sets/lists/base/ad.powerpc:1.13 src/distrib/sets/lists/base/ad.powerpc:1.14 --- src/distrib/sets/lists/base/ad.powerpc:1.13 Sat Jul 19 18:38:33 2014 +++ src/distrib/sets/lists/base/ad.powerpc Wed Jul 23 02:42:56 2014 @@ -1,4 +1,4 @@ -# $NetBSD: ad.powerpc,v 1.13 2014/07/19 18:38:33 lneto Exp $ +# $NetBSD: ad.powerpc,v 1.14 2014/07/23 02:42:56 lneto Exp $ ./lib/powerpc base-npf-shlib compat,arch64 ./lib/powerpc/npfbase-npf-shlib compat,arch64 ./lib/powerpc/npf/ext_log.so base-npf-shlib compat,arch64,pic @@ -301,6 +301,10 @@ ./usr/lib/powerpc/libz.so.1 base-compat-shlib compat,arch64,pic ./usr/lib/powerpc/libz.so.1.0 base-compat-shlib compat,arch64,pic ./usr/lib/powerpc/luabase-compat-shlib compat,arch64 +./usr/lib/powerpc/lua/5.1 base-obsolete obsolete +./usr/lib/powerpc/lua/5.1/gpio.so base-obsolete obsolete +./usr/lib/powerpc/lua/5.1/sqlite.so base-obsolete obsolete +./usr/lib/powerpc/lua/5.1/syslog.so base-obsolete obsolete ./usr/lib/powerpc/lua/5.3 base-compat-shlib compat,arch64 ./usr/lib/powerpc/lua/5.3/gpio.so base-compat-shlib compat,arch64,
CVS commit: [LUA_5_3_work3] src/external/mit/lua/src/external/mit/lua/dist
Module Name:src Committed By: lneto Date: Mon Jul 21 00:19:47 UTC 2014 Removed Files: src/external/mit/lua/src/external/mit/lua/dist [LUA_5_3_work3]: Makefile README src/external/mit/lua/src/external/mit/lua/dist/doc [LUA_5_3_work3]: alert.png contents.html logo.gif lua.1 lua.css luac.1 manual.css manual.html osi-certified-72x60.png readme.html src/external/mit/lua/src/external/mit/lua/dist/src [LUA_5_3_work3]: Makefile lapi.c lapi.h lauxlib.c lauxlib.h lbaselib.c lbitlib.c lcode.c lcode.h lcorolib.c lctype.c lctype.h ldblib.c ldebug.c ldebug.h ldo.c ldo.h ldump.c lfunc.c lfunc.h lgc.c lgc.h linit.c liolib.c llex.c llex.h llimits.h lmathlib.c lmem.c lmem.h loadlib.c lobject.c lobject.h lopcodes.c lopcodes.h loslib.c lparser.c lparser.h lstate.c lstate.h lstring.c lstring.h lstrlib.c ltable.c ltable.h ltablib.c ltm.c ltm.h lua.c lua.h lua.hpp luac.c luaconf.h lualib.h lundump.c lundump.h lutf8lib.c lvm.c lvm.h lzio.c lzio.h Log Message: removed accidental importation To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mit/lua/src/external/mit/lua/dist/Makefile \ src/external/mit/lua/src/external/mit/lua/dist/README cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mit/lua/src/external/mit/lua/dist/doc/alert.png \ src/external/mit/lua/src/external/mit/lua/dist/doc/contents.html \ src/external/mit/lua/src/external/mit/lua/dist/doc/logo.gif \ src/external/mit/lua/src/external/mit/lua/dist/doc/lua.1 \ src/external/mit/lua/src/external/mit/lua/dist/doc/lua.css \ src/external/mit/lua/src/external/mit/lua/dist/doc/luac.1 \ src/external/mit/lua/src/external/mit/lua/dist/doc/manual.css \ src/external/mit/lua/src/external/mit/lua/dist/doc/manual.html \ src/external/mit/lua/src/external/mit/lua/dist/doc/osi-certified-72x60.png \ src/external/mit/lua/src/external/mit/lua/dist/doc/readme.html cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mit/lua/src/external/mit/lua/dist/src/Makefile \ src/external/mit/lua/src/external/mit/lua/dist/src/lapi.c \ src/external/mit/lua/src/external/mit/lua/dist/src/lapi.h \ src/external/mit/lua/src/external/mit/lua/dist/src/lauxlib.c \ src/external/mit/lua/src/external/mit/lua/dist/src/lauxlib.h \ src/external/mit/lua/src/external/mit/lua/dist/src/lbaselib.c \ src/external/mit/lua/src/external/mit/lua/dist/src/lbitlib.c \ src/external/mit/lua/src/external/mit/lua/dist/src/lcode.c \ src/external/mit/lua/src/external/mit/lua/dist/src/lcode.h \ src/external/mit/lua/src/external/mit/lua/dist/src/lcorolib.c \ src/external/mit/lua/src/external/mit/lua/dist/src/lctype.c \ src/external/mit/lua/src/external/mit/lua/dist/src/lctype.h \ src/external/mit/lua/src/external/mit/lua/dist/src/ldblib.c \ src/external/mit/lua/src/external/mit/lua/dist/src/ldebug.c \ src/external/mit/lua/src/external/mit/lua/dist/src/ldebug.h \ src/external/mit/lua/src/external/mit/lua/dist/src/ldo.c \ src/external/mit/lua/src/external/mit/lua/dist/src/ldo.h \ src/external/mit/lua/src/external/mit/lua/dist/src/ldump.c \ src/external/mit/lua/src/external/mit/lua/dist/src/lfunc.c \ src/external/mit/lua/src/external/mit/lua/dist/src/lfunc.h \ src/external/mit/lua/src/external/mit/lua/dist/src/lgc.c \ src/external/mit/lua/src/external/mit/lua/dist/src/lgc.h \ src/external/mit/lua/src/external/mit/lua/dist/src/linit.c \ src/external/mit/lua/src/external/mit/lua/dist/src/liolib.c \ src/external/mit/lua/src/external/mit/lua/dist/src/llex.c \ src/external/mit/lua/src/external/mit/lua/dist/src/llex.h \ src/external/mit/lua/src/external/mit/lua/dist/src/llimits.h \ src/external/mit/lua/src/external/mit/lua/dist/src/lmathlib.c \ src/external/mit/lua/src/external/mit/lua/dist/src/lmem.c \ src/external/mit/lua/src/external/mit/lua/dist/src/lmem.h \ src/external/mit/lua/src/external/mit/lua/dist/src/loadlib.c \ src/external/mit/lua/src/external/mit/lua/dist/src/lobject.c \ src/external/mit/lua/src/external/mit/lua/dist/src/lobject.h \ src/external/mit/lua/src/external/mit/lua/dist/src/lopcodes.c \ src/external/mit/lua/src/external/mit/lua/dist/src/lopcodes.h \ src/external/mit/lua/src/external/mit/lua/dist/src/loslib.c \ src/external/mit/lua/src/external/mit/lua/dist/src/lparser.c \ src/external/mit/lua/src/external/mit/lua/dist/src/lparser.h \ src/external/mit/lua/src/external/mit/lua/dist/src/lstate.c \ src/external/mit/lua/src/external/mit/lua/dist/src/lstate.h \ src/external/mit/lua/src/external/mit/lua/dist/src/lstring.c \ src/external/mit/lua/src/external/mit/lua/dist/src/lstring.h \ src/external/mit/lua/src/external/mit/lua/dist/src/lstrlib.c \ src/external/mit/lua/src/external/mit/lua/dist/src/ltable.c \ src/external/mit/lu
CVS commit: [LUA] src/external/mit/lua/src/external/mit/lua/dist
Module Name:src Committed By: lneto Date: Sun Jul 20 23:55:22 UTC 2014 Removed Files: src/external/mit/lua/src/external/mit/lua/dist [LUA]: Makefile README src/external/mit/lua/src/external/mit/lua/dist/doc [LUA]: alert.png contents.html logo.gif lua.1 lua.css luac.1 manual.css manual.html osi-certified-72x60.png readme.html src/external/mit/lua/src/external/mit/lua/dist/src [LUA]: Makefile lapi.c lapi.h lauxlib.c lauxlib.h lbaselib.c lbitlib.c lcode.c lcode.h lcorolib.c lctype.c lctype.h ldblib.c ldebug.c ldebug.h ldo.c ldo.h ldump.c lfunc.c lfunc.h lgc.c lgc.h linit.c liolib.c llex.c llex.h llimits.h lmathlib.c lmem.c lmem.h loadlib.c lobject.c lobject.h lopcodes.c lopcodes.h loslib.c lparser.c lparser.h lstate.c lstate.h lstring.c lstring.h lstrlib.c ltable.c ltable.h ltablib.c ltm.c ltm.h lua.c lua.h lua.hpp luac.c luaconf.h lualib.h lundump.c lundump.h lutf8lib.c lvm.c lvm.h lzio.c lzio.h Log Message: removed accidental importation To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mit/lua/src/external/mit/lua/dist/Makefile \ src/external/mit/lua/src/external/mit/lua/dist/README cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mit/lua/src/external/mit/lua/dist/doc/alert.png \ src/external/mit/lua/src/external/mit/lua/dist/doc/contents.html \ src/external/mit/lua/src/external/mit/lua/dist/doc/logo.gif \ src/external/mit/lua/src/external/mit/lua/dist/doc/lua.1 \ src/external/mit/lua/src/external/mit/lua/dist/doc/lua.css \ src/external/mit/lua/src/external/mit/lua/dist/doc/luac.1 \ src/external/mit/lua/src/external/mit/lua/dist/doc/manual.css \ src/external/mit/lua/src/external/mit/lua/dist/doc/manual.html \ src/external/mit/lua/src/external/mit/lua/dist/doc/osi-certified-72x60.png \ src/external/mit/lua/src/external/mit/lua/dist/doc/readme.html cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mit/lua/src/external/mit/lua/dist/src/Makefile \ src/external/mit/lua/src/external/mit/lua/dist/src/lapi.c \ src/external/mit/lua/src/external/mit/lua/dist/src/lapi.h \ src/external/mit/lua/src/external/mit/lua/dist/src/lauxlib.c \ src/external/mit/lua/src/external/mit/lua/dist/src/lauxlib.h \ src/external/mit/lua/src/external/mit/lua/dist/src/lbaselib.c \ src/external/mit/lua/src/external/mit/lua/dist/src/lbitlib.c \ src/external/mit/lua/src/external/mit/lua/dist/src/lcode.c \ src/external/mit/lua/src/external/mit/lua/dist/src/lcode.h \ src/external/mit/lua/src/external/mit/lua/dist/src/lcorolib.c \ src/external/mit/lua/src/external/mit/lua/dist/src/lctype.c \ src/external/mit/lua/src/external/mit/lua/dist/src/lctype.h \ src/external/mit/lua/src/external/mit/lua/dist/src/ldblib.c \ src/external/mit/lua/src/external/mit/lua/dist/src/ldebug.c \ src/external/mit/lua/src/external/mit/lua/dist/src/ldebug.h \ src/external/mit/lua/src/external/mit/lua/dist/src/ldo.c \ src/external/mit/lua/src/external/mit/lua/dist/src/ldo.h \ src/external/mit/lua/src/external/mit/lua/dist/src/ldump.c \ src/external/mit/lua/src/external/mit/lua/dist/src/lfunc.c \ src/external/mit/lua/src/external/mit/lua/dist/src/lfunc.h \ src/external/mit/lua/src/external/mit/lua/dist/src/lgc.c \ src/external/mit/lua/src/external/mit/lua/dist/src/lgc.h \ src/external/mit/lua/src/external/mit/lua/dist/src/linit.c \ src/external/mit/lua/src/external/mit/lua/dist/src/liolib.c \ src/external/mit/lua/src/external/mit/lua/dist/src/llex.c \ src/external/mit/lua/src/external/mit/lua/dist/src/llex.h \ src/external/mit/lua/src/external/mit/lua/dist/src/llimits.h \ src/external/mit/lua/src/external/mit/lua/dist/src/lmathlib.c \ src/external/mit/lua/src/external/mit/lua/dist/src/lmem.c \ src/external/mit/lua/src/external/mit/lua/dist/src/lmem.h \ src/external/mit/lua/src/external/mit/lua/dist/src/loadlib.c \ src/external/mit/lua/src/external/mit/lua/dist/src/lobject.c \ src/external/mit/lua/src/external/mit/lua/dist/src/lobject.h \ src/external/mit/lua/src/external/mit/lua/dist/src/lopcodes.c \ src/external/mit/lua/src/external/mit/lua/dist/src/lopcodes.h \ src/external/mit/lua/src/external/mit/lua/dist/src/loslib.c \ src/external/mit/lua/src/external/mit/lua/dist/src/lparser.c \ src/external/mit/lua/src/external/mit/lua/dist/src/lparser.h \ src/external/mit/lua/src/external/mit/lua/dist/src/lstate.c \ src/external/mit/lua/src/external/mit/lua/dist/src/lstate.h \ src/external/mit/lua/src/external/mit/lua/dist/src/lstring.c \ src/external/mit/lua/src/external/mit/lua/dist/src/lstring.h \ src/external/mit/lua/src/external/mit/lua/dist/src/lstrlib.c \ src/external/mit/lua/src/external/mit/lua/dist/src/ltable.c \ src/external/mit/lua/src/external/mit/lua/dist/src/ltable.h \
CVS import: src/external/mit/lua
Module Name:src Committed By: lneto Date: Sun Jul 20 23:17:40 UTC 2014 Update of /cvsroot/src/external/mit/lua In directory ivanova.netbsd.org:/tmp/cvs-serv29753 Log Message: imported Lua 5.3 work3 Status: Vendor Tag: LUA Release Tags: LUA_5_3_work3 C src/external/mit/lua/dist/Makefile C src/external/mit/lua/dist/README C src/external/mit/lua/dist/doc/alert.png C src/external/mit/lua/dist/doc/contents.html U src/external/mit/lua/dist/doc/logo.gif C src/external/mit/lua/dist/doc/lua.1 C src/external/mit/lua/dist/doc/lua.css C src/external/mit/lua/dist/doc/luac.1 C src/external/mit/lua/dist/doc/manual.css C src/external/mit/lua/dist/doc/manual.html C src/external/mit/lua/dist/doc/osi-certified-72x60.png C src/external/mit/lua/dist/doc/readme.html C src/external/mit/lua/dist/src/lapi.c C src/external/mit/lua/dist/src/Makefile C src/external/mit/lua/dist/src/lapi.h C src/external/mit/lua/dist/src/lauxlib.c C src/external/mit/lua/dist/src/lauxlib.h C src/external/mit/lua/dist/src/lbaselib.c C src/external/mit/lua/dist/src/lbitlib.c C src/external/mit/lua/dist/src/lcode.c C src/external/mit/lua/dist/src/lcode.h C src/external/mit/lua/dist/src/lcorolib.c C src/external/mit/lua/dist/src/lctype.c C src/external/mit/lua/dist/src/lctype.h C src/external/mit/lua/dist/src/ldblib.c C src/external/mit/lua/dist/src/ldebug.c C src/external/mit/lua/dist/src/ldebug.h C src/external/mit/lua/dist/src/ldo.c C src/external/mit/lua/dist/src/ldo.h C src/external/mit/lua/dist/src/ldump.c C src/external/mit/lua/dist/src/lfunc.c C src/external/mit/lua/dist/src/lfunc.h C src/external/mit/lua/dist/src/lgc.c C src/external/mit/lua/dist/src/lgc.h C src/external/mit/lua/dist/src/linit.c C src/external/mit/lua/dist/src/liolib.c C src/external/mit/lua/dist/src/llex.c C src/external/mit/lua/dist/src/llex.h C src/external/mit/lua/dist/src/llimits.h C src/external/mit/lua/dist/src/lmathlib.c C src/external/mit/lua/dist/src/lmem.c C src/external/mit/lua/dist/src/lmem.h C src/external/mit/lua/dist/src/loadlib.c C src/external/mit/lua/dist/src/lobject.c C src/external/mit/lua/dist/src/lobject.h C src/external/mit/lua/dist/src/lopcodes.c C src/external/mit/lua/dist/src/lopcodes.h C src/external/mit/lua/dist/src/loslib.c C src/external/mit/lua/dist/src/lparser.c C src/external/mit/lua/dist/src/lparser.h C src/external/mit/lua/dist/src/lstate.c C src/external/mit/lua/dist/src/lstate.h C src/external/mit/lua/dist/src/lstring.c C src/external/mit/lua/dist/src/lstring.h C src/external/mit/lua/dist/src/lstrlib.c C src/external/mit/lua/dist/src/ltable.c C src/external/mit/lua/dist/src/ltable.h C src/external/mit/lua/dist/src/ltablib.c C src/external/mit/lua/dist/src/ltm.c C src/external/mit/lua/dist/src/ltm.h C src/external/mit/lua/dist/src/lua.c C src/external/mit/lua/dist/src/lua.h C src/external/mit/lua/dist/src/lua.hpp C src/external/mit/lua/dist/src/luac.c C src/external/mit/lua/dist/src/luaconf.h C src/external/mit/lua/dist/src/lualib.h C src/external/mit/lua/dist/src/lundump.c C src/external/mit/lua/dist/src/lundump.h C src/external/mit/lua/dist/src/lutf8lib.c C src/external/mit/lua/dist/src/lvm.c C src/external/mit/lua/dist/src/lvm.h C src/external/mit/lua/dist/src/lzio.c C src/external/mit/lua/dist/src/lzio.h 72 conflicts created by this import. Use the following command to help the merge: cvs checkout -jLUA:yesterday -jLUA src/external/mit/lua
CVS import: src/external/mit/lua
Module Name:src Committed By: lneto Date: Sun Jul 20 22:51:31 UTC 2014 Update of /cvsroot/src/external/mit/lua In directory ivanova.netbsd.org:/tmp/cvs-serv7761 Log Message: imported Lua 5.3 work3 Status: Vendor Tag: LUA Release Tags: LUA_5_3_work3 N src/external/mit/lua/src/external/mit/lua/dist/Makefile N src/external/mit/lua/src/external/mit/lua/dist/README N src/external/mit/lua/src/external/mit/lua/dist/doc/alert.png N src/external/mit/lua/src/external/mit/lua/dist/doc/contents.html N src/external/mit/lua/src/external/mit/lua/dist/doc/logo.gif N src/external/mit/lua/src/external/mit/lua/dist/doc/lua.1 N src/external/mit/lua/src/external/mit/lua/dist/doc/lua.css N src/external/mit/lua/src/external/mit/lua/dist/doc/luac.1 N src/external/mit/lua/src/external/mit/lua/dist/doc/manual.css N src/external/mit/lua/src/external/mit/lua/dist/doc/manual.html N src/external/mit/lua/src/external/mit/lua/dist/doc/osi-certified-72x60.png N src/external/mit/lua/src/external/mit/lua/dist/doc/readme.html N src/external/mit/lua/src/external/mit/lua/dist/src/lapi.c N src/external/mit/lua/src/external/mit/lua/dist/src/Makefile N src/external/mit/lua/src/external/mit/lua/dist/src/lapi.h N src/external/mit/lua/src/external/mit/lua/dist/src/lauxlib.c N src/external/mit/lua/src/external/mit/lua/dist/src/lauxlib.h N src/external/mit/lua/src/external/mit/lua/dist/src/lbaselib.c N src/external/mit/lua/src/external/mit/lua/dist/src/lbitlib.c N src/external/mit/lua/src/external/mit/lua/dist/src/lcode.c N src/external/mit/lua/src/external/mit/lua/dist/src/lcode.h N src/external/mit/lua/src/external/mit/lua/dist/src/lcorolib.c N src/external/mit/lua/src/external/mit/lua/dist/src/lctype.c N src/external/mit/lua/src/external/mit/lua/dist/src/lctype.h N src/external/mit/lua/src/external/mit/lua/dist/src/ldblib.c N src/external/mit/lua/src/external/mit/lua/dist/src/ldebug.c N src/external/mit/lua/src/external/mit/lua/dist/src/ldebug.h N src/external/mit/lua/src/external/mit/lua/dist/src/ldo.c N src/external/mit/lua/src/external/mit/lua/dist/src/ldo.h N src/external/mit/lua/src/external/mit/lua/dist/src/ldump.c N src/external/mit/lua/src/external/mit/lua/dist/src/lfunc.c N src/external/mit/lua/src/external/mit/lua/dist/src/lfunc.h N src/external/mit/lua/src/external/mit/lua/dist/src/lgc.c N src/external/mit/lua/src/external/mit/lua/dist/src/lgc.h N src/external/mit/lua/src/external/mit/lua/dist/src/linit.c N src/external/mit/lua/src/external/mit/lua/dist/src/liolib.c N src/external/mit/lua/src/external/mit/lua/dist/src/llex.c N src/external/mit/lua/src/external/mit/lua/dist/src/llex.h N src/external/mit/lua/src/external/mit/lua/dist/src/llimits.h N src/external/mit/lua/src/external/mit/lua/dist/src/lmathlib.c N src/external/mit/lua/src/external/mit/lua/dist/src/lmem.c N src/external/mit/lua/src/external/mit/lua/dist/src/lmem.h N src/external/mit/lua/src/external/mit/lua/dist/src/loadlib.c N src/external/mit/lua/src/external/mit/lua/dist/src/lobject.c N src/external/mit/lua/src/external/mit/lua/dist/src/lobject.h N src/external/mit/lua/src/external/mit/lua/dist/src/lopcodes.c N src/external/mit/lua/src/external/mit/lua/dist/src/lopcodes.h N src/external/mit/lua/src/external/mit/lua/dist/src/loslib.c N src/external/mit/lua/src/external/mit/lua/dist/src/lparser.c N src/external/mit/lua/src/external/mit/lua/dist/src/lparser.h N src/external/mit/lua/src/external/mit/lua/dist/src/lstate.c N src/external/mit/lua/src/external/mit/lua/dist/src/lstate.h N src/external/mit/lua/src/external/mit/lua/dist/src/lstring.c N src/external/mit/lua/src/external/mit/lua/dist/src/lstring.h N src/external/mit/lua/src/external/mit/lua/dist/src/lstrlib.c N src/external/mit/lua/src/external/mit/lua/dist/src/ltable.c N src/external/mit/lua/src/external/mit/lua/dist/src/ltable.h N src/external/mit/lua/src/external/mit/lua/dist/src/ltablib.c N src/external/mit/lua/src/external/mit/lua/dist/src/ltm.c N src/external/mit/lua/src/external/mit/lua/dist/src/ltm.h N src/external/mit/lua/src/external/mit/lua/dist/src/lua.c N src/external/mit/lua/src/external/mit/lua/dist/src/lua.h N src/external/mit/lua/src/external/mit/lua/dist/src/lua.hpp N src/external/mit/lua/src/external/mit/lua/dist/src/luac.c N src/external/mit/lua/src/external/mit/lua/dist/src/luaconf.h N src/external/mit/lua/src/external/mit/lua/dist/src/lualib.h N src/external/mit/lua/src/external/mit/lua/dist/src/lundump.c N src/external/mit/lua/src/external/mit/lua/dist/src/lundump.h N src/external/mit/lua/src/external/mit/lua/dist/src/lutf8lib.c N src/external/mit/lua/src/external/mit/lua/dist/src/lvm.c N src/external/mit/lua/src/external/mit/lua/dist/src/lvm.h N src/external/mit/lua/src/external/mit/lua/dist/src/lzio.c N src/external/mit/lua/src/external/mit/lua/dist/src/lzio.h No conflicts created by this import
CVS commit: src/external/mit/lua/dist/src
Module Name:src Committed By: lneto Date: Sat Jul 19 19:37:31 UTC 2014 Modified Files: src/external/mit/lua/dist/src: ldblib.c Log Message: lua(4): fixed ldblib.c * for some reason it wasn't added on my last commit To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/mit/lua/dist/src/ldblib.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/lua/dist/src/ldblib.c diff -u src/external/mit/lua/dist/src/ldblib.c:1.3 src/external/mit/lua/dist/src/ldblib.c:1.4 --- src/external/mit/lua/dist/src/ldblib.c:1.3 Sat Jul 19 18:38:34 2014 +++ src/external/mit/lua/dist/src/ldblib.c Sat Jul 19 19:37:31 2014 @@ -1,15 +1,17 @@ -/* $NetBSD: ldblib.c,v 1.3 2014/07/19 18:38:34 lneto Exp $ */ +/* $NetBSD: ldblib.c,v 1.4 2014/07/19 19:37:31 lneto Exp $ */ /* -** $Id: ldblib.c,v 1.3 2014/07/19 18:38:34 lneto Exp $ +** $Id: ldblib.c,v 1.4 2014/07/19 19:37:31 lneto Exp $ ** Interface from Lua to its debug API ** See Copyright Notice in lua.h */ +#ifndef _KERNEL #include #include #include +#endif #define ldblib_c #define LUA_LIB
CVS commit: src
Module Name:src Committed By: lneto Date: Sat Jul 19 18:38:35 UTC 2014 Modified Files: src/distrib/sets/lists/base: ad.arm ad.mips ad.powerpc md.amd64 md.sparc64 mi shl.mi src/distrib/sets/lists/debug: ad.arm ad.mips ad.powerpc md.amd64 md.sparc64 shl.mi src/doc: CHANGES RESPONSIBLE src/etc/mtree: NetBSD.dist.base NetBSD.dist.earm NetBSD.dist.mips64eb NetBSD.dist.mips64el NetBSD.dist.powerpc64 NetBSD.dist.sparc64 NetBSD.dist.x86_64 src/external/mit/lua/dist: Makefile README src/external/mit/lua/dist/doc: contents.html lua.1 lua.css luac.1 manual.css manual.html readme.html src/external/mit/lua/dist/src: Makefile lapi.c lapi.h lauxlib.c lauxlib.h lbaselib.c lcode.c lcode.h ldblib.c ldebug.c ldebug.h ldo.c ldo.h ldump.c lfunc.c lfunc.h lgc.c lgc.h linit.c liolib.c llex.c llex.h llimits.h lmathlib.c lmem.c lmem.h loadlib.c lobject.c lobject.h lopcodes.c lopcodes.h loslib.c lparser.c lparser.h lstate.c lstate.h lstring.c lstring.h lstrlib.c ltable.c ltable.h ltablib.c ltm.c ltm.h lua.c lua.h luac.c luaconf.h lualib.h lundump.c lundump.h lvm.c lvm.h lzio.c lzio.h src/external/mit/lua/lib/liblua: Makefile shlib_version src/external/mit/lua/usr.bin/luac: Makefile src/lib/lua/gpio: gpio.c src/lib/lua/sqlite: sqlite.c src/libexec/httpd: lua-bozo.c src/share/examples/lua: gpio.lua sqlite.lua src/share/mk: bsd.lua.mk src/sys/external/bsd/acpica/dist/include/platform: acnetbsd.h src/sys/lib/libkern: Makefile.libkern libkern.h src/sys/modules/lua: Makefile lua.c test.lua src/sys/modules/luapmf: Makefile luapmf.c src/sys/modules/luasystm: Makefile luasystm.c test.lua Added Files: src/common/lib/libc/string: strcspn.c strpbrk.c strspn.c src/external/mit/lua/dist/doc: alert.png osi-certified-72x60.png src/external/mit/lua/dist/src: lbitlib.c lcorolib.c lctype.c lctype.h lua.hpp lutf8lib.c Removed Files: src/external/mit/lua/dist: COPYRIGHT HISTORY INSTALL src/external/mit/lua/dist/doc: cover.png lua.html luac.html src/external/mit/lua/dist/etc: Makefile README all.c lua.hpp lua.ico lua.pc luavs.bat min.c noparser.c strict.lua src/external/mit/lua/dist/src: print.c src/external/mit/lua/dist/test: README bisect.lua cf.lua echo.lua env.lua factorial.lua fib.lua fibfor.lua globals.lua hello.lua life.lua luac.lua printf.lua readonly.lua sieve.lua sort.lua table.lua trace-calls.lua trace-globals.lua xd.lua src/lib/libc/string: strcspn.c strpbrk.c strspn.c src/sys/modules/lua: assert.h ctype.h errno.h inttypes.h limits.h locale.h math.h setjmp.h signal.h stdarg.h stddef.h stdio.h stdlib.h string.h Log Message: lua: updated from 5.1 to 5.3 work3 * lua(1): - changed lua_Integer to intmax_t - updated distrib/sets/lists and etc/mtree - updated bsd.lua.mk - fixed bozohttpd (lua-bozo.c) - compatibilized bindings: gpio, sqlite * lua(4): - removed floating-point and libc dependencies using '#ifndef _KERNEL' - fixed division by zero and exponentiation - libkern: added isalnum(), iscntrl(), isgraph(), isprint() and ispunct() - acpica: removed isprint() from acnetbsd.h - libc: moved strcspn.c, strpbrk.c and strspn.c to common - removed stub headers - compatibilized bindings: luapmf, luasystm * reorganized luaconf.h * updated doc/CHANGES and doc/RESPONSIBLE To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/common/lib/libc/string/strcspn.c \ src/common/lib/libc/string/strpbrk.c src/common/lib/libc/string/strspn.c cvs rdiff -u -r1.47 -r1.48 src/distrib/sets/lists/base/ad.arm cvs rdiff -u -r1.43 -r1.44 src/distrib/sets/lists/base/ad.mips cvs rdiff -u -r1.12 -r1.13 src/distrib/sets/lists/base/ad.powerpc cvs rdiff -u -r1.237 -r1.238 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.224 -r1.225 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.1073 -r1.1074 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.707 -r1.708 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.38 -r1.39 src/distrib/sets/lists/debug/ad.arm cvs rdiff -u -r1.34 -r1.35 src/distrib/sets/lists/debug/ad.mips cvs rdiff -u -r1.14 -r1.15 src/distrib/sets/lists/debug/ad.powerpc cvs rdiff -u -r1.59 -r1.60 src/distrib/sets/lists/debug/md.amd64 cvs rdiff -u -r1.57 -r1.58 src/distrib/sets/lists/debug/md.sparc64 cvs rdiff -u -r1.67 -r1.68 src/distrib/sets/lists/debug/shl.mi cvs rdiff -u -r1.1948 -r1.1949 src/doc/CHANGES cvs rdiff -u -r1.108 -r1.109 src/doc/RESPONSIBLE cvs rdiff -u -r1.136 -r1.137 src/etc/mtree/NetBSD.dist.base cvs rdiff -u -r1.1 -r1.2 src/etc/mtree/NetBSD.dist.earm \ src/etc/mtree/NetBSD.dist.powerpc64 cvs rdiff -u -r1.7 -r1.8 src/etc/mtree/NetBSD
CVS commit: src
Module Name:src
Committed By: lneto
Date: Sat Jul 19 17:21:24 UTC 2014
Modified Files:
src/external/mit/lua/dist/src: ldblib.c
src/sys/modules/lua: Makefile
Log Message:
lua(4): added debug library
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/mit/lua/dist/src/ldblib.c
cvs rdiff -u -r1.6 -r1.7 src/sys/modules/lua/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/lua/dist/src/ldblib.c
diff -u src/external/mit/lua/dist/src/ldblib.c:1.1.1.2 src/external/mit/lua/dist/src/ldblib.c:1.2
--- src/external/mit/lua/dist/src/ldblib.c:1.1.1.2 Thu Mar 15 00:08:10 2012
+++ src/external/mit/lua/dist/src/ldblib.c Sat Jul 19 17:21:24 2014
@@ -1,7 +1,7 @@
-/* $NetBSD: ldblib.c,v 1.1.1.2 2012/03/15 00:08:10 alnsn Exp $ */
+/* $NetBSD: ldblib.c,v 1.2 2014/07/19 17:21:24 lneto Exp $ */
/*
-** $Id: ldblib.c,v 1.1.1.2 2012/03/15 00:08:10 alnsn Exp $
+** $Id: ldblib.c,v 1.2 2014/07/19 17:21:24 lneto Exp $
** Interface from Lua to its debug API
** See Copyright Notice in lua.h
*/
@@ -301,6 +301,7 @@ static int db_gethook (lua_State *L) {
}
+#ifndef _KERNEL
static int db_debug (lua_State *L) {
for (;;) {
char buffer[250];
@@ -316,6 +317,7 @@ static int db_debug (lua_State *L) {
lua_settop(L, 0); /* remove eventual returns */
}
}
+#endif
#define LEVELS1 12 /* size of the first part of the stack */
@@ -375,7 +377,9 @@ static int db_errorfb (lua_State *L) {
static const luaL_Reg dblib[] = {
+#ifndef _KERNEL
{"debug", db_debug},
+#endif
{"getfenv", db_getfenv},
{"gethook", db_gethook},
{"getinfo", db_getinfo},
Index: src/sys/modules/lua/Makefile
diff -u src/sys/modules/lua/Makefile:1.6 src/sys/modules/lua/Makefile:1.7
--- src/sys/modules/lua/Makefile:1.6 Fri Dec 27 22:09:43 2013
+++ src/sys/modules/lua/Makefile Sat Jul 19 17:21:24 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2013/12/27 22:09:43 christos Exp $
+# $NetBSD: Makefile,v 1.7 2014/07/19 17:21:24 lneto Exp $
.include "../Makefile.inc"
@@ -36,6 +36,7 @@ SRCS+= lauxlib.c
# Lua stdlibs source code
SRCS+= lbaselib.c \
+ ldblib.c \
lstrlib.c \
ltablib.c \
linit.c
CVS commit: src/sys
Module Name:src
Committed By: lneto
Date: Sat Jul 19 17:20:03 UTC 2014
Modified Files:
src/sys/modules/lua: lua.c
src/sys/modules/luapmf: luapmf.c
src/sys/modules/luasystm: luasystm.c
src/sys/sys: lua.h
Log Message:
lua(4): uniformed the KPI name space using 'klua_' prefix
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/modules/lua/lua.c
cvs rdiff -u -r1.4 -r1.5 src/sys/modules/luapmf/luapmf.c
cvs rdiff -u -r1.3 -r1.4 src/sys/modules/luasystm/luasystm.c
cvs rdiff -u -r1.5 -r1.6 src/sys/sys/lua.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/lua/lua.c
diff -u src/sys/modules/lua/lua.c:1.10 src/sys/modules/lua/lua.c:1.11
--- src/sys/modules/lua/lua.c:1.10 Sat Jul 19 17:14:40 2014
+++ src/sys/modules/lua/lua.c Sat Jul 19 17:20:02 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: lua.c,v 1.10 2014/07/19 17:14:40 lneto Exp $ */
+/* $NetBSD: lua.c,v 1.11 2014/07/19 17:20:02 lneto Exp $ */
/*
* Copyright (c) 2014 by Lourival Vieira Neto .
@@ -588,7 +588,7 @@ lua_maxcount(lua_State *L, lua_Debug *d)
}
int
-lua_mod_register(const char *name, lua_CFunction open)
+klua_mod_register(const char *name, lua_CFunction open)
{
struct lua_module *m;
@@ -606,7 +606,7 @@ lua_mod_register(const char *name, lua_C
}
int
-lua_mod_unregister(const char *name)
+klua_mod_unregister(const char *name)
{
struct lua_module *m;
Index: src/sys/modules/luapmf/luapmf.c
diff -u src/sys/modules/luapmf/luapmf.c:1.4 src/sys/modules/luapmf/luapmf.c:1.5
--- src/sys/modules/luapmf/luapmf.c:1.4 Sat Jul 19 17:14:40 2014
+++ src/sys/modules/luapmf/luapmf.c Sat Jul 19 17:20:02 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: luapmf.c,v 1.4 2014/07/19 17:14:40 lneto Exp $ */
+/* $NetBSD: luapmf.c,v 1.5 2014/07/19 17:20:02 lneto Exp $ */
/*
* Copyright (c) 2011, 2013 Marc Balmer .
@@ -150,10 +150,10 @@ luapmf_modcmd(modcmd_t cmd, void *opaque
int error;
switch (cmd) {
case MODULE_CMD_INIT:
- error = lua_mod_register("pmf", luaopen_pmf);
+ error = klua_mod_register("pmf", luaopen_pmf);
break;
case MODULE_CMD_FINI:
- error = lua_mod_unregister("pmf");
+ error = klua_mod_unregister("pmf");
break;
default:
error = ENOTTY;
Index: src/sys/modules/luasystm/luasystm.c
diff -u src/sys/modules/luasystm/luasystm.c:1.3 src/sys/modules/luasystm/luasystm.c:1.4
--- src/sys/modules/luasystm/luasystm.c:1.3 Sat Jul 19 17:14:40 2014
+++ src/sys/modules/luasystm/luasystm.c Sat Jul 19 17:20:02 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: luasystm.c,v 1.3 2014/07/19 17:14:40 lneto Exp $ */
+/* $NetBSD: luasystm.c,v 1.4 2014/07/19 17:20:02 lneto Exp $ */
/*
* Copyright (c) 2011, 2013 Marc Balmer .
@@ -216,10 +216,10 @@ luasystm_modcmd(modcmd_t cmd, void *opaq
switch (cmd) {
case MODULE_CMD_INIT:
- error = lua_mod_register("systm", luaopen_systm);
+ error = klua_mod_register("systm", luaopen_systm);
break;
case MODULE_CMD_FINI:
- error = lua_mod_unregister("systm");
+ error = klua_mod_unregister("systm");
break;
default:
error = ENOTTY;
Index: src/sys/sys/lua.h
diff -u src/sys/sys/lua.h:1.5 src/sys/sys/lua.h:1.6
--- src/sys/sys/lua.h:1.5 Sat Jul 19 17:14:40 2014
+++ src/sys/sys/lua.h Sat Jul 19 17:20:02 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: lua.h,v 1.5 2014/07/19 17:14:40 lneto Exp $ */
+/* $NetBSD: lua.h,v 1.6 2014/07/19 17:20:02 lneto Exp $ */
/*
* Copyright (c) 2014 by Lourival Vieira Neto .
@@ -80,8 +80,8 @@ struct lua_load {
#define LUALOAD _IOWR('l', 4, struct lua_load)
#ifdef _KERNEL
-extern int lua_mod_register(const char *, lua_CFunction);
-extern int lua_mod_unregister(const char *);
+extern int klua_mod_register(const char *, lua_CFunction);
+extern int klua_mod_unregister(const char *);
typedef struct _klua_State {
lua_State *L;
CVS commit: src/sys
Module Name:src
Committed By: lneto
Date: Sat Jul 19 17:14:40 UTC 2014
Modified Files:
src/sys/modules/lua: lua.c luavar.h
src/sys/modules/luapmf: luapmf.c
src/sys/modules/luasystm: luasystm.c
src/sys/sys: lua.h
Log Message:
lua(4): using lua_CFunction
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/modules/lua/lua.c
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/lua/luavar.h
cvs rdiff -u -r1.3 -r1.4 src/sys/modules/luapmf/luapmf.c
cvs rdiff -u -r1.2 -r1.3 src/sys/modules/luasystm/luasystm.c
cvs rdiff -u -r1.4 -r1.5 src/sys/sys/lua.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/lua/lua.c
diff -u src/sys/modules/lua/lua.c:1.9 src/sys/modules/lua/lua.c:1.10
--- src/sys/modules/lua/lua.c:1.9 Sat Jul 19 17:13:22 2014
+++ src/sys/modules/lua/lua.c Sat Jul 19 17:14:40 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: lua.c,v 1.9 2014/07/19 17:13:22 lneto Exp $ */
+/* $NetBSD: lua.c,v 1.10 2014/07/19 17:14:40 lneto Exp $ */
/*
* Copyright (c) 2014 by Lourival Vieira Neto .
@@ -588,7 +588,7 @@ lua_maxcount(lua_State *L, lua_Debug *d)
}
int
-lua_mod_register(const char *name, int (*open)(void *))
+lua_mod_register(const char *name, lua_CFunction open)
{
struct lua_module *m;
Index: src/sys/modules/lua/luavar.h
diff -u src/sys/modules/lua/luavar.h:1.1 src/sys/modules/lua/luavar.h:1.2
--- src/sys/modules/lua/luavar.h:1.1 Wed Oct 16 19:44:57 2013
+++ src/sys/modules/lua/luavar.h Sat Jul 19 17:14:40 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: luavar.h,v 1.1 2013/10/16 19:44:57 mbalmer Exp $ */
+/* $NetBSD: luavar.h,v 1.2 2014/07/19 17:14:40 lneto Exp $ */
/*
* Copyright (c) 2011, Marc Balmer .
@@ -31,9 +31,11 @@
#ifndef _LUA_VAR_
#define _LUA_VAR_
+#include
+
struct lua_module {
char mod_name[LUA_MAX_MODNAME];
- int (*open)(void *);
+ lua_CFunction open;
int refcount;
LIST_ENTRY(lua_module) mod_next;
};
Index: src/sys/modules/luapmf/luapmf.c
diff -u src/sys/modules/luapmf/luapmf.c:1.3 src/sys/modules/luapmf/luapmf.c:1.4
--- src/sys/modules/luapmf/luapmf.c:1.3 Mon Dec 16 23:35:48 2013
+++ src/sys/modules/luapmf/luapmf.c Sat Jul 19 17:14:40 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: luapmf.c,v 1.3 2013/12/16 23:35:48 lneto Exp $ */
+/* $NetBSD: luapmf.c,v 1.4 2014/07/19 17:14:40 lneto Exp $ */
/*
* Copyright (c) 2011, 2013 Marc Balmer .
@@ -82,9 +82,8 @@ get_platform(lua_State *L)
}
static int
-luaopen_pmf(void *ls)
+luaopen_pmf(lua_State *L)
{
- lua_State *L = (lua_State *)ls;
const luaL_Reg pmf_lib[ ] = {
{ "system_shutdown", system_shutdown },
{ "set_platform", set_platform },
Index: src/sys/modules/luasystm/luasystm.c
diff -u src/sys/modules/luasystm/luasystm.c:1.2 src/sys/modules/luasystm/luasystm.c:1.3
--- src/sys/modules/luasystm/luasystm.c:1.2 Mon Mar 24 20:21:02 2014
+++ src/sys/modules/luasystm/luasystm.c Sat Jul 19 17:14:40 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: luasystm.c,v 1.2 2014/03/24 20:21:02 christos Exp $ */
+/* $NetBSD: luasystm.c,v 1.3 2014/07/19 17:14:40 lneto Exp $ */
/*
* Copyright (c) 2011, 2013 Marc Balmer .
@@ -159,9 +159,8 @@ systm_panic(lua_State *L)
/* mutexes */
static int
-luaopen_systm(void *ls)
+luaopen_systm(lua_State *L)
{
- lua_State *L = (lua_State *)ls;
const luaL_Reg systm_lib[ ] = {
{ "print", print },
{ "print_nolog", print_nolog },
Index: src/sys/sys/lua.h
diff -u src/sys/sys/lua.h:1.4 src/sys/sys/lua.h:1.5
--- src/sys/sys/lua.h:1.4 Sat Jul 19 17:13:22 2014
+++ src/sys/sys/lua.h Sat Jul 19 17:14:40 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: lua.h,v 1.4 2014/07/19 17:13:22 lneto Exp $ */
+/* $NetBSD: lua.h,v 1.5 2014/07/19 17:14:40 lneto Exp $ */
/*
* Copyright (c) 2014 by Lourival Vieira Neto .
@@ -80,7 +80,7 @@ struct lua_load {
#define LUALOAD _IOWR('l', 4, struct lua_load)
#ifdef _KERNEL
-extern int lua_mod_register(const char *, int (*)(void *));
+extern int lua_mod_register(const char *, lua_CFunction);
extern int lua_mod_unregister(const char *);
typedef struct _klua_State {
CVS commit: src/sys
Module Name:src
Committed By: lneto
Date: Sat Jul 19 17:13:22 UTC 2014
Modified Files:
src/sys/modules/lua: lua.c
src/sys/sys: lua.h
Log Message:
lua(4): added support for running Lua scripts in intr context
* using kmem_intr on lua_alloc
* using mutex directly on klua_lock
* added ipl arg on klua_newstate()
* added kluaL_newstate function
* fixed synchronization: locking the Lua state on luaioctl
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/modules/lua/lua.c
cvs rdiff -u -r1.3 -r1.4 src/sys/sys/lua.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/lua/lua.c
diff -u src/sys/modules/lua/lua.c:1.8 src/sys/modules/lua/lua.c:1.9
--- src/sys/modules/lua/lua.c:1.8 Sun Mar 16 05:20:30 2014
+++ src/sys/modules/lua/lua.c Sat Jul 19 17:13:22 2014
@@ -1,6 +1,7 @@
-/* $NetBSD: lua.c,v 1.8 2014/03/16 05:20:30 dholland Exp $ */
+/* $NetBSD: lua.c,v 1.9 2014/07/19 17:13:22 lneto Exp $ */
/*
+ * Copyright (c) 2014 by Lourival Vieira Neto .
* Copyright (c) 2011, 2013 by Marc Balmer .
* All rights reserved.
*
@@ -45,6 +46,7 @@
#include
#include
#include
+#include
#include
@@ -330,8 +332,7 @@ luaioctl(dev_t dev, u_long cmd, void *da
return EBUSY;
}
- K = klua_newstate(lua_alloc, NULL, create->name,
- create->desc);
+ K = kluaL_newstate(create->name, create->desc, IPL_NONE);
K->ks_user = true;
if (K == NULL)
@@ -364,7 +365,9 @@ luaioctl(dev_t dev, u_long cmd, void *da
"%s to state %s\n",
m->mod_name,
s->lua_name);
+ klua_lock(s->K);
m->open(s->K->L);
+ klua_unlock(s->K);
m->refcount++;
LIST_INSERT_HEAD(
&s->lua_modules, m,
@@ -419,6 +422,7 @@ luaioctl(dev_t dev, u_long cmd, void *da
ls.off = 0L;
ls.size = va.va_size;
VOP_UNLOCK(nd.ni_vp);
+klua_lock(s->K);
error = lua_load(s->K->L, lua_reader, &ls,
strrchr(load->path, '/') + 1);
vn_close(nd.ni_vp, FREAD, cred);
@@ -429,11 +433,13 @@ luaioctl(dev_t dev, u_long cmd, void *da
if (lua_verbose)
device_printf(sc->sc_dev,
"syntax error\n");
+ klua_unlock(s->K);
return EINVAL;
case LUA_ERRMEM:
if (lua_verbose)
device_printf(sc->sc_dev,
"memory error\n");
+ klua_unlock(s->K);
return ENOMEM;
default:
if (lua_verbose)
@@ -441,6 +447,7 @@ luaioctl(dev_t dev, u_long cmd, void *da
"load error %d: %s\n",
error,
lua_tostring(s->K->L, -1));
+ klua_unlock(s->K);
return EINVAL;
}
if (lua_max_instr > 0)
@@ -453,8 +460,10 @@ luaioctl(dev_t dev, u_long cmd, void *da
"execution error: %s\n",
lua_tostring(s->K->L, -1));
}
+ klua_unlock(s->K);
return EINVAL;
}
+klua_unlock(s->K);
return 0;
}
return ENXIO;
@@ -507,20 +516,38 @@ lua_require(lua_State *L)
return lua_error(L);
}
-void *
+typedef struct {
+ size_t size;
+} __packed alloc_header_t;
+
+static void *
lua_alloc(void *ud, void *ptr, size_t osize, size_t nsize)
{
- void *nptr;
+ void *nptr = NULL;
+
+ const size_t hdr_size = sizeof(alloc_header_t);
+ alloc_header_t *hdr = (alloc_header_t *) ((char *) ptr - hdr_size);
- if (nsize == 0) {
- nptr = NULL;
+ if (nsize == 0) { /* freeing */
if (ptr != NULL)
- kmem_free(ptr, osize);
- } else {
- nptr = kmem_alloc(nsize, KM_SLEEP);
- if (ptr != NULL) {
- memcpy(nptr, ptr, osize < nsize ? osize : nsize);
- kmem_free(ptr, osize);
+ kmem_intr_free(hdr, hdr->size);
+ } else if (ptr != NULL && nsize <= hdr->size - hdr_size) /* shrinking */
+ return ptr; /* don't need to reallocate */
+ else { /* creating or expanding */
+ km_flag_t sleep = cpu_intr_p() || cpu_softintr_p() ?
+ KM_NOSLEEP : KM_SLEEP;
+
+ size_t alloc_size = nsize + hdr_size;
+ alloc_header_t *nhdr = kmem_intr_alloc(alloc_size, sleep);
+ if (nhdr == NULL) /* failed to allocate */
+ return NULL;
+
+ nhdr->size = alloc_size;
+ nptr = (void *) ((char *) nhdr + hdr_size);
+
+ if (ptr != NULL) { /* expanding */
+ memcpy(nptr, ptr, osize);
+ kmem_intr_free(hdr, hdr->size);
}
}
return nptr;
@@ -600,7 +627,8 @@ lua_mod_unregister(const char *name)
}
klua_State *
-klua_newstate(lua_Alloc f, void *ud, const char *name, const char *desc)
+klua_newstate(lua_Alloc f, void *ud, const char *name, const char *desc,
+ int ipl)
{
klua_State *K;
struct lua_state *s;
@@ -641,8 +669,7 @@ klua_newstate(lua_Alloc f, void *ud, con
}
LIST_INSERT_HEAD(&lua_states, s, lua_next);
- mutex_init(&K->ks_lock, MUTEX_DEFAULT, IPL_VM);
- cv_init(&K->ks_inuse_cv, "luainuse");
+ mutex_init(&K->ks_lock, MUTEX_DEFAULT, ipl);
finish:
mutex_enter(&sc->sc_state_lock);
@@ -652,6 +679,12 @@ finish:
return K;
}
+inline klua_State *
+kluaL_newstate(const char *name, const cha
CVS commit: src/external/mit/lua/dist/src
Module Name:src Committed By: lneto Date: Sat Jul 19 17:11:53 UTC 2014 Modified Files: src/external/mit/lua/dist/src: luaconf.h Log Message: lua(4): preventing division by zero * note: we should raise an error instead of return INTMAX_MAX To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/mit/lua/dist/src/luaconf.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/lua/dist/src/luaconf.h diff -u src/external/mit/lua/dist/src/luaconf.h:1.7 src/external/mit/lua/dist/src/luaconf.h:1.8 --- src/external/mit/lua/dist/src/luaconf.h:1.7 Wed Mar 26 22:03:26 2014 +++ src/external/mit/lua/dist/src/luaconf.h Sat Jul 19 17:11:52 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: luaconf.h,v 1.7 2014/03/26 22:03:26 christos Exp $ */ +/* $NetBSD: luaconf.h,v 1.8 2014/07/19 17:11:52 lneto Exp $ */ /* ** Id: luaconf.h,v 1.82.1.7 2008/02/11 16:25:08 roberto Exp $ @@ -553,10 +553,13 @@ */ #if defined(LUA_CORE) #ifdef _KERNEL +/* XXX: we should raise an error instead of return INTMAX_MAX */ +#define luai_numdiv(a,b) ((b) != 0 ? (a)/(b) : INTMAX_MAX) #define luai_nummod(a,b) ((a)%(b)) #define luai_numpow(a,b) luai_nummul(a,b) #else #include +#define luai_numdiv(a,b) ((a)/(b)) #define luai_nummod(a,b) ((a) - floor((a)/(b))*(b)) #define luai_numpow(a,b) (pow(a,b)) #endif @@ -564,7 +567,6 @@ #define luai_numadd(a,b) ((a)+(b)) #define luai_numsub(a,b) ((a)-(b)) #define luai_nummul(a,b) ((a)*(b)) -#define luai_numdiv(a,b) ((a)/(b)) #define luai_numunm(a) (-(a)) #define luai_numeq(a,b) ((a)==(b)) #define luai_numlt(a,b) ((a)<(b))
CVS commit: src/sys/modules/lua
Module Name:src Committed By: lneto Date: Sat Jul 19 17:10:02 UTC 2014 Modified Files: src/sys/modules/lua: errno.h inttypes.h stdarg.h stddef.h stdlib.h Log Message: lua(4): cleaned stubs To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/modules/lua/errno.h \ src/sys/modules/lua/inttypes.h src/sys/modules/lua/stdarg.h \ src/sys/modules/lua/stddef.h src/sys/modules/lua/stdlib.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/modules/lua/errno.h diff -u src/sys/modules/lua/errno.h:1.1 src/sys/modules/lua/errno.h:1.2 --- src/sys/modules/lua/errno.h:1.1 Wed Oct 16 19:44:57 2013 +++ src/sys/modules/lua/errno.h Sat Jul 19 17:10:02 2014 @@ -1,8 +0,0 @@ -/* $NetBSD */ - -/* - * This file is a placeholder only, to allow Lua to be compiled from - * unchanged sources. - */ - -#include Index: src/sys/modules/lua/inttypes.h diff -u src/sys/modules/lua/inttypes.h:1.1 src/sys/modules/lua/inttypes.h:1.2 --- src/sys/modules/lua/inttypes.h:1.1 Wed Oct 16 19:44:57 2013 +++ src/sys/modules/lua/inttypes.h Sat Jul 19 17:10:02 2014 @@ -1,6 +0,0 @@ -/* $NetBSD: inttypes.h,v 1.1 2013/10/16 19:44:57 mbalmer Exp $ */ - -/* - * This file is a placeholder only, to allow Lua to be compiled from - * unchanged sources. - */ Index: src/sys/modules/lua/stdarg.h diff -u src/sys/modules/lua/stdarg.h:1.1 src/sys/modules/lua/stdarg.h:1.2 --- src/sys/modules/lua/stdarg.h:1.1 Wed Oct 16 19:44:57 2013 +++ src/sys/modules/lua/stdarg.h Sat Jul 19 17:10:02 2014 @@ -1,8 +0,0 @@ -/* $NetBSD */ - -/* - * This file is a placeholder only, to allow Lua to be compiled from - * unchanged sources. - */ - -#include Index: src/sys/modules/lua/stddef.h diff -u src/sys/modules/lua/stddef.h:1.1 src/sys/modules/lua/stddef.h:1.2 --- src/sys/modules/lua/stddef.h:1.1 Wed Oct 16 19:44:57 2013 +++ src/sys/modules/lua/stddef.h Sat Jul 19 17:10:02 2014 @@ -6,11 +6,5 @@ */ #include - -#ifdef _BSD_PTRDIFF_T_ -typedef _BSD_PTRDIFF_T_ ptrdiff_t; -#undef _BSD_PTRDIFF_T_ -#endif - #include Index: src/sys/modules/lua/stdlib.h diff -u src/sys/modules/lua/stdlib.h:1.1 src/sys/modules/lua/stdlib.h:1.2 --- src/sys/modules/lua/stdlib.h:1.1 Wed Oct 16 19:44:57 2013 +++ src/sys/modules/lua/stdlib.h Sat Jul 19 17:10:02 2014 @@ -1,7 +1,7 @@ /* $NetBSD */ /* - * Copyright (c) 2011, Lourival Neto . + * Copyright (c) 2011-2014, Lourival Neto . * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -36,11 +36,8 @@ #include #include -#ifndef _LUA_INCLUDE_STDLIB -#define _LUA_INCLUDE_STDLIB - -#define realloc(ptr, nsize) kmem_alloc(nsize, KM_SLEEP) -#define free(ptr) kmem_free(ptr, osize) +#ifndef _LUA_INCLUDE_STDLIB_ +#define _LUA_INCLUDE_STDLIB_ #define exit(EXIT_FAILURE) return
CVS commit: src/sys/modules/luasystm
Module Name:src
Committed By: lneto
Date: Tue Dec 17 00:02:22 UTC 2013
Added Files:
src/sys/modules/luasystm: Makefile luasystm.c test.lua
Log Message:
added luasystm files (for some reason it wasn't done in the last commit)
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/modules/luasystm/Makefile \
src/sys/modules/luasystm/luasystm.c src/sys/modules/luasystm/test.lua
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/modules/luasystm/Makefile
diff -u /dev/null src/sys/modules/luasystm/Makefile:1.1
--- /dev/null Tue Dec 17 00:02:22 2013
+++ src/sys/modules/luasystm/Makefile Tue Dec 17 00:02:22 2013
@@ -0,0 +1,12 @@
+# $NetBSD: Makefile,v 1.1 2013/12/17 00:02:22 lneto Exp $
+
+.include "../Makefile.inc"
+
+KMOD= luasystm
+SRCS= luasystm.c
+
+CPPFLAGS+= -I${S}/../external/mit/lua/dist/src \
+ -I${S}/modules/lua \
+ -I${S}/sys
+
+.include
Index: src/sys/modules/luasystm/luasystm.c
diff -u /dev/null src/sys/modules/luasystm/luasystm.c:1.1
--- /dev/null Tue Dec 17 00:02:22 2013
+++ src/sys/modules/luasystm/luasystm.c Tue Dec 17 00:02:22 2013
@@ -0,0 +1,229 @@
+/* $NetBSD: luasystm.c,v 1.1 2013/12/17 00:02:22 lneto Exp $ */
+
+/*
+ * Copyright (c) 2011, 2013 Marc Balmer .
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ * 3. The name of the Author may not be used to endorse or promote products
+ *derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/* Lua systm module */
+
+#include
+#include
+#include
+#ifdef _MODULE
+#include
+#endif
+#include
+
+#include
+#include
+
+#ifdef _MODULE
+MODULE(MODULE_CLASS_MISC, luasystm, "lua");
+
+/* Various printing functions */
+static int
+print(lua_State *L)
+{
+ const char *s;
+
+ s = lua_tostring(L, -1);
+ if (s)
+ printf("%s", s);
+ return 0;
+}
+
+static int
+print_nolog(lua_State *L)
+{
+ const char *s;
+
+ s = lua_tostring(L, -1);
+ if (s)
+ printf_nolog("%s", s);
+ return 0;
+}
+
+static int
+uprint(lua_State *L)
+{
+ const char *s;
+
+ s = lua_tostring(L, -1);
+ if (s)
+ uprintf("%s", s);
+ return 0;
+}
+
+static int
+systm_aprint_normal(lua_State *L)
+{
+ const char *s;
+
+ s = lua_tostring(L, -1);
+ if (s)
+ aprint_normal("%s", s);
+ return 0;
+}
+
+static int
+systm_aprint_naive(lua_State *L)
+{
+ const char *s;
+
+ s = lua_tostring(L, -1);
+ if (s)
+ aprint_naive("%s", s);
+ return 0;
+}
+
+static int
+systm_aprint_verbose(lua_State *L)
+{
+ const char *s;
+
+ s = lua_tostring(L, -1);
+ if (s)
+ aprint_verbose("%s", s);
+ return 0;
+}
+
+static int
+systm_aprint_debug(lua_State *L)
+{
+ const char *s;
+
+ s = lua_tostring(L, -1);
+ if (s)
+ aprint_debug("%s", s);
+ return 0;
+}
+
+static int
+systm_aprint_error(lua_State *L)
+{
+ const char *s;
+
+ s = lua_tostring(L, -1);
+ if (s)
+ aprint_error("%s", s);
+ return 0;
+}
+
+static int
+systm_aprint_get_error_count(lua_State *L)
+{
+ lua_pushinteger(L, aprint_get_error_count());
+ return 1;
+}
+
+/* panicing */
+
+static int
+systm_panic(lua_State *L)
+{
+ const char *s;
+
+ s = lua_tostring(L, -1);
+ if (s)
+ panic("%s", s);
+ return 0;
+}
+
+/* callouts */
+
+/* mutexes */
+
+static int
+luaopen_systm(void *ls)
+{
+ lua_State *L = (lua_State *)ls;
+ const luaL_Reg systm_lib[ ] = {
+ { "print", print },
+ { "print_nolog", print_nolog },
+ { "uprint", uprint },
+ { "aprint_normal", systm_aprint_normal },
+ { "aprint_naive", systm_aprint_naive },
+ { "aprint_verbose", systm_aprint_verbose },
+ { "aprint_debug", systm_aprint_debug },
+ { "aprint_error", systm_aprint_error },
+ { "aprint_get_error_count", systm_aprint_get_error_count },
+
+ /* pan
CVS commit: src
Module Name:src Committed By: lneto Date: Mon Dec 16 23:54:26 UTC 2013 Modified Files: src/distrib/sets/lists/man: mi src/distrib/sets/lists/modules: md.evbppc mi src/share/man/man9lua: Makefile src/sys/modules: Makefile Added Files: src/share/man/man9lua: systm.9lua Removed Files: src/sys/modules/luacore: Makefile luacore.c test.lua Log Message: renamed luacore to luasystm To generate a diff of this commit: cvs rdiff -u -r1.1450 -r1.1451 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.37 -r1.38 src/distrib/sets/lists/modules/md.evbppc cvs rdiff -u -r1.59 -r1.60 src/distrib/sets/lists/modules/mi cvs rdiff -u -r1.3 -r1.4 src/share/man/man9lua/Makefile cvs rdiff -u -r0 -r1.1 src/share/man/man9lua/systm.9lua cvs rdiff -u -r1.127 -r1.128 src/sys/modules/Makefile cvs rdiff -u -r1.1 -r0 src/sys/modules/luacore/Makefile \ src/sys/modules/luacore/test.lua cvs rdiff -u -r1.5 -r0 src/sys/modules/luacore/luacore.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1450 src/distrib/sets/lists/man/mi:1.1451 --- src/distrib/sets/lists/man/mi:1.1450 Wed Nov 13 20:55:08 2013 +++ src/distrib/sets/lists/man/mi Mon Dec 16 23:54:26 2013 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1450 2013/11/13 20:55:08 mbalmer Exp $ +# $NetBSD: mi,v 1.1451 2013/12/16 23:54:26 lneto Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -3119,9 +3119,9 @@ ./usr/share/man/cat8/zpool.0 man-zfs-catman zfs,.cat ./usr/share/man/cat8/zzz.0 man-sysutil-catman .cat ./usr/share/man/cat9/boot.0 man-obsolete obsolete -./usr/share/man/cat9lua/core.0 man-sys-catman .cat ./usr/share/man/cat9lua/intro.0 man-sys-catman .cat ./usr/share/man/cat9lua/pmf.0 man-sys-catman .cat +./usr/share/man/cat9lua/systm.0 man-sys-catman .cat ./usr/share/man/html1/Mail.html man-mail-htmlman html ./usr/share/man/html1/[.html man-util-htmlman html ./usr/share/man/html1/agrep.html man-util-htmlman html @@ -5808,9 +5808,9 @@ ./usr/share/man/html8/zic.html man-sysutil-htmlman html ./usr/share/man/html8/zpool.html man-zfs-htmlman zfs,html ./usr/share/man/html8/zzz.html man-sysutil-htmlman html -./usr/share/man/html9lua/core.html man-sys-htmlman html ./usr/share/man/html9lua/intro.html man-sys-htmlman html ./usr/share/man/html9lua/pmf.html man-sys-htmlman html +./usr/share/man/html9lua/systm.html man-sys-htmlman html ./usr/share/man/man1/Mail.1 man-mail-man .man ./usr/share/man/man1/[.1 man-util-man .man ./usr/share/man/man1/agrep.1 man-util-man .man @@ -8886,7 +8886,7 @@ ./usr/share/man/man8/zpool.8 man-zfs-man zfs,.man ./usr/share/man/man8/zzz.8 man-sysutil-man .man ./usr/share/man/man9/boot.9 man-obsolete obsolete -./usr/share/man/man9lua/core.9lua man-sys-man .man ./usr/share/man/man9lua/intro.9lua man-sys-man .man ./usr/share/man/man9lua/pmf.9lua man-sys-man .man +./usr/share/man/man9lua/systm.9lua man-sys-man .man ./usr/share/man/style.css man-mdocml-htmlman html Index: src/distrib/sets/lists/modules/md.evbppc diff -u src/distrib/sets/lists/modules/md.evbppc:1.37 src/distrib/sets/lists/modules/md.evbppc:1.38 --- src/distrib/sets/lists/modules/md.evbppc:1.37 Tue Nov 19 12:07:06 2013 +++ src/distrib/sets/lists/modules/md.evbppc Mon Dec 16 23:54:26 2013 @@ -1,4 +1,4 @@ -# $NetBSD: md.evbppc,v 1.37 2013/11/19 12:07:06 kiyohara Exp $ +# $NetBSD: md.evbppc,v 1.38 2013/12/16 23:54:26 lneto Exp $ ./stand/powerpc-4xx base-kernel-modules kmod,compatmodules ./stand/powerpc-4xx/@OSRELEASE@ base-kernel-modules kmod,compatmodules ./stand/powerpc-4xx/@OSRELEASE@/modules base-kernel-modules kmod,compatmodules @@ -96,10 +96,10 @@ ./stand/powerpc-4xx/@OSRELEASE@/modules/lfs/lfs.kmod base-kernel-modules kmod,compatmodules ./stand/powerpc-4xx/@OSRELEASE@/modules/luabase-kernel-modules kmod,compatmodules ./stand/powerpc-4xx/@OSRELEASE@/modules/lua/lua.kmod base-kernel-modules kmod,compatmodules -./stand/powerpc-4xx/@OSRELEASE@/modules/luacorebase-kernel-modules kmod,compatmodules -./stand/powerpc-4xx/@OSRELEASE@/modules/luacore/luacore.kmod base-kernel-modules kmod,compatmodules ./stand/powerpc-4xx/@OSRELEASE@/modules/luapmfbase-kernel-modules kmod,compatmodules ./stand/powerpc-4xx/@OSRELEASE@/modules/luapmf/luapmf.kmod base-kernel-modules kmod,compatmodules +./stand/powerpc-4xx/@OSRELEASE@/modules/luasystm base-kernel-modules kmod,compatmodules +./stand/powerpc-4xx/@OSRELEASE@/modules/luasystm/luasystm.kmod base-kernel-modules kmod,compatmodules ./stand/powerpc-4xx/@OSRELEASE@/modules/mfsbase-kernel-modules kmod,compatmodules ./stand/powerpc-4xx/@OSRELEASE@/modules/mfs/mfs.kmod base-kernel-modules kmod,compatmodules ./stand/powerpc-4xx/@OSRELEASE@/modules/miiverbose base-kernel-modules kmod,compatmodules
CVS commit: src/sys/modules/luapmf
Module Name:src
Committed By: lneto
Date: Mon Dec 16 23:35:49 UTC 2013
Modified Files:
src/sys/modules/luapmf: Makefile luapmf.c
Log Message:
using luaL_register() in luapmf
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/luapmf/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/modules/luapmf/luapmf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/luapmf/Makefile
diff -u src/sys/modules/luapmf/Makefile:1.1 src/sys/modules/luapmf/Makefile:1.2
--- src/sys/modules/luapmf/Makefile:1.1 Mon Oct 28 20:06:05 2013
+++ src/sys/modules/luapmf/Makefile Mon Dec 16 23:35:48 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/10/28 20:06:05 mbalmer Exp $
+# $NetBSD: Makefile,v 1.2 2013/12/16 23:35:48 lneto Exp $
.include "../Makefile.inc"
@@ -6,6 +6,7 @@ KMOD= luapmf
SRCS= luapmf.c
CPPFLAGS+= -I${S}/../external/mit/lua/dist/src \
- -I${S}/modules/lua
+ -I${S}/modules/lua \
+ -I${S}/sys
.include
Index: src/sys/modules/luapmf/luapmf.c
diff -u src/sys/modules/luapmf/luapmf.c:1.2 src/sys/modules/luapmf/luapmf.c:1.3
--- src/sys/modules/luapmf/luapmf.c:1.2 Tue Oct 29 09:18:45 2013
+++ src/sys/modules/luapmf/luapmf.c Mon Dec 16 23:35:48 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: luapmf.c,v 1.2 2013/10/29 09:18:45 mbalmer Exp $ */
+/* $NetBSD: luapmf.c,v 1.3 2013/12/16 23:35:48 lneto Exp $ */
/*
* Copyright (c) 2011, 2013 Marc Balmer .
@@ -39,6 +39,7 @@
#include
#include
+#include
#ifdef _MODULE
MODULE(MODULE_CLASS_MISC, luapmf, "lua");
@@ -80,29 +81,18 @@ get_platform(lua_State *L)
}
-struct pmf_reg {
- const char *n;
- int (*f)(lua_State *);
-};
-
static int
luaopen_pmf(void *ls)
{
lua_State *L = (lua_State *)ls;
- int n, nfunc;
- struct pmf_reg pmf[] = {
+ const luaL_Reg pmf_lib[ ] = {
{ "system_shutdown", system_shutdown },
{ "set_platform", set_platform },
- { "get_platform", get_platform }
+ { "get_platform", get_platform },
+ { NULL, NULL }
};
- nfunc = sizeof(pmf)/sizeof(pmf[1]);
-
- lua_createtable(L, nfunc, 0);
- for (n = 0; n < nfunc; n++) {
- lua_pushcfunction(L, pmf[n].f);
- lua_setfield(L, -2, pmf[n].n);
- }
+ luaL_register(L, "pmf", pmf_lib);
/* some integer values */
lua_pushinteger(L, PMFE_DISPLAY_ON);
@@ -152,7 +142,6 @@ luaopen_pmf(void *ls)
lua_pushinteger(L, RB_USERCONF);
lua_setfield(L, -2, "RB_USERCONF");
- lua_setglobal(L, "pmf");
return 1;
}
CVS commit: src/external/mit/lua/dist/src
Module Name:src
Committed By: lneto
Date: Mon Dec 16 23:25:56 UTC 2013
Modified Files:
src/external/mit/lua/dist/src: lstrlib.c luaconf.h
Log Message:
changed lua_Number and lua_Integer to intmax_t in lua(4)
*
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/lua/dist/src/lstrlib.c
cvs rdiff -u -r1.5 -r1.6 src/external/mit/lua/dist/src/luaconf.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/lua/dist/src/lstrlib.c
diff -u src/external/mit/lua/dist/src/lstrlib.c:1.2 src/external/mit/lua/dist/src/lstrlib.c:1.3
--- src/external/mit/lua/dist/src/lstrlib.c:1.2 Mon Dec 2 23:06:35 2013
+++ src/external/mit/lua/dist/src/lstrlib.c Mon Dec 16 23:25:56 2013
@@ -1,7 +1,7 @@
-/* $NetBSD: lstrlib.c,v 1.2 2013/12/02 23:06:35 lneto Exp $ */
+/* $NetBSD: lstrlib.c,v 1.3 2013/12/16 23:25:56 lneto Exp $ */
/*
-** $Id: lstrlib.c,v 1.2 2013/12/02 23:06:35 lneto Exp $
+** $Id: lstrlib.c,v 1.3 2013/12/16 23:25:56 lneto Exp $
** Standard library for string operations and pattern-matching
** See Copyright Notice in lua.h
*/
@@ -786,7 +786,11 @@ static int str_format (lua_State *L) {
}
case 'o': case 'u': case 'x': case 'X': {
addintlen(form);
+#ifndef _KERNEL
sprintf(buff, form, (unsigned LUA_INTFRM_T)luaL_checknumber(L, arg));
+#else
+ sprintf(buff, form, (LUA_UINTFRM_T)luaL_checknumber(L, arg));
+#endif
break;
}
#ifndef _KERNEL
Index: src/external/mit/lua/dist/src/luaconf.h
diff -u src/external/mit/lua/dist/src/luaconf.h:1.5 src/external/mit/lua/dist/src/luaconf.h:1.6
--- src/external/mit/lua/dist/src/luaconf.h:1.5 Mon Dec 2 06:07:22 2013
+++ src/external/mit/lua/dist/src/luaconf.h Mon Dec 16 23:25:56 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: luaconf.h,v 1.5 2013/12/02 06:07:22 lneto Exp $ */
+/* $NetBSD: luaconf.h,v 1.6 2013/12/16 23:25:56 lneto Exp $ */
/*
** Id: luaconf.h,v 1.82.1.7 2008/02/11 16:25:08 roberto Exp $
@@ -149,7 +149,11 @@
** CHANGE that if ptrdiff_t is not adequate on your machine. (On most
** machines, ptrdiff_t gives a good choice between int or long.)
*/
+#ifdef _KERNEL
+#define LUA_INTEGER LUA_NUMBER
+#else
#define LUA_INTEGER ptrdiff_t
+#endif
/*
@@ -511,7 +515,8 @@
*/
#ifdef _KERNEL
-#define LUA_NUMBER int64_t
+#include
+#define LUA_NUMBER intmax_t
#else
#define LUA_NUMBER_DOUBLE
#define LUA_NUMBER double
@@ -531,9 +536,9 @@
@@ lua_str2number converts a string to a number.
*/
#ifdef _KERNEL
-#define LUA_NUMBER_SCAN "%" SCNd64
-#define LUA_NUMBER_FMT "%" PRId64
-#define lua_str2number(s,p) ((int64_t) strtoimax((s), (p), 10))
+#define LUA_NUMBER_SCAN "%jd"
+#define LUA_NUMBER_FMT "%jd"
+#define lua_str2number(s,p) strtoimax((s), (p), 10)
#else
#define LUA_NUMBER_SCAN "%lf"
#define LUA_NUMBER_FMT "%.14g"
@@ -766,7 +771,13 @@ union luai_Cast { double l_d; long l_l;
** CHANGE them if your system supports long long or does not support long.
*/
-#if defined(LUA_USELONGLONG)
+#ifdef _KERNEL
+
+#define LUA_INTFRMLEN "j"
+#define LUA_INTFRM_T intmax_t
+#define LUA_UINTFRM_T uintmax_t
+
+#elif defined(LUA_USELONGLONG)
#define LUA_INTFRMLEN "ll"
#define LUA_INTFRM_T long long
CVS commit: src/sys/modules/lua
Module Name:src
Committed By: lneto
Date: Wed Dec 4 02:12:01 UTC 2013
Modified Files:
src/sys/modules/lua: lua.c
Log Message:
fixed lua(4) alloc (nsize can be lesser than osize)
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/modules/lua/lua.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/lua/lua.c
diff -u src/sys/modules/lua/lua.c:1.5 src/sys/modules/lua/lua.c:1.6
--- src/sys/modules/lua/lua.c:1.5 Sat Nov 23 15:53:37 2013
+++ src/sys/modules/lua/lua.c Wed Dec 4 02:12:01 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: lua.c,v 1.5 2013/11/23 15:53:37 mbalmer Exp $ */
+/* $NetBSD: lua.c,v 1.6 2013/12/04 02:12:01 lneto Exp $ */
/*
* Copyright (c) 2011, 2013 by Marc Balmer .
@@ -515,7 +515,7 @@ lua_alloc(void *ud, void *ptr, size_t os
} else {
nptr = kmem_alloc(nsize, KM_SLEEP);
if (ptr != NULL) {
- memcpy(nptr, ptr, osize);
+ memcpy(nptr, ptr, osize < nsize ? osize : nsize);
kmem_free(ptr, osize);
}
}
CVS commit: src/external/mit/lua/dist/src
Module Name:src
Committed By: lneto
Date: Mon Dec 2 23:06:35 UTC 2013
Modified Files:
src/external/mit/lua/dist/src: lstrlib.c
Log Message:
fixed lua(4) build (added _KERNEL guard into lstrlib.c to avoid double usage)
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/mit/lua/dist/src/lstrlib.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/lua/dist/src/lstrlib.c
diff -u src/external/mit/lua/dist/src/lstrlib.c:1.1.1.2 src/external/mit/lua/dist/src/lstrlib.c:1.2
--- src/external/mit/lua/dist/src/lstrlib.c:1.1.1.2 Thu Mar 15 00:08:12 2012
+++ src/external/mit/lua/dist/src/lstrlib.c Mon Dec 2 23:06:35 2013
@@ -1,7 +1,7 @@
-/* $NetBSD: lstrlib.c,v 1.1.1.2 2012/03/15 00:08:12 alnsn Exp $ */
+/* $NetBSD: lstrlib.c,v 1.2 2013/12/02 23:06:35 lneto Exp $ */
/*
-** $Id: lstrlib.c,v 1.1.1.2 2012/03/15 00:08:12 alnsn Exp $
+** $Id: lstrlib.c,v 1.2 2013/12/02 23:06:35 lneto Exp $
** Standard library for string operations and pattern-matching
** See Copyright Notice in lua.h
*/
@@ -789,11 +789,13 @@ static int str_format (lua_State *L) {
sprintf(buff, form, (unsigned LUA_INTFRM_T)luaL_checknumber(L, arg));
break;
}
+#ifndef _KERNEL
case 'e': case 'E': case 'f':
case 'g': case 'G': {
sprintf(buff, form, (double)luaL_checknumber(L, arg));
break;
}
+#endif
case 'q': {
addquoted(L, &b, arg);
continue; /* skip the 'addsize' at the end */
CVS commit: src
Module Name:src
Committed By: lneto
Date: Mon Dec 2 06:07:22 UTC 2013
Modified Files:
src/external/mit/lua/dist/src: luaconf.h
src/sys/modules/lua: Makefile
Removed Files:
src/sys/modules/lua: luaconf.h
Log Message:
merged luaconf.h of kernel and userspace Lua
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/lua/dist/src/luaconf.h
cvs rdiff -u -r1.4 -r1.5 src/sys/modules/lua/Makefile
cvs rdiff -u -r1.2 -r0 src/sys/modules/lua/luaconf.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/lua/dist/src/luaconf.h
diff -u src/external/mit/lua/dist/src/luaconf.h:1.4 src/external/mit/lua/dist/src/luaconf.h:1.5
--- src/external/mit/lua/dist/src/luaconf.h:1.4 Thu Mar 15 01:02:19 2012
+++ src/external/mit/lua/dist/src/luaconf.h Mon Dec 2 06:07:22 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: luaconf.h,v 1.4 2012/03/15 01:02:19 alnsn Exp $ */
+/* $NetBSD: luaconf.h,v 1.5 2013/12/02 06:07:22 lneto Exp $ */
/*
** Id: luaconf.h,v 1.82.1.7 2008/02/11 16:25:08 roberto Exp $
@@ -510,15 +510,18 @@
** ===
*/
+#ifdef _KERNEL
+#define LUA_NUMBER int64_t
+#else
#define LUA_NUMBER_DOUBLE
#define LUA_NUMBER double
+#endif
/*
@@ LUAI_UACNUMBER is the result of an 'usual argument conversion'
@* over a number.
*/
-#define LUAI_UACNUMBER double
-
+#define LUAI_UACNUMBER LUA_NUMBER
/*
@@ LUA_NUMBER_SCAN is the format for reading numbers.
@@ -527,24 +530,36 @@
@@ LUAI_MAXNUMBER2STR is maximum size of previous conversion.
@@ lua_str2number converts a string to a number.
*/
+#ifdef _KERNEL
+#define LUA_NUMBER_SCAN "%" SCNd64
+#define LUA_NUMBER_FMT "%" PRId64
+#define lua_str2number(s,p) ((int64_t) strtoimax((s), (p), 10))
+#else
#define LUA_NUMBER_SCAN "%lf"
#define LUA_NUMBER_FMT "%.14g"
-#define lua_number2str(s,n) sprintf((s), LUA_NUMBER_FMT, (n))
-#define LUAI_MAXNUMBER2STR 32 /* 16 digits, sign, point, and \0 */
#define lua_str2number(s,p) strtod((s), (p))
+#endif
+#define lua_number2str(s,n) sprintf((s), LUA_NUMBER_FMT, (n))
+#define LUAI_MAXNUMBER2STR 32 /* 16 digits, sign, point, and \0 */
/*
@@ The luai_num* macros define the primitive operations over numbers.
*/
#if defined(LUA_CORE)
+#ifdef _KERNEL
+#define luai_nummod(a,b) ((a)%(b))
+#define luai_numpow(a,b) luai_nummul(a,b)
+#else
#include
+#define luai_nummod(a,b) ((a) - floor((a)/(b))*(b))
+#define luai_numpow(a,b) (pow(a,b))
+#endif
+
#define luai_numadd(a,b) ((a)+(b))
#define luai_numsub(a,b) ((a)-(b))
#define luai_nummul(a,b) ((a)*(b))
#define luai_numdiv(a,b) ((a)/(b))
-#define luai_nummod(a,b) ((a) - floor((a)/(b))*(b))
-#define luai_numpow(a,b) (pow(a,b))
#define luai_numunm(a) (-(a))
#define luai_numeq(a,b) ((a)==(b))
#define luai_numlt(a,b) ((a)<(b))
@@ -612,7 +627,13 @@ union luai_Cast { double l_d; long l_l;
** compiling as C++ code, with _longjmp/_setjmp when asked to use them,
** and with longjmp/setjmp otherwise.
*/
-#if defined(__cplusplus)
+#ifdef _KERNEL
+/* in NetBSD kernel */
+#define LUAI_THROW(L,c) longjmp(& ((c)->b))
+#define LUAI_TRY(L,c,a) if (setjmp(& ((c)->b)) == 0) { a }
+#define luai_jmpbuf label_t
+
+#elif defined(__cplusplus)
/* C++ exceptions */
#define LUAI_THROW(L,c) throw(c)
#define LUAI_TRY(L,c,a) try { a } catch(...) \
Index: src/sys/modules/lua/Makefile
diff -u src/sys/modules/lua/Makefile:1.4 src/sys/modules/lua/Makefile:1.5
--- src/sys/modules/lua/Makefile:1.4 Mon Dec 2 04:57:41 2013
+++ src/sys/modules/lua/Makefile Mon Dec 2 06:07:22 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2013/12/02 04:57:41 lneto Exp $
+# $NetBSD: Makefile,v 1.5 2013/12/02 06:07:22 lneto Exp $
.include "../Makefile.inc"
@@ -46,8 +46,6 @@ SRCS+= strcspn.c \
strpbrk.c \
strspn.c
-CFLAGS+= -include ${.CURDIR}/luaconf.h
-
CPPFLAGS+= -I${S}/../external/mit/lua/dist/src \
-I${S}/sys
CVS commit: src/sys/modules/luacore
Module Name:src
Committed By: lneto
Date: Mon Dec 2 05:06:32 UTC 2013
Modified Files:
src/sys/modules/luacore: luacore.c
Log Message:
using Lua auxlib in luacore module
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/modules/luacore/luacore.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/luacore/luacore.c
diff -u src/sys/modules/luacore/luacore.c:1.4 src/sys/modules/luacore/luacore.c:1.5
--- src/sys/modules/luacore/luacore.c:1.4 Wed Oct 23 18:57:40 2013
+++ src/sys/modules/luacore/luacore.c Mon Dec 2 05:06:32 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: luacore.c,v 1.4 2013/10/23 18:57:40 mbalmer Exp $ */
+/* $NetBSD: luacore.c,v 1.5 2013/12/02 05:06:32 lneto Exp $ */
/*
* Copyright (c) 2011, 2013 Marc Balmer .
@@ -39,6 +39,7 @@
#include
#include
+#include
#ifdef _MODULE
MODULE(MODULE_CLASS_MISC, luacore, "lua");
@@ -156,43 +157,34 @@ core_panic(lua_State *L)
/* mutexes */
-struct core_reg {
- const char *n;
- int (*f)(lua_State *);
+static const luaL_Reg core_lib[ ] = {
+ { "print", print },
+ { "print_nolog", print_nolog },
+ { "uprint", uprint },
+ { "aprint_normal", core_aprint_normal },
+ { "aprint_naive", core_aprint_naive },
+ { "aprint_verbose", core_aprint_verbose },
+ { "aprint_debug", core_aprint_debug },
+ { "aprint_error", core_aprint_error },
+ { "aprint_get_error_count", core_aprint_get_error_count },
+
+ /* panicing */
+ { "panic", core_panic },
+
+ /* callouts */
+
+ /* mutexes */
+
+ {NULL, NULL}
};
+
static int
luaopen_core(void *ls)
{
lua_State *L = (lua_State *)ls;
- int n, nfunc;
- struct core_reg core[] = {
- /* printing functions */
- { "print", print },
- { "print_nolog", print_nolog },
- { "uprint", uprint },
- { "aprint_normal", core_aprint_normal },
- { "aprint_naive", core_aprint_naive },
- { "aprint_verbose", core_aprint_verbose },
- { "aprint_debug", core_aprint_debug },
- { "aprint_error", core_aprint_error },
- { "aprint_get_error_count", core_aprint_get_error_count },
-
- /* panicing */
- { "panic", core_panic },
-
- /* callouts */
-
- /* mutexes */
- };
-
- nfunc = sizeof(core)/sizeof(core[1]);
-
- lua_createtable(L, nfunc, 0);
- for (n = 0; n < nfunc; n++) {
- lua_pushcfunction(L, core[n].f);
- lua_setfield(L, -2, core[n].n);
- }
+
+ luaL_register(L, "core", core_lib);
/* some string values */
lua_pushstring(L, copyright);
@@ -216,7 +208,6 @@ luaopen_core(void *ls)
lua_pushinteger(L, ncpu);
lua_setfield(L, -2, "ncpu");
- lua_setglobal(L, "core");
return 1;
}
CVS commit: src
Module Name:src
Committed By: lneto
Date: Mon Dec 2 04:57:41 UTC 2013
Modified Files:
src/external/mit/lua/dist/src: lauxlib.c lbaselib.c linit.c
src/sys/modules/lua: Makefile
Log Message:
put Lua auxlib and some stdlibs in lua(4)
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/mit/lua/dist/src/lauxlib.c \
src/external/mit/lua/dist/src/lbaselib.c \
src/external/mit/lua/dist/src/linit.c
cvs rdiff -u -r1.3 -r1.4 src/sys/modules/lua/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/lua/dist/src/lauxlib.c
diff -u src/external/mit/lua/dist/src/lauxlib.c:1.1.1.2 src/external/mit/lua/dist/src/lauxlib.c:1.2
--- src/external/mit/lua/dist/src/lauxlib.c:1.1.1.2 Thu Mar 15 00:08:09 2012
+++ src/external/mit/lua/dist/src/lauxlib.c Mon Dec 2 04:57:41 2013
@@ -1,7 +1,7 @@
-/* $NetBSD: lauxlib.c,v 1.1.1.2 2012/03/15 00:08:09 alnsn Exp $ */
+/* $NetBSD: lauxlib.c,v 1.2 2013/12/02 04:57:41 lneto Exp $ */
/*
-** $Id: lauxlib.c,v 1.1.1.2 2012/03/15 00:08:09 alnsn Exp $
+** $Id: lauxlib.c,v 1.2 2013/12/02 04:57:41 lneto Exp $
** Auxiliary functions for building Lua libraries
** See Copyright Notice in lua.h
*/
@@ -521,6 +521,7 @@ LUALIB_API void luaL_unref (lua_State *L
** ===
*/
+#ifndef _KERNEL
typedef struct LoadF {
int extraline;
FILE *f;
@@ -590,6 +591,7 @@ LUALIB_API int luaL_loadfile (lua_State
lua_remove(L, fnameindex);
return status;
}
+#endif
typedef struct LoadS {
@@ -626,6 +628,7 @@ LUALIB_API int (luaL_loadstring) (lua_St
/* }== */
+#ifndef _KERNEL
static void *l_alloc (void *ud, void *ptr, size_t osize, size_t nsize) {
(void)ud;
(void)osize;
@@ -651,4 +654,5 @@ LUALIB_API lua_State *luaL_newstate (voi
if (L) lua_atpanic(L, &panic);
return L;
}
+#endif
Index: src/external/mit/lua/dist/src/lbaselib.c
diff -u src/external/mit/lua/dist/src/lbaselib.c:1.1.1.2 src/external/mit/lua/dist/src/lbaselib.c:1.2
--- src/external/mit/lua/dist/src/lbaselib.c:1.1.1.2 Thu Mar 15 00:08:06 2012
+++ src/external/mit/lua/dist/src/lbaselib.c Mon Dec 2 04:57:41 2013
@@ -1,7 +1,7 @@
-/* $NetBSD: lbaselib.c,v 1.1.1.2 2012/03/15 00:08:06 alnsn Exp $ */
+/* $NetBSD: lbaselib.c,v 1.2 2013/12/02 04:57:41 lneto Exp $ */
/*
-** $Id: lbaselib.c,v 1.1.1.2 2012/03/15 00:08:06 alnsn Exp $
+** $Id: lbaselib.c,v 1.2 2013/12/02 04:57:41 lneto Exp $
** Basic library
** See Copyright Notice in lua.h
*/
@@ -284,10 +284,12 @@ static int luaB_loadstring (lua_State *L
}
+#ifndef _KERNEL
static int luaB_loadfile (lua_State *L) {
const char *fname = luaL_optstring(L, 1, NULL);
return load_aux(L, luaL_loadfile(L, fname));
}
+#endif
/*
@@ -324,6 +326,7 @@ static int luaB_load (lua_State *L) {
}
+#ifndef _KERNEL
static int luaB_dofile (lua_State *L) {
const char *fname = luaL_optstring(L, 1, NULL);
int n = lua_gettop(L);
@@ -331,6 +334,7 @@ static int luaB_dofile (lua_State *L) {
lua_call(L, 0, LUA_MULTRET);
return lua_gettop(L) - n;
}
+#endif
static int luaB_assert (lua_State *L) {
@@ -449,12 +453,16 @@ static int luaB_newproxy (lua_State *L)
static const luaL_Reg base_funcs[] = {
{"assert", luaB_assert},
{"collectgarbage", luaB_collectgarbage},
+#ifndef _KERNEL
{"dofile", luaB_dofile},
+#endif
{"error", luaB_error},
{"gcinfo", luaB_gcinfo},
{"getfenv", luaB_getfenv},
{"getmetatable", luaB_getmetatable},
+#ifndef _KERNEL
{"loadfile", luaB_loadfile},
+#endif
{"load", luaB_load},
{"loadstring", luaB_loadstring},
{"next", luaB_next},
Index: src/external/mit/lua/dist/src/linit.c
diff -u src/external/mit/lua/dist/src/linit.c:1.1.1.2 src/external/mit/lua/dist/src/linit.c:1.2
--- src/external/mit/lua/dist/src/linit.c:1.1.1.2 Thu Mar 15 00:08:04 2012
+++ src/external/mit/lua/dist/src/linit.c Mon Dec 2 04:57:41 2013
@@ -1,7 +1,7 @@
-/* $NetBSD: linit.c,v 1.1.1.2 2012/03/15 00:08:04 alnsn Exp $ */
+/* $NetBSD: linit.c,v 1.2 2013/12/02 04:57:41 lneto Exp $ */
/*
-** $Id: linit.c,v 1.1.1.2 2012/03/15 00:08:04 alnsn Exp $
+** $Id: linit.c,v 1.2 2013/12/02 04:57:41 lneto Exp $
** Initialization of libraries for lua.c
** See Copyright Notice in lua.h
*/
@@ -18,13 +18,19 @@
static const luaL_Reg lualibs[] = {
{"", luaopen_base},
+#ifndef _KERNEL
{LUA_LOADLIBNAME, luaopen_package},
+#endif
{LUA_TABLIBNAME, luaopen_table},
+#ifndef _KERNEL
{LUA_IOLIBNAME, luaopen_io},
{LUA_OSLIBNAME, luaopen_os},
+#endif
{LUA_STRLIBNAME, luaopen_string},
+#ifndef _KERNEL
{LUA_MATHLIBNAME, luaopen_math},
{LUA_DBLIBNAME, luaopen_debug},
+#endif
{NULL, NULL}
};
Index: src/sys/modules/lua/Makefile
diff -u src/sys/modules/lua/Makefile:1.3 src/sys/modules/lua/Makefile:1.4
--- src/sys/modules/lua/Makefile:1.3 Mon Dec 2 04:39:10 2013
+++ src/s
CVS commit: src
Module Name:src
Committed By: lneto
Date: Mon Dec 2 04:39:10 UTC 2013
Modified Files:
src/lib/libc/stdlib: Makefile.inc
src/sys/lib/libkern: Makefile.libkern libkern.h
src/sys/modules/lua: Makefile luaconf.h
Added Files:
src/common/lib/libc/stdlib: strtoimax.c
Removed Files:
src/lib/libc/stdlib: strtoimax.c
Log Message:
changed lua_Number to int64_t
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/common/lib/libc/stdlib/strtoimax.c
cvs rdiff -u -r1.79 -r1.80 src/lib/libc/stdlib/Makefile.inc
cvs rdiff -u -r1.8 -r0 src/lib/libc/stdlib/strtoimax.c
cvs rdiff -u -r1.26 -r1.27 src/sys/lib/libkern/Makefile.libkern
cvs rdiff -u -r1.108 -r1.109 src/sys/lib/libkern/libkern.h
cvs rdiff -u -r1.2 -r1.3 src/sys/modules/lua/Makefile
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/lua/luaconf.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/stdlib/Makefile.inc
diff -u src/lib/libc/stdlib/Makefile.inc:1.79 src/lib/libc/stdlib/Makefile.inc:1.80
--- src/lib/libc/stdlib/Makefile.inc:1.79 Fri Apr 26 18:29:55 2013
+++ src/lib/libc/stdlib/Makefile.inc Mon Dec 2 04:39:10 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.79 2013/04/26 18:29:55 christos Exp $
+# $NetBSD: Makefile.inc,v 1.80 2013/12/02 04:39:10 lneto Exp $
# from: @(#)Makefile.inc 8.3 (Berkeley) 2/4/95
# stdlib sources
@@ -30,7 +30,6 @@ SRCS+= jemalloc.c
SRCS+= malloc.c
.endif
-CPPFLAGS.strtoimax.c+= -I${LIBCDIR}/../../common/lib/libc/stdlib
CPPFLAGS.strtol.c+= -I${LIBCDIR}/../../common/lib/libc/stdlib
CPPFLAGS.strtoq.c+= -I${LIBCDIR}/../../common/lib/libc/stdlib
CPPFLAGS.strtouq.c+= -I${LIBCDIR}/../../common/lib/libc/stdlib
Index: src/sys/lib/libkern/Makefile.libkern
diff -u src/sys/lib/libkern/Makefile.libkern:1.26 src/sys/lib/libkern/Makefile.libkern:1.27
--- src/sys/lib/libkern/Makefile.libkern:1.26 Tue Jul 23 14:52:07 2013
+++ src/sys/lib/libkern/Makefile.libkern Mon Dec 2 04:39:10 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.libkern,v 1.26 2013/07/23 14:52:07 skrll Exp $
+# $NetBSD: Makefile.libkern,v 1.27 2013/12/02 04:39:10 lneto Exp $
#
# Variable definitions for libkern.
@@ -80,7 +80,7 @@ SRCS+= memset.c
.endif
SRCS+= popcount32.c popcount64.c
-SRCS+= strtoul.c strtoll.c strtoull.c strtoumax.c
+SRCS+= strtoul.c strtoll.c strtoull.c strtoimax.c strtoumax.c
SRCS+= scanc.c skpc.c
SRCS+= random.c
Index: src/sys/lib/libkern/libkern.h
diff -u src/sys/lib/libkern/libkern.h:1.108 src/sys/lib/libkern/libkern.h:1.109
--- src/sys/lib/libkern/libkern.h:1.108 Wed Aug 28 16:20:38 2013
+++ src/sys/lib/libkern/libkern.h Mon Dec 2 04:39:10 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: libkern.h,v 1.108 2013/08/28 16:20:38 riastradh Exp $ */
+/* $NetBSD: libkern.h,v 1.109 2013/12/02 04:39:10 lneto Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -334,6 +334,7 @@ int strncasecmp(const char *, const cha
u_long strtoul(const char *, char **, int);
long long strtoll(const char *, char **, int);
unsigned long long strtoull(const char *, char **, int);
+intmax_t strtoimax(const char *, char **, int);
uintmax_t strtoumax(const char *, char **, int);
int snprintb(char *, size_t, const char *, uint64_t);
int snprintb_m(char *, size_t, const char *, uint64_t, size_t);
Index: src/sys/modules/lua/Makefile
diff -u src/sys/modules/lua/Makefile:1.2 src/sys/modules/lua/Makefile:1.3
--- src/sys/modules/lua/Makefile:1.2 Thu Oct 31 16:50:14 2013
+++ src/sys/modules/lua/Makefile Mon Dec 2 04:39:10 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2013/10/31 16:50:14 mbalmer Exp $
+# $NetBSD: Makefile,v 1.3 2013/12/02 04:39:10 lneto Exp $
.include "../Makefile.inc"
@@ -44,6 +44,7 @@ SRCS+= strcspn.c \
CFLAGS+= -include ${.CURDIR}/luaconf.h
-CPPFLAGS+= -I${S}/../external/mit/lua/dist/src
+CPPFLAGS+= -I${S}/../external/mit/lua/dist/src \
+ -I${S}/sys
.include
Index: src/sys/modules/lua/luaconf.h
diff -u src/sys/modules/lua/luaconf.h:1.1 src/sys/modules/lua/luaconf.h:1.2
--- src/sys/modules/lua/luaconf.h:1.1 Wed Oct 16 19:44:57 2013
+++ src/sys/modules/lua/luaconf.h Mon Dec 2 04:39:10 2013
@@ -1,5 +1,5 @@
/*
-** $Id: luaconf.h,v 1.1 2013/10/16 19:44:57 mbalmer Exp $
+** $Id: luaconf.h,v 1.2 2013/12/02 04:39:10 lneto Exp $
** Configuration file for Lua
** See Copyright Notice in lua.h
*/
@@ -505,8 +505,7 @@
*/
#ifdef _KERNEL
-#define LUA_NUMBER long long
-
+#define LUA_NUMBER int64_t
#else
#define LUA_NUMBER_DOUBLE
#define LUA_NUMBER double
@@ -528,9 +527,9 @@
*/
#ifdef _KERNEL
-#define LUA_NUMBER_SCAN "%lld"
-#define LUA_NUMBER_FMT "%lld"
-#define lua_str2number(s,p) strtoll((s), (p), 10)
+#define LUA_NUMBER_SCAN "%" SCNd64
+#define LUA_NUMBER_FMT "%" PRId64
+#define lua_str2number(s,p) ((int64_t) strtoimax((s), (p), 10))
#else
#define LUA_NUMBER_SCAN "%lf"
#define LUA_NUMBER_FMT "%.14g"
Added files:
Index: src/common/lib/libc/stdlib/strtoimax.c
diff -u /dev/nu
