0.11.0

Pluto.vcxproj.filters

@@ -105,9 +105,6 @@
       <Filter>vendor\Soup\soup</Filter>
     </ClCompile>
     <ClCompile Include="src\lhttplib.cpp" />
-    <ClCompile Include="src\vendor\Soup\Intrin\aes_helper.cpp">
-      <Filter>vendor\Soup\Intrin</Filter>
-    </ClCompile>
     <ClCompile Include="src\vendor\Soup\soup\adler32.cpp">
       <Filter>vendor\Soup\soup</Filter>
     </ClCompile>
@@ -265,9 +262,6 @@
     <ClCompile Include="src\vendor\Soup\soup\DefaultRngInterface.cpp">
       <Filter>vendor\Soup\soup</Filter>
     </ClCompile>
-    <ClCompile Include="src\vendor\Soup\Intrin\hardware_rng.cpp">
-      <Filter>vendor\Soup\Intrin</Filter>
-    </ClCompile>
     <ClCompile Include="src\vendor\Soup\soup\sha384.cpp">
       <Filter>vendor\Soup\soup</Filter>
     </ClCompile>
@@ -283,18 +277,9 @@
     <ClCompile Include="src\vendor\Soup\soup\Server.cpp">
       <Filter>vendor\Soup\soup</Filter>
     </ClCompile>
-    <ClCompile Include="src\vendor\Soup\Intrin\crc32_intrin.cpp">
-      <Filter>vendor\Soup\Intrin</Filter>
-    </ClCompile>
     <ClCompile Include="src\vendor\Soup\soup\alloc.cpp">
       <Filter>vendor\Soup\soup</Filter>
     </ClCompile>
-    <ClCompile Include="src\vendor\Soup\Intrin\sha1_transform.cpp">
-      <Filter>vendor\Soup\Intrin</Filter>
-    </ClCompile>
-    <ClCompile Include="src\vendor\Soup\Intrin\sha256_transform.cpp">
-      <Filter>vendor\Soup\Intrin</Filter>
-    </ClCompile>
     <ClCompile Include="src\vendor\Soup\soup\os.cpp">
       <Filter>vendor\Soup\soup</Filter>
     </ClCompile>
@@ -349,6 +334,19 @@
     <ClCompile Include="src\vendor\Soup\soup\QrCode.cpp">
       <Filter>vendor\Soup\soup</Filter>
     </ClCompile>
+    <ClCompile Include="src\vendor\Soup\soup\memAllocator.cpp">
+      <Filter>vendor\Soup\soup</Filter>
+    </ClCompile>
+    <ClCompile Include="src\vendor\Soup\soup\ResolveIpAddrTask.cpp">
+      <Filter>vendor\Soup\soup</Filter>
+    </ClCompile>
+    <ClCompile Include="src\lbufferlib.cpp" />
+    <ClCompile Include="src\vendor\Soup\soup\memAllocator.cpp">
+      <Filter>vendor\Soup\soup</Filter>
+    </ClCompile>
+    <ClCompile Include="src\vendor\Soup\soup\SocketAddr.cpp">
+      <Filter>vendor\Soup\soup</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\ltm.h" />
@@ -459,9 +457,6 @@
     <ClInclude Include="src\vendor\Soup\soup\string.hpp">
       <Filter>vendor\Soup\soup</Filter>
     </ClInclude>
-    <ClInclude Include="src\vendor\Soup\soup\StringRefReader.hpp">
-      <Filter>vendor\Soup\soup</Filter>
-    </ClInclude>
     <ClInclude Include="src\vendor\Soup\soup\TreeNode.hpp">
       <Filter>vendor\Soup\soup</Filter>
     </ClInclude>
@@ -561,9 +556,6 @@
     <ClInclude Include="src\vendor\Soup\soup\deflate.hpp">
       <Filter>vendor\Soup\soup</Filter>
     </ClInclude>
-    <ClInclude Include="src\vendor\Soup\soup\DelayedCtor.hpp">
-      <Filter>vendor\Soup\soup</Filter>
-    </ClInclude>
     <ClInclude Include="src\vendor\Soup\soup\deleter.hpp">
       <Filter>vendor\Soup\soup</Filter>
     </ClInclude>
@@ -1074,6 +1066,39 @@
     <ClInclude Include="src\vendor\Soup\soup\BCanvas.hpp">
       <Filter>vendor\Soup\soup</Filter>
     </ClInclude>
