Migrate lstring

Author: khvzak

build/build.rs

@@ -23,7 +23,6 @@ fn main() {
         .file("build/loslib.c")
         .file("build/lparser.c")
         .file("build/lstate.c")
-        .file("build/lstring.c")
         .file("build/lstrlib.c")
         .file("build/ltable.c")
         .file("build/ltablib.c")

build/lstring.c

@@ -4,7 +4,7 @@
 
 use std::mem;
 
-use libc::c_int;
+use libc::{c_int, size_t};
 
 use crate::lfunc::upisopen;
 use crate::lfunc::UpVal;
@@ -127,7 +127,10 @@ pub unsafe fn isdead(g: *mut global_State, v: *mut GCObject) -> bool {
     isdeadm(otherwhite(g), (*v).marked)
 }
 
-// #define changewhite(x)	((x)->marked ^= WHITEBITS)
+pub unsafe fn changewhite(x: *mut GCObject) {
+    (*x).marked ^= WHITEBITS;
+}
+
 // #define gray2black(x)	l_setbit((x)->marked, BLACKBIT)
 
 // #define luaC_white(g)	cast(lu_byte, (g)->currentwhite & WHITEBITS)
@@ -165,5 +168,7 @@ pub unsafe fn luaC_upvalbarrier(L: *mut lua_State, uv: *mut UpVal) {
 }
 
 extern "C" {
-    fn luaC_upvalbarrier_(L: *mut lua_State, uv: *mut UpVal);
+    pub fn luaC_upvalbarrier_(L: *mut lua_State, uv: *mut UpVal);
+    pub fn luaC_fix(L: *mut lua_State, o: *mut GCObject);
+    pub fn luaC_newobj(L: *mut lua_State, tt: c_int, sz: size_t) -> *mut GCObject;
 }

src/lgc.rs

@@ -16,6 +16,7 @@ pub(crate) mod llimits;
 pub(crate) mod lmem;
 pub(crate) mod lobject;
 pub(crate) mod lopcodes;
+pub(crate) mod lstring;
 pub(crate) mod ltemp;
 pub(crate) mod ltm;
 pub(crate) mod lvm;

src/lib.rs

@@ -24,6 +24,22 @@ pub union L_Umaxalign {
 */
 pub type Instruction = c_uint;
 
+/*
+** Maximum length for short strings, that is, strings that are
+** internalized. (Cannot be smaller than reserved words or tags for
+** metamethods, as these strings must be internalized;
+** #("function") = 8, #("__newindex") = 10.)
+*/
+pub const LUAI_MAXSHORTLEN: usize = 40;
+
+/*
+** Initial size for the string table (must be power of 2).
+** The Lua core alone registers ~50 strings (reserved words +
+** metaevent keys + a few others). Libraries would typically add
+** a few dozens more.
+*/
+pub const MINSTRTABSIZE: usize = 128;
+
 /*
 ** Size of cache for strings in the API. 'N' is the number of
 ** sets (better be a prime) and "M" is the size of each set (M == 1
@@ -32,6 +48,9 @@ pub type Instruction = c_uint;
 pub const STRCACHE_N: usize = 53;
 pub const STRCACHE_M: usize = 2;
 
+/* minimum size for string buffer */
+pub const LUA_MINBUFFER: usize = 32;
+
 /*
 @@ LUA_IDSIZE gives the maximum size for the description of the source
 @@ of a function in debug information.

src/llimits.rs

@@ -33,6 +33,15 @@ pub unsafe fn luaM_new<T>(L: *mut lua_State) -> *mut T {
     luaM_realloc_(L, ptr::null_mut(), 0, size_of::<T>()) as *mut T
 }
 
+pub unsafe fn luaM_reallocvector<T>(L: *mut lua_State, v: &mut *mut T, oldn: usize, n: usize) {
+    *v = luaM_realloc_(
+        L,
+        *v as *mut c_void,
+        oldn * size_of::<T>(),
+        n * size_of::<T>(),
+    ) as *mut T;
+}
+
 /*
 ** About the realloc function:
 ** void * frealloc (void *ud, void *ptr, size_t osize, size_t nsize);