rbdc 0.9.0 → 1.0.0

data/dyncall/dyncallback/dyncall_args_sparc32.h

@@ -6,7 +6,7 @@
  Description: Callback's Arguments VM - Header for sparc32
  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
@@ -31,7 +31,7 @@
 
 struct DCArgs
 {
-  int dummy;
+  int *arg_ptr;
 };
 
 #endif /* DYNCALLBACK_ARGS_SPARC32_H */

data/dyncall/dyncallback/dyncall_args_sparc64.c

@@ -6,7 +6,7 @@
  Description: Callback's Arguments VM - Implementation for sparc64 - not yet
  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
@@ -26,17 +26,30 @@
 
 #include "dyncall_args_sparc64.h"
 
-DCint       dcbArgInt      (DCArgs* p) { return 0; }
-DCuint      dcbArgUInt     (DCArgs* p) { return 0; }
-DCulonglong dcbArgULongLong (DCArgs* p) {  return 0; }
-DClonglong  dcbArgLongLong(DCArgs* p) { return (DClonglong)dcbArgULongLong(p); }
-DClong      dcbArgLong     (DCArgs* p) { return (DClong)  dcbArgUInt(p); }
-DCulong     dcbArgULong    (DCArgs* p) { return (DCulong) dcbArgUInt(p); }
-DCchar      dcbArgChar     (DCArgs* p) { return (DCchar)  dcbArgUInt(p); }
-DCuchar     dcbArgUChar    (DCArgs* p) { return (DCuchar) dcbArgUInt(p); }
-DCshort     dcbArgShort    (DCArgs* p) { return (DCshort) dcbArgUInt(p); }
-DCushort    dcbArgUShort   (DCArgs* p) { return (DCushort)dcbArgUInt(p); }
-DCbool      dcbArgBool     (DCArgs* p) { return (DCbool)  dcbArgUInt(p); }
-DCpointer   dcbArgPointer  (DCArgs* p) { return (DCpointer)dcbArgUInt(p); }
-DCdouble    dcbArgDouble   (DCArgs* p) { return 0.0; }
-DCfloat     dcbArgFloat    (DCArgs* p) { return 0.0f; }
+DCulonglong dcbArgULongLong(DCArgs* p) { return p->arg_ptr[p->i++]; }
+DClonglong  dcbArgLongLong (DCArgs* p) { return (DClonglong)dcbArgULongLong(p); }
+DCulong     dcbArgULong    (DCArgs* p) { return (DCulong)   dcbArgULongLong(p); }
+DClong      dcbArgLong     (DCArgs* p) { return (DClong)    dcbArgULongLong(p); }
+DCuint      dcbArgUInt     (DCArgs* p) { return (DCuint)    dcbArgULongLong(p); }
+DCint       dcbArgInt      (DCArgs* p) { return (DCint)     dcbArgULongLong(p); }
+DCuchar     dcbArgUChar    (DCArgs* p) { return (DCuchar)   dcbArgULongLong(p); }
+DCchar      dcbArgChar     (DCArgs* p) { return (DCchar)    dcbArgULongLong(p); }
+DCushort    dcbArgUShort   (DCArgs* p) { return (DCushort)  dcbArgULongLong(p); }
+DCshort     dcbArgShort    (DCArgs* p) { return (DCshort)   dcbArgULongLong(p); }
+DCbool      dcbArgBool     (DCArgs* p) { return (DCbool)    dcbArgULongLong(p); }
+DCpointer   dcbArgPointer  (DCArgs* p) { return (DCpointer) dcbArgULongLong(p); }
+
+DCdouble dcbArgDouble(DCArgs* p)
+{
+	return (p->i < DCARGS_SPARC64_NUM_DOUBLE_REGS)
+		? p->dreg_data[p->i++]
+		: *(DCdouble*)(p->arg_ptr + p->i++);
+}
+
+DCfloat dcbArgFloat(DCArgs* p)
+{
+	return (p->i < DCARGS_SPARC64_NUM_DOUBLE_REGS)
+		? *((DCfloat*)(p->dreg_data + p->i++)+1)  /* +1 bc single-prec fp args are */
+		: *((DCfloat*)(p->arg_ptr   + p->i++)+1); /* right aligned in 64bit slot   */
+}
+

data/dyncall/dyncallback/dyncall_args_sparc64.h

@@ -3,10 +3,10 @@
  Package: dyncall
  Library: dyncallback
  File: dyncallback/dyncall_args_sparc64.h