+    <ClInclude Include="src\vendor\Soup\soup\ResolveIpAddrTask.hpp">
+      <Filter>vendor\Soup\soup</Filter>
+    </ClInclude>
+    <ClInclude Include="src\vendor\Soup\soup\memAllocator.hpp">
+      <Filter>vendor\Soup\soup</Filter>
+    </ClInclude>
+    <ClInclude Include="src\vendor\Soup\soup\memCAllocator.hpp">
+      <Filter>vendor\Soup\soup</Filter>
+    </ClInclude>
+    <ClInclude Include="src\vendor\Soup\soup\utility.hpp">
+      <Filter>vendor\Soup\soup</Filter>
+    </ClInclude>
+    <ClInclude Include="src\vendor\Soup\soup\MemoryRefReader.hpp">
+      <Filter>vendor\Soup\soup</Filter>
+    </ClInclude>
+    <ClInclude Include="src\vendor\Soup\soup\aes_intrin.hpp">
+      <Filter>vendor\Soup\soup</Filter>
+    </ClInclude>
+    <ClInclude Include="src\vendor\Soup\soup\crc32_intrin.hpp">
+      <Filter>vendor\Soup\soup</Filter>
+    </ClInclude>
+    <ClInclude Include="src\vendor\Soup\soup\sha256_intrin.hpp">
+      <Filter>vendor\Soup\soup</Filter>
+    </ClInclude>
+    <ClInclude Include="src\vendor\Soup\soup\sha1_intrin.hpp">
+      <Filter>vendor\Soup\soup</Filter>
+    </ClInclude>
+    <ClInclude Include="src\vendor\Soup\soup\MemoryRefReader.hpp">
+      <Filter>vendor\Soup\soup</Filter>
+    </ClInclude>
+    <ClInclude Include="src\vendor\Soup\soup\utility.hpp">
+      <Filter>vendor\Soup\soup</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="vendor">
@@ -1085,8 +1110,5 @@
     <Filter Include="vendor\Soup\soup">
       <UniqueIdentifier>{713ac335-27c4-4677-9da1-08c37c023a77}</UniqueIdentifier>
     </Filter>
-    <Filter Include="vendor\Soup\Intrin">
-      <UniqueIdentifier>{f0adda43-f311-40e5-b4ec-284f248bad46}</UniqueIdentifier>
-    </Filter>
   </ItemGroup>
 </Project>

src/Makefile

@@ -27,7 +27,7 @@ SYSLIBS=
 
 MYCFLAGS=
 MYLDFLAGS=
-MYLIBS=-Lvendor/Soup/soup -lsoup -Lvendor/Soup/Intrin -lsoupintrin
+MYLIBS=-Lvendor/Soup/soup -lsoup
 MYOBJS=
 
 # Special flags for compiler modules; -Os reduces code size.
@@ -40,7 +40,7 @@ PLATS= guess aix bsd freebsd generic linux linux-readline macosx posix solaris
 LUA_A=	libplutostatic.a
 LUA_SO= libpluto.so
 CORE_O=	lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o lundump.o lvm.o lzio.o
-LIB_O=	lauxlib.o lbaselib.o lcorolib.o ldblib.o liolib.o lmathlib.o loadlib.o loslib.o lstrlib.o lcryptolib.o ltablib.o lutf8lib.o lassertlib.o lvector3lib.o lbase32.o lbase64.o ljson.o lurllib.o linit.o lstarlib.o lcatlib.o lhttplib.o lschedulerlib.o lsocketlib.o lbigint.o lxml.o lregex.o lffi.o lcanvas.o
+LIB_O=	lauxlib.o lbaselib.o lcorolib.o ldblib.o liolib.o lmathlib.o loadlib.o loslib.o lstrlib.o lcryptolib.o ltablib.o lutf8lib.o lassertlib.o lvector3lib.o lbase32.o lbase64.o ljson.o lurllib.o linit.o lstarlib.o lcatlib.o lhttplib.o lschedulerlib.o lsocketlib.o lbigint.o lxml.o lregex.o lffi.o lcanvas.o lbufferlib.o
 BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS)
 
 LUA_T=	pluto
@@ -63,9 +63,8 @@ o:	$(ALL_O)
 a:	$(ALL_A)
 
 $(LUA_A): $(BASE_O)
-	cd vendor/Soup/Intrin && $(MAKE) && cd ../..
 	cd vendor/Soup/soup && $(MAKE) && cd ../..
