Fixes in realloc

lib/allocators/arena.nelua

@@ -34,7 +34,7 @@ local function align_forward(addr: usize, align: usize): usize <inline>
   return (addr + (align-1)) & ~(align-1)
 end
 
-local function memmove(dest: pointer, src: pointer, n: csize): pointer <cimport'memmove',cinclude'<string.h>',nodecl> end
+local function memcpy(dest: pointer, src: pointer, n: csize): pointer <cimport,cinclude'<string.h>',nodecl> end
 
 ## local make_arena_allocator = generalize(function(Size, Align, error_on_failure)
   ## Align = Align or 8
@@ -100,14 +100,16 @@ local function memmove(dest: pointer, src: pointer, n: csize): pointer <cimport'
         self.curr_offset = offset
       end
       return p
-    else -- move to a new allocation
+    elseif newsize > oldsize then -- growing, move to a new allocation
       if unlikely(newsize == 0) then return nilptr end
       local newp: pointer = self:alloc(newsize)
       if likely(newp ~= nilptr and p ~= nilptr and oldsize ~= 0) then
-        -- move the mem to the new location, as the memory may overlap
-        memmove(newp, p, oldsize)
+        -- copy the mem to the new location
+        memcpy(newp, p, oldsize)
       end
       return newp
+    else -- shrinking, can return the same pointer
+      return p
     end
   end
 

lib/allocators/gc.nelua

@@ -12,8 +12,8 @@ require 'allocators.general'
 
 local jmp_buf <cimport,cinclude'<setjmp.h>',nodecl> = @record{dummy: usize}
 local function setjmp(env: jmp_buf) <cimport,cinclude'<setjmp.h>',nodecl> end
-local function memcpy(dest: pointer, src: pointer, n: csize): pointer <cimport'memcpy',cinclude'<string.h>',nodecl> end
-local function memset(s: pointer, c: cint, n: csize): pointer <cimport'memset',cinclude'<string.h>',nodecl> end
+local function memcpy(dest: pointer, src: pointer, n: csize): pointer <cimport,cinclude'<string.h>',nodecl> end
+local function memset(s: pointer, c: cint, n: csize): pointer <cimport,cinclude'<string.h>',nodecl> end
 
 local allocator: auto = general_allocator
 

lib/allocators/general.nelua

@@ -5,10 +5,10 @@
 -- It uses the C malloc/calloc/realloc/free functions.
 
 local function memset(s: pointer, c: cint, n: csize): pointer <cimport'memset',cinclude'<string.h>',nodecl> end
-local function malloc(size: csize): pointer <cimport'malloc',cinclude'<stdlib.h>',nodecl> end
-local function calloc(nmemb: csize, size: csize): pointer <cimport'calloc',cinclude'<stdlib.h>',nodecl> end
-local function realloc(ptr: pointer, size: csize): pointer <cimport'realloc',cinclude'<stdlib.h>',nodecl> end
-local function free(ptr: pointer): void <cimport'free',cinclude'<stdlib.h>',nodecl> end
+local function malloc(size: csize): pointer <cimport,cinclude'<stdlib.h>',nodecl> end
+local function calloc(nmemb: csize, size: csize): pointer <cimport,cinclude'<stdlib.h>',nodecl> end
+local function realloc(ptr: pointer, size: csize): pointer <cimport,cinclude'<stdlib.h>',nodecl> end
+local function free(ptr: pointer): void <cimport,cinclude'<stdlib.h>',nodecl> end
 
 global GeneralAllocator = @record{}
 

lib/allocators/interface.nelua

@@ -5,8 +5,8 @@
 require 'span'
 
 ## function implement_allocator_interface(allocator)
-  local function memcpy(dest: pointer, src: pointer, n: csize): pointer <cimport'memcpy',cinclude'<string.h>',nodecl> end
-  local function memset(s: pointer, c: cint, n: csize): pointer <cimport'memset',cinclude'<string.h>',nodecl> end
+  local function memcpy(dest: pointer, src: pointer, n: csize): pointer <cimport,cinclude'<string.h>',nodecl> end
+  local function memset(s: pointer, c: cint, n: csize): pointer <cimport,cinclude'<string.h>',nodecl> end
 
   local is_span = #[concept(function(x) return x.type.is_span end)]#
   local allocator = #[allocator]#
@@ -24,7 +24,11 @@ require 'span'
     else
       local newp: pointer = self:alloc(newsize)
       if likely(newp ~= nilptr and p ~= nilptr and oldsize ~= 0) then
-        memcpy(newp, p, oldsize)
+        local copysize = oldsize
+        if newsize < oldsize then
+          copysize = newsize
+        end
+        memcpy(newp, p, copysize)
       end
       return newp
     end

lib/memory.nelua

@@ -2,11 +2,11 @@
 
 --------------------------------------------------------------------------------
 -- C imports
-local function memcpy(dest: pointer, src: pointer, n: csize): pointer <cimport'memcpy',cinclude'<string.h>',nodecl> end
-local function memmove(dest: pointer, src: pointer, n: csize): pointer <cimport'memmove',cinclude'<string.h>',nodecl> end
-local function memset(s: pointer, c: cint, n: csize): pointer <cimport'memset',cinclude'<string.h>',nodecl> end
-local function memcmp(s1: pointer, s2: pointer, n: csize): cint <cimport'memcmp',cinclude'<string.h>',nodecl> end
-local function memchr(s: pointer, c: cint, n: csize): pointer <cimport'memchr',cinclude'<string.h>',nodecl> end
+local function memcpy(dest: pointer, src: pointer, n: csize): pointer <cimport,cinclude'<string.h>',nodecl> end
+local function memmove(dest: pointer, src: pointer, n: csize): pointer <cimport,cinclude'<string.h>',nodecl> end
+local function memset(s: pointer, c: cint, n: csize): pointer <cimport,cinclude'<string.h>',nodecl> end
+local function memcmp(s1: pointer, s2: pointer, n: csize): cint <cimport,cinclude'<string.h>',nodecl> end
+local function memchr(s: pointer, c: cint, n: csize): pointer <cimport,cinclude'<string.h>',nodecl> end
 
 --------------------------------------------------------------------------------
 -- pointer functions