gh-mirror/mikepaul-LuaJIT
1
0
Fork 0
mirror of https://github.com/LuaJIT/LuaJIT.git synced 2025-02-07 23:24:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactor string buffer growth helpers.

Browse Source
This commit is contained in:
Mike Pall 2013-05-29 20:17:26 +02:00
parent b6882a57da
commit c5ebfa0c67
3 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/lj_buf.c
View File

@ -3,8 +3,6 @@
** Copyright (C) 2005-2013 Mike Pall. See Copyright Notice in luajit.h ** Copyright (C) 2005-2013 Mike Pall. See Copyright Notice in luajit.h
*/ */
#include <stdio.h>
#define lj_buf_c #define lj_buf_c
#define LUA_CORE #define LUA_CORE
@ -18,23 +16,37 @@
/* -- Buffer management --------------------------------------------------- */ /* -- Buffer management --------------------------------------------------- */
LJ_NOINLINE void LJ_FASTCALL lj_buf_grow(SBuf *sb, char *en) static void buf_grow(SBuf *sb, MSize sz)
{ {
lua_State *L = sbufL(sb); MSize osz = sbufsz(sb), len = sbuflen(sb), nsz = osz;
char *b = sbufB(sb); char *b;
MSize sz = (MSize)(en - b);
MSize osz = (MSize)(sbufE(sb) - b), nsz = osz;
MSize n = (MSize)(sbufP(sb) - b);
if (LJ_UNLIKELY(sz > LJ_MAX_MEM))
lj_err_mem(L);
if (nsz < LJ_MIN_SBUF) nsz = LJ_MIN_SBUF; if (nsz < LJ_MIN_SBUF) nsz = LJ_MIN_SBUF;
while (nsz < sz) nsz += nsz; while (nsz < sz) nsz += nsz;
b = (char *)lj_mem_realloc(L, b, osz, nsz); b = (char *)lj_mem_realloc(sbufL(sb), sbufB(sb), osz, nsz);
setmref(sb->b, b); setmref(sb->b, b);
setmref(sb->p, b + n); setmref(sb->p, b + len);
setmref(sb->e, b + nsz); setmref(sb->e, b + nsz);
} }
LJ_NOINLINE char *LJ_FASTCALL lj_buf_need2(SBuf *sb, MSize sz)
{
lua_assert(sz > sbufsz(sb));
if (LJ_UNLIKELY(sz > LJ_MAX_MEM))
lj_err_mem(sbufL(sb));
buf_grow(sb, sz);
return sbufB(sb);
}
LJ_NOINLINE char *LJ_FASTCALL lj_buf_more2(SBuf *sb, MSize sz)
{
MSize len = sbuflen(sb);
lua_assert(sz > sbufleft(sb));
if (LJ_UNLIKELY(sz > LJ_MAX_MEM || len + sz > LJ_MAX_MEM))
lj_err_mem(sbufL(sb));
buf_grow(sb, len + sz);
return sbufP(sb);
}
void LJ_FASTCALL lj_buf_shrink(lua_State *L, SBuf *sb) void LJ_FASTCALL lj_buf_shrink(lua_State *L, SBuf *sb)
{ {
char *b = sbufB(sb); char *b = sbufB(sb);

14
src/lj_buf.h
View File

@ -17,11 +17,13 @@
#define sbufL(sb) (mref((sb)->L, lua_State)) #define sbufL(sb) (mref((sb)->L, lua_State))
#define sbufsz(sb) ((MSize)(sbufE((sb)) - sbufB((sb)))) #define sbufsz(sb) ((MSize)(sbufE((sb)) - sbufB((sb))))
#define sbuflen(sb) ((MSize)(sbufP((sb)) - sbufB((sb)))) #define sbuflen(sb) ((MSize)(sbufP((sb)) - sbufB((sb))))
#define sbufleft(sb) ((MSize)(sbufE((sb)) - sbufP((sb))))
#define setsbufP(sb, q) (setmref((sb)->p, (q))) #define setsbufP(sb, q) (setmref((sb)->p, (q)))
#define setsbufL(sb, l) (setmref((sb)->L, (l))) #define setsbufL(sb, l) (setmref((sb)->L, (l)))
/* Buffer management */ /* Buffer management */
LJ_FUNC void LJ_FASTCALL lj_buf_grow(SBuf *sb, char *en); LJ_FUNC char *LJ_FASTCALL lj_buf_need2(SBuf *sb, MSize sz);
LJ_FUNC char *LJ_FASTCALL lj_buf_more2(SBuf *sb, MSize sz);
LJ_FUNC void LJ_FASTCALL lj_buf_shrink(lua_State *L, SBuf *sb); LJ_FUNC void LJ_FASTCALL lj_buf_shrink(lua_State *L, SBuf *sb);
LJ_FUNC char * LJ_FASTCALL lj_buf_tmp(lua_State *L, MSize sz); LJ_FUNC char * LJ_FASTCALL lj_buf_tmp(lua_State *L, MSize sz);
@ -51,17 +53,15 @@ static LJ_AINLINE void lj_buf_free(global_State *g, SBuf *sb)
static LJ_AINLINE char *lj_buf_need(SBuf *sb, MSize sz) static LJ_AINLINE char *lj_buf_need(SBuf *sb, MSize sz)
{ {
char *en = sbufB(sb) + sz; if (LJ_UNLIKELY(sz > sbufsz(sb)))
if (LJ_UNLIKELY(en > sbufE(sb))) return lj_buf_need2(sb, sz);
lj_buf_grow(sb, en);
return sbufB(sb); return sbufB(sb);
} }
static LJ_AINLINE char *lj_buf_more(SBuf *sb, MSize sz) static LJ_AINLINE char *lj_buf_more(SBuf *sb, MSize sz)
{ {
char *en = sbufP(sb) + sz; if (LJ_UNLIKELY(sz > sbufleft(sb)))
if (LJ_UNLIKELY(en > sbufE(sb))) return lj_buf_more2(sb, sz);
lj_buf_grow(sb, en);
return sbufP(sb); return sbufP(sb);
} }

2
src/lj_str.c
View File

@ -3,8 +3,6 @@
** Copyright (C) 2005-2013 Mike Pall. See Copyright Notice in luajit.h ** Copyright (C) 2005-2013 Mike Pall. See Copyright Notice in luajit.h
*/ */
#include <stdio.h>
#define lj_str_c #define lj_str_c
#define LUA_CORE #define LUA_CORE