- Description: Callback's Arguments VM - Header for sparc32 - not yet
+ Description: Callback's Arguments VM - Header for sparc64 - not yet
  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,9 +29,13 @@
 
 #include "dyncall_args.h"
 
+#define DCARGS_SPARC64_NUM_DOUBLE_REGS 16
 struct DCArgs
 {
-  int dummy;
+	/* Don't change order or types, laid out for asm code to fill in! */
+	DClonglong *arg_ptr;
+	DCdouble   dreg_data[DCARGS_SPARC64_NUM_DOUBLE_REGS];
+	DClonglong i; /* args fetched */
 };
 
 #endif /* DYNCALLBACK_ARGS_SPARC64_H */

data/dyncall/dyncallback/dyncall_args_x64.c

@@ -6,7 +6,7 @@
  Description: Callback's Arguments VM - Implementation for x64
  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_x64.h

@@ -6,7 +6,7 @@
  Description: Callback's Arguments VM - Header for x64
  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_x86.c

@@ -6,7 +6,7 @@
  Description: Callback's Arguments VM - Implementation for x86
  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_x86.h

@@ -6,7 +6,7 @@
  Description: Callback's Arguments VM - Header for x86
  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_callback.c

@@ -6,7 +6,7 @@
  Description: Callback - 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
@@ -28,23 +28,21 @@
 
 #if defined(DC__Arch_Intel_x86)
 #include "dyncall_callback_x86.c"
-#elif defined (DC__Arch_AMD64)
+#elif defined(DC__Arch_AMD64)
 #include "dyncall_callback_x64.c"
-#elif defined (DC__Arch_PPC32)
+#elif defined(DC__Arch_PPC32)
 #include "dyncall_callback_ppc32.c"
-#elif defined (DC__Arch_PPC64)
+#elif defined(DC__Arch_PPC64)
 #include "dyncall_callback_ppc64.c"
-#elif defined (DC__Arch_ARM_ARM)
-#include "dyncall_callback_arm32_arm.c"
-#elif defined (DC__Arch_ARM_THUMB)
-#include "dyncall_callback_arm32_thumb.c"
-#elif defined (DC__Arch_MIPS)
+#elif defined(DC__Arch_ARM)
+#include "dyncall_callback_arm32.c"
+#elif defined(DC__Arch_MIPS) || defined(DC__Arch_MIPS64)
 #include "dyncall_callback_mips.c"
-#elif defined (DC__Arch_Sparc)
+#elif defined(DC__Arch_Sparc)
 #include "dyncall_callback_sparc32.c"
-#elif defined (DC__Arch_Sparcv9)
+#elif defined(DC__Arch_Sparc64)
 #include "dyncall_callback_sparc64.c"
-#elif defined (DC__Arch_ARM64)
+#elif defined(DC__Arch_ARM64)
 #include "dyncall_callback_arm64.c"
 #endif
 

data/dyncall/dyncallback/dyncall_callback.h

@@ -6,7 +6,7 @@
  Description: Callback - 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
@@ -32,8 +32,7 @@
 
 typedef struct DCCallback DCCallback;
 
-// TODO: return value is the type encoded as a signature char (character of the set [vBcCsSiIjJlLfd]).
-
+// return value is the type encoded as a signature char (character of the set [vBcCsSiIjJlLfd]).
 typedef char (DCCallbackHandler)(DCCallback* pcb, DCArgs* args, DCValue* result, void* userdata);
 
 #ifdef __cplusplus
@@ -45,7 +44,6 @@ void        dcbInitCallback(DCCallback* pcb, const char* signature, DCCallbackHa
 void        dcbFreeCallback(DCCallback* pcb);
 void*       dcbGetUserData (DCCallback* pcb);
 
-
 #ifdef __cplusplus
 }
 #endif 

data/dyncall/dyncallback/dyncall_callback_arch.S

@@ -6,7 +6,7 @@
  Description: Callback Thunk - 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
@@ -64,16 +64,26 @@
 #    include "dyncall_callback_ppc32.S"
 #  elif defined(DC__Arch_PPC64)
 #    include "dyncall_callback_ppc64.S"
