rbdc 0.9.0 → 1.0.0

data/dyncall/dyncall/dyncall_signature.h

@@ -6,7 +6,7 @@
  Description: Type and calling-convention signature character defines
  License:
 
-   Copyright (c) 2007-2015 Daniel Adler <dadler@uni-goettingen.de>, 
+   Copyright (c) 2007-2018 Daniel Adler <dadler@uni-goettingen.de>, 
                            Tassilo Philipp <tphilipp@potion-studios.com>
 
    Permission to use, copy, modify, and distribute this software for any

data/dyncall/dyncall/dyncall_types.h

@@ -6,7 +6,7 @@
  Description: Typedefs
  License:
 
-   Copyright (c) 2007-2015 Daniel Adler <dadler@uni-goettingen.de>, 
+   Copyright (c) 2007-2018 Daniel Adler <dadler@uni-goettingen.de>, 
                            Tassilo Philipp <tphilipp@potion-studios.com>
 
    Permission to use, copy, modify, and distribute this software for any
@@ -45,24 +45,23 @@
 extern "C" {
 #endif 
 
-typedef void            DCvoid;
-typedef DC_BOOL         DCbool;
-typedef char            DCchar;
-typedef unsigned char   DCuchar;
-typedef short           DCshort;
-typedef unsigned short  DCushort;
-typedef int             DCint;
-typedef unsigned int    DCuint;
-typedef long            DClong;
-typedef unsigned long   DCulong;
-typedef DC_LONG_LONG    DClonglong;
+typedef void                  DCvoid;
+typedef DC_BOOL               DCbool;
+typedef char                  DCchar;
+typedef unsigned char         DCuchar;
+typedef short                 DCshort;
+typedef unsigned short        DCushort;
+typedef int                   DCint;
+typedef unsigned int          DCuint;
+typedef long                  DClong;
+typedef unsigned long         DCulong;
+typedef DC_LONG_LONG          DClonglong;
 typedef unsigned DC_LONG_LONG DCulonglong;
-typedef float           DCfloat;
-typedef double          DCdouble;
-typedef DC_POINTER      DCpointer;
-typedef const char*     DCstring;
-
-typedef size_t          DCsize;
+typedef float                 DCfloat;
+typedef double                DCdouble;
+typedef DC_POINTER            DCpointer;
+typedef const char*           DCstring;
+typedef size_t                DCsize;
 
 #define DC_TRUE   1
 #define DC_FALSE  0

data/dyncall/dyncall/dyncall_utils.h

@@ -6,7 +6,7 @@
  Description: Type and calling-convention signature character defines
  License:
 
-   Copyright (c) 2007-2015 Daniel Adler <dadler@uni-goettingen.de>, 
+   Copyright (c) 2007-2018 Daniel Adler <dadler@uni-goettingen.de>, 
                            Tassilo Philipp <tphilipp@potion-studios.com>
 
    Permission to use, copy, modify, and distribute this software for any

data/dyncall/dyncall/dyncall_value.h

@@ -6,7 +6,7 @@
  Description: Value variant type
  License:
 
-   Copyright (c) 2007-2015 Daniel Adler <dadler@uni-goettingen.de>, 
+   Copyright (c) 2007-2018 Daniel Adler <dadler@uni-goettingen.de>, 
                            Tassilo Philipp <tphilipp@potion-studios.com>
 
    Permission to use, copy, modify, and distribute this software for any
@@ -48,15 +48,17 @@ typedef union DCValue_ DCValue;
 
 union DCValue_
 {
-#if defined (DC__Arch_PPC32) && defined(DC__Endian_BIG)
-  DCbool        B;
+/* dyncallback assembly pulls value directly from DCValue structs, without   */
+/* knowledge about types used, so lay it out as needed at compile time, here */
+#if defined(DC__Endian_BIG) && (defined(DC__Arch_PPC32) || defined(DC__Arch_MIPS) || defined(DC__Arch_Sparc))
+  DCbool      B;
   struct { DCchar  c_pad[3]; DCchar  c; };
   struct { DCuchar C_pad[3]; DCuchar C; };
   struct { DCshort s_pad;    DCshort s; };
   struct { DCshort S_pad;    DCshort S; };
-  DCint         i;
-  DCuint        I;
-#elif defined (DC__Arch_PPC64) && defined(DC__Endian_BIG)
+  DCint       i;
+  DCuint      I;
+#elif defined(DC__Endian_BIG) && (defined(DC__Arch_PPC64) || defined(DC__Arch_MIPS64) || defined(DC__Arch_Sparc64))
   struct { DCbool  B_pad;    DCbool  B; };
   struct { DCchar  c_pad[7]; DCchar  c; };
   struct { DCuchar C_pad[7]; DCuchar C; };
@@ -65,22 +67,27 @@ union DCValue_
   struct { DCint   i_pad;    DCint   i; };
   struct { DCint   I_pad;    DCuint  I; };
 #else
-  DCbool        B;
-  DCchar        c;
-  DCuchar       C;
-  DCshort       s;
-  DCushort      S;
-  DCint         i;
-  DCuint        I;
+  DCbool      B;
+  DCchar      c;
+  DCuchar     C;
+  DCshort     s;
+  DCushort    S;
+  DCint       i;
+  DCuint      I;
 #endif
-  DClong        j;
-  DCulong       J;
-  DClonglong    l;
-  DCulonglong   L;
-  DCfloat       f;
-  DCdouble      d;
-  DCpointer     p;
-  DCstring      Z;
+  DClong      j;
+  DCulong     J;
+  DClonglong  l;
+  DCulonglong L;
+/* floats on mips are right justified in fp-registers on big endian targets, as they aren't promoted */
+#if defined(DC__Endian_BIG) && (defined(DC__Arch_MIPS) || defined(DC__Arch_MIPS64))
+  struct { DCfloat f_pad; DCfloat f; };
+#else
+  DCfloat     f;
+#endif
+  DCdouble    d;
+  DCpointer   p;
+  DCstring    Z;
 };
 
 #ifdef __cplusplus

data/dyncall/dyncall/dyncall_vector.c

@@ -6,7 +6,7 @@
  Description: Simple dynamic vector container type implementation
  License:
 
-   Copyright (c) 2007-2015 Daniel Adler <dadler@uni-goettingen.de>, 
+   Copyright (c) 2007-2018 Daniel Adler <dadler@uni-goettingen.de>, 
                            Tassilo Philipp <tphilipp@potion-studios.com>
 
    Permission to use, copy, modify, and distribute this software for any

data/dyncall/dyncall/dyncall_vector.h

@@ -6,7 +6,7 @@
  Description: Simple dynamic vector container type header
  License:
 
-   Copyright (c) 2007-2015 Daniel Adler <dadler@uni-goettingen.de>, 
+   Copyright (c) 2007-2018 Daniel Adler <dadler@uni-goettingen.de>, 
                            Tassilo Philipp <tphilipp@potion-studios.com>
 
    Permission to use, copy, modify, and distribute this software for any

data/dyncall/dyncall/gen-masm.sh

@@ -3,5 +3,5 @@
 # Uses portasm to generates MASM sources for intel platforms.
 printf "; auto-generated by `basename $0`\r\n" > dyncall_call_x86_generic_masm.asm
 printf "; auto-generated by `basename $0`\r\n" > dyncall_call_x64_generic_masm.asm
-gcc -E -P -DGEN_MASM dyncall_call_x86.S     | awk '{printf "%s\r\n", $0}' >> dyncall_call_x86_generic_masm.asm
-gcc -E -P -DGEN_MASM dyncall_call_x64-att.S | awk '{printf "%s\r\n", $0}' >> dyncall_call_x64_generic_masm.asm
+gcc -E -P -DGEN_MASM dyncall_call_x86.S | awk '{printf "%s\r\n", $0}' >> dyncall_call_x86_generic_masm.asm
+gcc -E -P -DGEN_MASM dyncall_call_x64.S | awk '{printf "%s\r\n", $0}' >> dyncall_call_x64_generic_masm.asm

data/dyncall/dyncallback/CMakeLists.txt

@@ -45,8 +45,7 @@ install(FILES
   dyncall_thunk_x86.h
   dyncall_thunk_ppc32.h
   dyncall_thunk_x64.h
-  dyncall_thunk_arm32_arm.h
-  dyncall_thunk_arm32_thumb.h
+  dyncall_thunk_arm32.h
   dyncall_alloc_wx.h
   dyncall_args.h
   dyncall_callback.h

data/dyncall/dyncallback/Makefile.generic

@@ -1,6 +1,6 @@
 LIBNAME = dyncallback
 OBJS = dyncall_alloc_wx.o dyncall_args.o dyncall_callback.o dyncall_callback_arch.o dyncall_thunk.o
-HEADERS = ${VPATH}/dyncall_thunk.h ${VPATH}/dyncall_thunk_x86.h ${VPATH}/dyncall_thunk_ppc32.h ${VPATH}/dyncall_thunk_x64.h ${VPATH}/dyncall_thunk_arm32_arm.h ${VPATH}/dyncall_thunk_arm32_thumb.h ${VPATH}/dyncall_thunk_arm64.h ${VPATH}/dyncall_args.h ${VPATH}/dyncall_callback.h
+HEADERS = ${VPATH}/dyncall_thunk.h ${VPATH}/dyncall_thunk_x86.h ${VPATH}/dyncall_thunk_ppc32.h ${VPATH}/dyncall_thunk_x64.h ${VPATH}/dyncall_thunk_arm32.h ${VPATH}/dyncall_thunk_arm64.h ${VPATH}/dyncall_thunk_mips.h ${VPATH}/dyncall_thunk_mips64.h ${VPATH}/dyncall_thunk_ppc64.h ${VPATH}/dyncall_thunk_sparc32.h ${VPATH}/dyncall_thunk_sparc64.h ${VPATH}/dyncall_args.h ${VPATH}/dyncall_callback.h
 TOP = ${VPATH}/..
 CFLAGS += -I${TOP}/dyncall 
 

data/dyncall/dyncallback/dyncall_alloc_wx.c

@@ -6,7 +6,7 @@
  Description: Allocate write/executable memory - Implementation back-end selector (mmap or win32)
  License:
 
-   Copyright (c) 2007-2015 Daniel Adler <dadler@uni-goettingen.de>,
+   Copyright (c) 2007-2018 Daniel Adler <dadler@uni-goettingen.de>,
                            Tassilo Philipp <tphilipp@potion-studios.com>
 
    Permission to use, copy, modify, and distribute this software for any

data/dyncall/dyncallback/dyncall_alloc_wx.h

@@ -6,7 +6,7 @@
  Description: Allocate write/executable memory - Interface
  License:
 
-   Copyright (c) 2007-2015 Daniel Adler <dadler@uni-goettingen.de>,
+   Copyright (c) 2007-2018 Daniel Adler <dadler@uni-goettingen.de>,
                            Tassilo Philipp <tphilipp@potion-studios.com>
 
    Permission to use, copy, modify, and distribute this software for any
@@ -35,8 +35,9 @@ typedef int DCerror;
 extern "C" {
 #endif
 
-DCerror dcAllocWX(DCsize size, void** p);
-void    dcFreeWX (void* p, DCsize size);
+DCerror dcAllocWX   (DCsize size, void** p);
+DCerror dcInitExecWX(void* p, DCsize size);
+void    dcFreeWX    (void* p, DCsize size);
 
 #ifdef __cplusplus
 }

data/dyncall/dyncallback/dyncall_alloc_wx_malloc.c

@@ -6,7 +6,7 @@
  Description: Allocate write/executable memory - Fallback implementation based
  License:
 
-   Copyright (c) 2007-2015 Daniel Adler <dadler@uni-goettingen.de>,
+   Copyright (c) 2007-2018 Daniel Adler <dadler@uni-goettingen.de>,
                            Tassilo Philipp <tphilipp@potion-studios.com>
 
    Permission to use, copy, modify, and distribute this software for any
@@ -29,13 +29,19 @@
 #include <stdlib.h>
 
 
-int dcAllocWX(size_t size, void** pp)
+DCerror dcAllocWX(size_t size, void** pp)
 {
   *pp = malloc(size);
   return 0;
 }
 
+DCerror dcInitExecWX(void* p, size_t size)
+{
+  return 0;
+}
+
 void dcFreeWX(void* p, size_t size)
 {
   free(p);
 }
+

data/dyncall/dyncallback/dyncall_alloc_wx_mmap.c

@@ -6,7 +6,7 @@
  Description: Allocate write/executable memory - Implementation for posix
  License:
 
-   Copyright (c) 2007-2015 Daniel Adler <dadler@uni-goettingen.de>,
+   Copyright (c) 2007-2018 Daniel Adler <dadler@uni-goettingen.de>,
                            Tassilo Philipp <tphilipp@potion-studios.com>
 
    Permission to use, copy, modify, and distribute this software for any
@@ -29,15 +29,78 @@
 #include <sys/types.h>
 #include <sys/mman.h>
 
-int dcAllocWX(size_t size, void** pp)
+/* MAP_ANON is not POSIX, if lacking, we'll use a portable fallback on *nix systems */
+#if !defined(MAP_ANON)
+#  if defined(MAP_ANONYMOUS)
+#    define MAP_ANON MAP_ANONYMOUS
+#  elif defined(DC_UNIX)
+#    include <fcntl.h>
+#  else
+#    error "Platform implementation missing for anonymous rwx memory"
+#  endif
+#endif
+
+/* platforms without mprotect */
+#if defined(DC__OS_Minix)
+#  define NO_MPROTECT
+#endif
+
+/* if no mprotect() available/wanted, make mmap alloc pages as rwx */
+#if defined(NO_MPROTECT)
+#  define MMAP_PROT_INIT (PROT_READ|PROT_WRITE|PROT_EXEC)
+#else
+#  define MMAP_PROT_INIT (PROT_READ|PROT_WRITE)
+#endif
+
+DCerror dcAllocWX(size_t size, void** pp)
 {
-  void* p = mmap(0, size, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANON, -1, 0);
-  if (p == ( (void*)-1 ) ) return -1;
+  void* p;
+#if !defined(MAP_ANON) && defined(DC_UNIX)
+  /* Hack around not having POSIX' MAP_ANON by going through /dev/zero; store
+     file descr to close on dcFreeWX at beginning of memory, as tiny hack */
+  int fd = open("/dev/zero", O_RDWR);
+  if(fd == -1)
+    return -1;
+  p = mmap(0, size+sizeof(int), MMAP_PROT_INIT, MAP_PRIVATE, fd, 0);
+  if(p == MAP_FAILED) {
+    close(fd);
+    return -1;
+  }
+  *(int*)p = fd;
+  p += sizeof(int);
+#else
+  p = mmap(0, size, MMAP_PROT_INIT, MAP_PRIVATE|MAP_ANON, -1, 0);
+  if(p == MAP_FAILED)
+    return -1;
+#endif
+
   *pp = p;
   return 0;
 }
 
+DCerror dcInitExecWX(void* p, size_t size)
+{
+#if defined(NO_MPROTECT)
+  return 0;
+#else
+
+#if !defined(MAP_ANON) && defined(DC_UNIX)
+  /* Fixup pointer for no-MAP_ANON workaround (see above) */
+  p -= sizeof(int);
+  size += sizeof(int);
+#endif
+  return mprotect(p, size, PROT_READ|PROT_EXEC);
+#endif
+}
+
 void dcFreeWX(void* p, size_t size)
 {
+#if !defined(MAP_ANON) && defined(DC_UNIX)
+  /* Close file descriptor for no-MAP_ANON workaround (see above) */
+  p -= sizeof(int);
+  size += sizeof(int);
+  close(*(int*)p);
+#endif
   munmap(p, size);
 }
+

data/dyncall/dyncallback/dyncall_alloc_wx_win32.c

@@ -6,7 +6,7 @@
  Description: Allocate write/executable memory  - Implementation for win32 platform
  License:
 
-   Copyright (c) 2007-2015 Daniel Adler <dadler@uni-goettingen.de>,
+   Copyright (c) 2007-2018 Daniel Adler <dadler@uni-goettingen.de>,
                            Tassilo Philipp <tphilipp@potion-studios.com>
 
    Permission to use, copy, modify, and distribute this software for any
@@ -28,7 +28,7 @@
 #include <windows.h>
 #include <assert.h>
 
-int dcAllocWX(size_t size, void** ptr)
+DCerror dcAllocWX(size_t size, void** ptr)
 {
   LPVOID p = VirtualAlloc(0, size, MEM_COMMIT, PAGE_EXECUTE_READWRITE);
   if (p == NULL) return -1;
@@ -36,6 +36,11 @@ int dcAllocWX(size_t size, void** ptr)
   return 0;
 }
 
+DCerror dcInitExecWX(void* p, size_t size)
+{
+  return 0;
+}
+
 void dcFreeWX(void* p, size_t size)
 {
   BOOL b = VirtualFree( p, 0, MEM_RELEASE);

data/dyncall/dyncallback/dyncall_args.c

@@ -6,7 +6,7 @@
  Description: Callback's Arguments VM - Implementation back-end selector
  License:
 
-   Copyright (c) 2007-2015 Daniel Adler <dadler@uni-goettingen.de>,
+   Copyright (c) 2007-2018 Daniel Adler <dadler@uni-goettingen.de>,
                            Tassilo Philipp <tphilipp@potion-studios.com>
 
    Permission to use, copy, modify, and distribute this software for any
@@ -27,28 +27,32 @@
 
 #if defined(DC__Arch_Intel_x86)
 #  include "dyncall_args_x86.c"
-#elif defined (DC__Arch_AMD64)
+#elif defined(DC__Arch_AMD64)
 #  include "dyncall_args_x64.c"
-#elif defined (DC__Arch_PPC32)
-#  if defined (DC__OS_Darwin)
+#elif defined(DC__Arch_PPC32)
+#  if defined(DC__OS_Darwin)
 #    include "dyncall_args_ppc32.c"
 #  else
 #    include "dyncall_args_ppc32_sysv.c"
 #  endif
-#elif defined (DC__Arch_PPC64)
+#elif defined(DC__Arch_PPC64)
 #  include "dyncall_args_ppc64.c"
-#elif defined (DC__Arch_ARM_ARM)
-#  include "dyncall_args_arm32_arm.c"
-#elif defined (DC__Arch_ARM_THUMB)
-#  include "dyncall_args_arm32_thumb.c"
-#elif defined (DC__Arch_MIPS)
-#  include "dyncall_args_mips.c"
-#elif defined (DC__Arch_Sparc)
+#elif defined(DC__Arch_ARM)
+#  include "dyncall_args_arm32.c"
+#elif defined(DC__Arch_MIPS)
+#  if defined(DC__ABI_MIPS_O32)
+#    include "dyncall_args_mips_o32.c"
+#  else
+#    include "dyncall_args_mips.c"
+#  endif
+#elif defined(DC__Arch_MIPS64)
+#    include "dyncall_args_mips64.c"
+#elif defined(DC__Arch_Sparc)
 #  include "dyncall_args_sparc32.c"
-#elif defined (DC__Arch_Sparcv9)
+#elif defined(DC__Arch_Sparc64)
 #  include "dyncall_args_sparc64.c"
-#elif defined (DC__Arch_ARM64)
-#  if defined (DC__OS_Darwin)
+#elif defined(DC__Arch_ARM64)
+#  if defined(DC__OS_Darwin)
 #    include "dyncall_args_arm64_apple.c"
 #  else
 #    include "dyncall_args_arm64.c"

data/dyncall/dyncallback/dyncall_args.h

@@ -6,7 +6,7 @@
  Description: Callback's Arguments VM - Interface
  License:
 
-   Copyright (c) 2007-2015 Daniel Adler <dadler@uni-goettingen.de>,
+   Copyright (c) 2007-2018 Daniel Adler <dadler@uni-goettingen.de>,
                            Tassilo Philipp <tphilipp@potion-studios.com>
 
    Permission to use, copy, modify, and distribute this software for any

data/dyncall/dyncallback/{dyncall_args_arm32_arm.c → dyncall_args_arm32.c}

@@ -2,11 +2,11 @@
 
  Package: dyncall
  Library: dyncallback
- File: dyncallback/dyncall_args_arm32_arm.c
- Description: Callback's Arguments VM - Implementation for ARM32 (ARM mode)
+ File: dyncallback/dyncall_args_arm32.c
+ Description: Callback's Arguments VM - Implementation for ARM32 (ARM and THUMB mode)
  License:
 
-   Copyright (c) 2007-2015 Daniel Adler <dadler@uni-goettingen.de>,
+   Copyright (c) 2007-2018 Daniel Adler <dadler@uni-goettingen.de>,
                            Tassilo Philipp <tphilipp@potion-studios.com>
 
    Permission to use, copy, modify, and distribute this software for any
@@ -25,7 +25,7 @@
 
 
 
-#include "dyncall_args_arm32_arm.h"
+#include "dyncall_args_arm32.h"
 
 
 static void arm_align_64(DCArgs* args)