1 files changed, 16 insertions, 13 deletions

diff --git a/src/lj_buf.h b/src/lj_buf.h
index 5a7eae31..289eb01d 100644
--- a/src/lj_buf.h
+++ b/src/lj_buf.h
@@ -14,21 +14,24 @@
 #define sbufB(sb)       (mref((sb)->b, char))
 #define sbufP(sb)       (mref((sb)->p, char))
 #define sbufE(sb)       (mref((sb)->e, char))
+#define sbufL(sb)       (mref((sb)->L, lua_State))
 #define sbufsz(sb)      ((MSize)(sbufE((sb)) - sbufB((sb))))
 #define sbuflen(sb)     ((MSize)(sbufP((sb)) - sbufB((sb))))
 #define setsbufP(sb, q) (setmref((sb)->p, (q)))
+#define setsbufL(sb, l) (setmref((sb)->L, (l)))
 
-LJ_FUNC char *lj_buf_tmp(lua_State *L, MSize sz);
-LJ_FUNC void lj_buf_grow(lua_State *L, SBuf *sb, char *en);
-LJ_FUNC void lj_buf_shrink(lua_State *L, SBuf *sb);
+LJ_FUNC char * LJ_FASTCALL lj_buf_tmp(lua_State *L, MSize sz);
+LJ_FUNC void LJ_FASTCALL lj_buf_grow(SBuf *sb, char *en);
+LJ_FUNC void LJ_FASTCALL lj_buf_shrink(lua_State *L, SBuf *sb);
 
 LJ_FUNC char *lj_buf_wmem(char *p, const void *q, MSize len);
-LJ_FUNC void lj_buf_putmem(lua_State *L, SBuf *sb, const void *q, MSize len);
-LJ_FUNC uint32_t lj_buf_ruleb128(const char **pp);
-LJ_FUNC char *lj_buf_wuleb128(char *p, uint32_t v);
+LJ_FUNC void lj_buf_putmem(SBuf *sb, const void *q, MSize len);
+LJ_FUNC uint32_t LJ_FASTCALL lj_buf_ruleb128(const char **pp);
+LJ_FUNC char * LJ_FASTCALL lj_buf_wuleb128(char *p, uint32_t v);
 
-static LJ_AINLINE void lj_buf_init(SBuf *sb)
+static LJ_AINLINE void lj_buf_init(lua_State *L, SBuf *sb)
 {
+  setsbufL(sb, L);
   setmref(sb->p, NULL); setmref(sb->e, NULL); setmref(sb->b, NULL);
 }
 
@@ -47,25 +50,25 @@ static LJ_AINLINE GCstr *lj_buf_str(lua_State *L, SBuf *sb)
   return lj_str_new(L, sbufB(sb), sbuflen(sb));
 }
 
-static LJ_AINLINE char *lj_buf_need(lua_State *L, SBuf *sb, MSize sz)
+static LJ_AINLINE char *lj_buf_need(SBuf *sb, MSize sz)
 {
   char *en = sbufB(sb) + sz;
   if (LJ_UNLIKELY(en > sbufE(sb)))
-    lj_buf_grow(L, sb, en);
+    lj_buf_grow(sb, en);
   return sbufB(sb);
 }
 
-static LJ_AINLINE char *lj_buf_more(lua_State *L, SBuf *sb, MSize sz)
+static LJ_AINLINE char *lj_buf_more(SBuf *sb, MSize sz)
 {
   char *en = sbufP(sb) + sz;
   if (LJ_UNLIKELY(en > sbufE(sb)))
-    lj_buf_grow(L, sb, en);
+    lj_buf_grow(sb, en);
   return sbufP(sb);
 }
 
-static LJ_AINLINE void lj_buf_putb(lua_State *L, SBuf *sb, int c)
+static LJ_AINLINE void lj_buf_putb(SBuf *sb, int c)
 {
-  char *p = lj_buf_more(L, sb, 1);
+  char *p = lj_buf_more(sb, 1);
   *p++ = (char)c;
   setsbufP(sb, p);
 }