+#  elif defined(DC__Arch_MIPS) || defined(DC__Arch_MIPS64)
+#    include "dyncall_callback_mips_gas.S"
 #  elif defined(DC__Arch_ARM_ARM)
 #    include "dyncall_callback_arm32_arm_gas.S"
 #  elif defined(DC__Arch_ARM_THUMB)
 #    include "dyncall_callback_arm32_thumb_gas.S"
 #  elif defined(DC__Arch_Sparc)
 #    include "dyncall_callback_sparc32.s"
-#  elif defined(DC__Arch_Sparcv9)
+#  elif defined(DC__Arch_Sparc64)
 #    include "dyncall_callback_sparc64.s"
 #  elif defined(DC__Arch_ARM64)
 #    include "dyncall_callback_arm64.S"
 #  endif
 #endif
 
+
+/* Use .note.GNU-stack to explicitly indicate a non-exec stack, b/c of bad   */
+/* default behaviour when translating handwritten assembly files (needed on  */
+/* GNU platforms, Android and FreeBSD, as tests have shown).                 */
+#if (defined(DC__C_CLANG) || defined(DC__C_GNU)) && defined(__ELF__) && (defined(DC__OS_Linux) || defined(DC__OS_FreeBSD))
+.section .note.GNU-stack,"",%progbits
+#endif
+

data/dyncall/dyncallback/{dyncall_callback_arm32_arm.c → dyncall_callback_arm32.c}

@@ -2,11 +2,11 @@
 
  Package: dyncall
  Library: dyncallback
- File: dyncallback/dyncall_callback_arm32_arm.c
- Description: Callback - Implementation for ARM32 (ARM mode)
+ File: dyncallback/dyncall_callback_arm32.c
+ Description: Callback - 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
@@ -24,15 +24,21 @@
 */
 
 
-
-#include "dyncall_callback_arm32_arm.h"
-#include "dyncall_args_arm32_arm.h"
-
+#include "dyncall_callback.h"
 #include "dyncall_alloc_wx.h"
-#include "dyncall_signature.h"
+#include "dyncall_thunk.h"
 
+/* Callback symbol. */
 extern void dcCallbackThunkEntry();
 