-	$(AR) $@ $(BASE_O) vendor/Soup/Intrin/*.o vendor/Soup/soup/*.o
+	$(AR) $@ $(BASE_O) vendor/Soup/soup/*.o
 	$(RANLIB) $@
 
 $(LUA_SO): $(BASE_O) $(LUA_A)
@@ -81,7 +80,6 @@ test:
 	./$(LUA_T) -v
 
 clean:
-	cd vendor/Soup/Intrin && $(MAKE) clean && cd ../..
 	cd vendor/Soup/soup && $(MAKE) clean && cd ../..
 	$(RM) $(ALL_T) $(ALL_O)
 

src/lbaselib.cpp

@@ -498,7 +498,7 @@ static int luaB_dofile (lua_State *L) {
 }
 
 
-static int luaB_assert (lua_State *L) {
+int luaB_assert (lua_State *L) {
   if (l_likely(lua_toboolean(L, 1)))  /* condition is true? */
     return lua_gettop(L);  /* return all arguments */
   else {  /* error */

src/lbufferlib.cpp

@@ -0,0 +1,126 @@
+#define LUA_LIB
+#include "lualib.h"
+
+#include <cstdlib> // malloc, realloc, free
+#include <memory> // destroy_at
+#include <new> // bad_alloc
+
+#include "vendor/Soup/soup/Buffer.hpp"
+
+#include "ldo.h"
+#include "lmem.h"
+
+#ifdef PLUTO_MEMORY_LIMIT
+struct PlutoSingleBlockAllocator : public soup::memAllocator
+{
+    lua_State* L;
+    size_t size = 0;
+
+    PlutoSingleBlockAllocator()
+        : memAllocator(&allocateImpl, &reallocateImpl, &deallocateImpl)
+    {
+    }
+
+    static void* allocateImpl(memAllocator* inst, size_t size) /* SOUP_EXCAL */
+    {
+        printf("allocate %zu\n", size);
+        void* ptr = luaM_realloc_(static_cast<PlutoSingleBlockAllocator*>(inst)->L, nullptr, 0, size);
+        SOUP_IF_LIKELY (ptr)
+        {
+            static_cast<PlutoSingleBlockAllocator*>(inst)->size = size;
+            return ptr;
+        }
+        throw std::bad_alloc{};
+    }
+
+    static void* reallocateImpl(memAllocator* inst, void* addr, size_t new_size) /* SOUP_EXCAL */
+    {
+        printf("resize %zu to %zu\n", static_cast<PlutoSingleBlockAllocator*>(inst)->size, new_size);
+        addr = luaM_realloc_(static_cast<PlutoSingleBlockAllocator*>(inst)->L, addr, static_cast<PlutoSingleBlockAllocator*>(inst)->size, new_size);
+        SOUP_IF_LIKELY (addr)
+        {
+            static_cast<PlutoSingleBlockAllocator*>(inst)->size = new_size;
+            return addr;
+        }
+        throw std::bad_alloc{};
+    }
+
+    static void deallocateImpl(memAllocator* inst, void* addr) noexcept
+    {
+        luaM_free_(static_cast<PlutoSingleBlockAllocator*>(inst)->L, addr, static_cast<PlutoSingleBlockAllocator*>(inst)->size);
+    }
+};
+#endif
+
+struct PlutoBuffer
+{
+#ifdef PLUTO_MEMORY_LIMIT
+    PlutoSingleBlockAllocator allocator;
+#endif
+    soup::Buffer buffer;
+
+    PlutoBuffer()
+#ifdef PLUTO_MEMORY_LIMIT
+        : buffer(allocator)
+#endif
+    {
+    }
+};
+
+[[nodiscard]] static PlutoBuffer* checkbuffer (lua_State *L, int i) {
+  const auto buf = (PlutoBuffer*)luaL_checkudata(L, i, "pluto:buffer");
+#ifdef PLUTO_MEMORY_LIMIT
+  buf->allocator.L = L;
+#endif
+  return buf;
+}
+
+static int buffer_new (lua_State *L) {
+  new (lua_newuserdata(L, sizeof(PlutoBuffer))) PlutoBuffer{};
+  if (luaL_newmetatable(L, "pluto:buffer")) {
+    lua_pushliteral(L, "__index");
+    luaL_loadbuffer(L, "return require\"pluto:buffer\"", 28, 0);
+    lua_call(L, 0, 1);
+    lua_settable(L, -3);
+    lua_pushliteral(L, "__gc");
+    lua_pushcfunction(L, [](lua_State *L) {
+      std::destroy_at<>(checkbuffer(L, 1));
+      return 0;
+    });
+    lua_settable(L, -3);
+  }
+  lua_setmetatable(L, -2);
+  return 1;
+}
+
+static int buffer_append (lua_State *L) {
+  size_t size;
+  const char* data = luaL_checklstring(L, 2, &size);
+  try {
+    checkbuffer(L, 1)->buffer.append(data, size);
+  }
+  catch (std::bad_alloc&) {
+    luaD_throw(L, LUA_ERRMEM);
+  }
+  return 0;
+}
+
+static int buffer_tostring (lua_State *L) {
+  soup::Buffer& buf = checkbuffer(L, 1)->buffer;
+  try {
+    lua_pushlstring(L, (const char*)buf.data(), buf.size());
+  }
+  catch (std::bad_alloc&) {
+    luaD_throw(L, LUA_ERRMEM);
+  }
+  return 1;
+}
+
+static const luaL_Reg funcs_buffer[] = {
+  {"new", buffer_new},
+  {"append", buffer_append},
+  {"tostring", buffer_tostring},
+  {nullptr, nullptr}
+};
+
+PLUTO_NEWLIB(buffer)

src/lcode.cpp

@@ -1728,6 +1728,22 @@ static void codeeq (FuncState *fs, BinOpr opr, expdesc *e1, expdesc *e2) {
     lua_assert(e1->k == VK || e1->k == VKINT || e1->k == VKFLT);
     swapexps(e1, e2);
   }
+  if (vkisconst(e1->k) && vkisconst(e2->k) && !hasjumps(e1) && !hasjumps(e2)
+      && (e1->k != VKINT || e2->k != VKFLT) && (e1->k != VKFLT || e2->k != VKINT)  /* don't optimize comparisons between VKINT and VKFLT */
+  ) {
+    bool eq = false;
+    if (e1->k == e2->k) {
+      switch (e1->k) {
+      default: eq = true; break;
+      case VKFLT: eq = (e1->u.nval == e2->u.nval); break;
+      case VKINT: eq = (e1->u.ival == e2->u.ival); break;
+      case VKSTR: eq = (e1->u.strval == e2->u.strval); break;
+      case VCONST: eq = (e1->u.info == e2->u.info); break;
+      }
+    }
+    e1->k = ((eq ^ (opr != OPR_EQ)) ? VTRUE : VFALSE);
+    return;
+  }
   r1 = luaK_exp2anyreg(fs, e1);  /* 1st expression must be in register */
   if (isSCnumber(e2, &im, &isfloat)) {
     op = OP_EQI;
@@ -1816,9 +1832,8 @@ void luaK_infix (FuncState *fs, BinOpr op, expdesc *v) {
       break;
     }
     case OPR_EQ: case OPR_NE: {
-      if (!tonumeral(v, NULL))
+      if (!vkisconst(v->k) || hasjumps(v))
         exp2RK(fs, v);
-      /* else keep numeral, which may be an immediate operand */
       break;
     }
     case OPR_LT: case OPR_LE:

src/lcryptolib.cpp

@@ -13,6 +13,7 @@
 #include "vendor/Soup/soup/adler32.hpp"
 #include "vendor/Soup/soup/aes.hpp"
 #include "vendor/Soup/soup/crc32.hpp"
+#include "vendor/Soup/soup/crc32c.hpp"
 #include "vendor/Soup/soup/deflate.hpp"
 #include "vendor/Soup/soup/HardwareRng.hpp"
 #include "vendor/Soup/soup/ripemd160.hpp"
@@ -218,13 +219,20 @@ static int sdbm(lua_State *L)
 static int md5(lua_State *L)
 {
   size_t len;
-  unsigned char buffer[16];
   const auto str = luaL_checklstring(L, 1, &len);
+  const bool binary = lua_istrue(L, 2);
+
+  unsigned char buffer[16];
   md5_fn((unsigned char*)str, (int)len, buffer);
-
-  char hexbuff[32];
-  soup::string::bin2hexAt(hexbuff, (const char*)buffer, sizeof(buffer), soup::string::charset_hex_lower);
-  lua_pushlstring(L, hexbuff, sizeof(hexbuff));
+
+  if (binary) {
+    lua_pushlstring(L, (const char*)buffer, sizeof(buffer));
+  }
+  else {
+    char hexbuff[32];
+    soup::string::bin2hexAt(hexbuff, (const char*)buffer, sizeof(buffer), soup::string::charset_hex_lower);
+    lua_pushlstring(L, hexbuff, sizeof(hexbuff));
+  }
   return 1;
 }
 
@@ -249,6 +257,16 @@ static int crc32(lua_State *L)
 }
 
 
+static int crc32c(lua_State *L)
+{
+  size_t len;
+  const auto text = luaL_checklstring(L, 1, &len);
+  const auto hash = soup::crc32c::hash((const uint8_t*)text, len, (uint32_t)luaL_optinteger(L, 2, 0));
+  lua_pushinteger(L, hash);
+  return 1;
+}
+
+
 // The hashing function used inside Lua. Honorary addition.
 // Basically a slightly different DJB2.
 static int lua(lua_State *L)
@@ -751,6 +769,7 @@ static const luaL_Reg funcs_crypto[] = {
   {"sha512", l_hashwithdigest<soup::sha512>},
   {"lua", lua},
   {"crc32", crc32},
+  {"crc32c", crc32c},
   {"lookup3", lookup3},
   {"md5", md5},
   {"sdbm", sdbm},