+struct DCCallback
+{
+  DCThunk  	         thunk;    // offset 0
+  DCCallbackHandler* handler;  // offset 12
+  void*              userdata; // offset 16
+};
+
+
 void dcbInitCallback(DCCallback* pcb, const char* signature, DCCallbackHandler* handler, void* userdata)
 {
   pcb->handler  = handler;
@@ -45,10 +51,18 @@ DCCallback* dcbNewCallback(const char* signature, DCCallbackHandler* handler, vo
   int err;
   DCCallback* pcb;
   err = dcAllocWX(sizeof(DCCallback), (void**)&pcb);
-  if(err || !pcb)
-    return 0;
+  if(err)
+    return NULL;
+
   dcbInitThunk(&pcb->thunk, dcCallbackThunkEntry);
   dcbInitCallback(pcb, signature, handler, userdata);
+
+  err = dcInitExecWX(pcb, sizeof(DCCallback));
+  if(err) {
+    dcFreeWX(pcb, sizeof(DCCallback));
+    return NULL;
+  }
+
   return pcb;
 }
 
@@ -62,3 +76,4 @@ void* dcbGetUserData(DCCallback* pcb)
 {
   return pcb->userdata;
 }
+

data/dyncall/dyncallback/dyncall_callback_arm32_arm_apple.s

@@ -30,15 +30,15 @@
 .globl _dcCallbackThunkEntry
 .align 4
 /* sizes */
-.set DCThunk_size   ,   8
-.set DCArgs_size    ,  24
-.set DCCallback_size,  20
-.set DCValue_size   ,   8
+DCThunk_size    =   8
+DCArgs_size     =  24
+DCCallback_size =  20
+DCValue_size    =   8
 
 /* struct DCCallback offsets and size */
-.set CTX_thunk      ,   0
-.set CTX_handler    ,  12
-.set CTX_userdata   ,  16
+CTX_thunk       =   0
+CTX_handler     =  12
+CTX_userdata    =  16
 
 
 /* Called by thunk - thunk stores pointer to DCCallback in r12 */

data/dyncall/dyncallback/dyncall_callback_arm32_arm_gas.S

@@ -6,7 +6,7 @@
  Description: Callback Thunk - Implementation for ARM32 (ARM mode)
  License:
 
-   Copyright (c) 2007-2011 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
@@ -31,16 +31,16 @@
 .globl dcCallbackThunkEntry
 
 /* sizes */
-/* .set DCThunk_size   ,   8 */
-/* .set DCArgs_size    ,  24 */ /* for EABI/ATPCS/... */
-/* .set DCArgs_size    ,  96 */ /* for armhf          */
-/* .set DCCallback_size,  20 */
-.set DCValue_size   ,   8
+/* DCThunk_size    =   8 */
+/* DCArgs_size     =  24 */ /* for EABI/ATPCS/... */
+/* DCArgs_size     =  96 */ /* for armhf          */
+/* DCCallback_size =  20 */
+DCValue_size    =   8
 
 /* struct DCCallback offsets and size */
-/* .set CTX_thunk      ,   0 */
-.set CTX_handler    ,  12
-.set CTX_userdata   ,  16
+/* CTX_thunk       =   0 */
+CTX_handler     =  12
+CTX_userdata    =  16
 
 
 /* Called by thunk - thunk stores pointer to DCCallback in r12 */

data/dyncall/dyncallback/dyncall_callback_arm32_thumb_apple.S

@@ -6,7 +6,7 @@
  Description: Callback Thunk - Implementation for ARM32 (THUMB mode)
  License:
 
-   Copyright (c) 2007-2011 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_callback_arm32_thumb_gas.S

@@ -6,7 +6,7 @@
  Description: Callback Thunk - Implementation for ARM32 (THUMB mode)
  License:
 
-   Copyright (c) 2007-2013 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_callback_arm64.S

@@ -6,8 +6,8 @@
  Description: Callback Thunk - Implementation for ARM64 / ARMv8 / AAPCS64
  License:
 
-   Copyright (c) 2015 Daniel Adler <dadler@uni-goettingen.de>,
-                      Tassilo Philipp <tphilipp@potion-studios.com>
+   Copyright (c) 2015-2018 Daniel Adler <dadler@uni-goettingen.de>,
+                           Tassilo Philipp <tphilipp@potion-studios.com>
 
    Permission to use, copy, modify, and distribute this software for any
    purpose with or without fee is hereby granted, provided that the above

data/dyncall/dyncallback/dyncall_callback_arm64.c

@@ -6,8 +6,8 @@
  Description: Callback - Implementation for ARM64 / ARMv8 / AAPCS64
  License:
 
-   Copyright (c) 2015 Daniel Adler <dadler@uni-goettingen.de>,
-                      Tassilo Philipp <tphilipp@potion-studios.com>
+   Copyright (c) 2015-2018 Daniel Adler <dadler@uni-goettingen.de>,
+                           Tassilo Philipp <tphilipp@potion-studios.com>
 
    Permission to use, copy, modify, and distribute this software for any
    purpose with or without fee is hereby granted, provided that the above
@@ -23,23 +23,21 @@
 
 */
 
+
 #include "dyncall_callback.h"
 #include "dyncall_alloc_wx.h"
 #include "dyncall_thunk.h"
 
+/* Callback symbol. */
 extern void dcCallbackThunkEntry();
 
-struct DCCallback
-{
-                                //  off  size
-                                // ----|-----
-  DCThunk            thunk;	//   0     32
-  DCCallbackHandler* handler; 	//  32      8
-  void*              userdata;	//  40      8
-                                //
-                                //  size   48 
-                                // aligned 48 
-};
+struct DCCallback               /*  off  size */
+{                               /* ----|----- */
+  DCThunk            thunk;     /*   0     32 */
+  DCCallbackHandler* handler;   /*  32      8 */
+  void*              userdata;  /*  40      8 */
+};                              /* total   48 */ 
+                                /* aligned 48 */ 
 
 void dcbInitCallback(DCCallback* pcb, const char* signature, DCCallbackHandler* handler, void* userdata)
 {
@@ -52,10 +50,18 @@ DCCallback* dcbNewCallback(const char* signature, DCCallbackHandler* handler, vo
   int err;
   DCCallback* pcb;
   err = dcAllocWX(sizeof(DCCallback), (void**) &pcb);
-  if (err != 0) return 0;
+  if(err)
+    return NULL;
 
   dcbInitThunk(&pcb->thunk, dcCallbackThunkEntry);
   dcbInitCallback(pcb, signature, handler, userdata);
+
+  err = dcInitExecWX(pcb, sizeof(DCCallback));
+  if(err) {
+    dcFreeWX(pcb, sizeof(DCCallback));
+    return NULL;
+  }
+
   return pcb;
 }