rbdc 0.9.0 → 1.0.0

data/dyncall/dyncallback/dyncall_thunk.c

@@ -6,7 +6,7 @@
  Description: Thunk - Implementation Back-end selection
  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
@@ -39,15 +39,15 @@
 # endif
 #elif defined(DC__Arch_PPC64)
 # include "dyncall_thunk_ppc64.c"
-#elif defined(DC__Arch_ARM_ARM)
-#include "dyncall_thunk_arm32_arm.c"
-#elif defined(DC__Arch_ARM_THUMB)
-#include "dyncall_thunk_arm32_thumb.c"
+#elif defined(DC__Arch_ARM)
+#include "dyncall_thunk_arm32.c"
 #elif defined(DC__Arch_MIPS)
 #include "dyncall_thunk_mips.c"
+#elif defined(DC__Arch_MIPS64)
+#include "dyncall_thunk_mips64.c"
 #elif defined(DC__Arch_Sparc)
 #include "dyncall_thunk_sparc32.c"
-#elif defined(DC__Arch_Sparcv9)
+#elif defined(DC__Arch_Sparc64)
 #include "dyncall_thunk_sparc64.c"
 #elif defined(DC__Arch_ARM64)
 #include "dyncall_thunk_arm64.c"

data/dyncall/dyncallback/dyncall_thunk.h

@@ -6,7 +6,7 @@
  Description: Thunk - 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
@@ -47,10 +47,11 @@
  ** ppc:   r2
  ** arm:  r12
  ** arm64: x9
+ ** mips:  t4
  **
  **/
 
-#include "dyncall_macros.h"
+#include "../dyncall/dyncall_macros.h"
 
 typedef struct DCThunk_ DCThunk;
 
@@ -68,15 +69,15 @@ void   dcbInitThunk(DCThunk* p, void (*entry)());
 #include "dyncall_thunk_ppc32.h"
 #elif defined (DC__Arch_PPC64)
 #include "dyncall_thunk_ppc64.h"
-#elif defined (DC__Arch_ARM_ARM)
-#include "dyncall_thunk_arm32_arm.h"
-#elif defined (DC__Arch_ARM_THUMB)
-#include "dyncall_thunk_arm32_thumb.h"
+#elif defined (DC__Arch_ARM)
+#include "dyncall_thunk_arm32.h"
 #elif defined (DC__Arch_MIPS)
 #include "dyncall_thunk_mips.h"
+#elif defined (DC__Arch_MIPS64)
+#include "dyncall_thunk_mips64.h"
 #elif defined (DC__Arch_Sparc)
 #include "dyncall_thunk_sparc32.h"
-#elif defined (DC__Arch_Sparcv9)
+#elif defined (DC__Arch_Sparc64)
 #include "dyncall_thunk_sparc64.h"
 #elif defined (DC__Arch_ARM64)
 #include "dyncall_thunk_arm64.h"
@@ -88,3 +89,4 @@ void   dcbInitThunk(DCThunk* p, void (*entry)());
 
 
 #endif /* DYNCALL_THUNK_H */
+

data/dyncall/dyncallback/{dyncall_thunk_arm32_arm.c → dyncall_thunk_arm32.c}

@@ -2,11 +2,11 @@
 
  Package: dyncall
  Library: dyncallback
- File: dyncallback/dyncall_thunk_arm32_arm.c
- Description: Thunk - Implementation for ARM32 (ARM mode)
+ File: dyncallback/dyncall_thunk_arm32.c
+ Description: Thunk - 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,6 +24,8 @@
 */
 
 
+/* Since we can mix ARM and THUMB assembly, this works for both modes */
+
 #include "dyncall_thunk.h"
 
 void dcbInitThunk(DCThunk* p, void (*entry)())

data/dyncall/dyncallback/{dyncall_thunk_arm32_arm.h → dyncall_thunk_arm32.h}

@@ -2,11 +2,11 @@
 
  Package: dyncall
  Library: dyncallback
- File: dyncallback/dyncall_thunk_arm32_arm.h
- Description: Thunk - Header for ARM32 (ARM mode)
+ File: dyncallback/dyncall_thunk_arm32.h
+ Description: Thunk - Header 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,8 +24,8 @@
 */
 
 
-#ifndef DYNCALL_THUNK_ARM32_ARM_H
-#define DYNCALL_THUNK_ARM32_ARM_H
+#ifndef DYNCALL_THUNK_ARM32_H
+#define DYNCALL_THUNK_ARM32_H
 
 
 struct DCThunk_
@@ -34,8 +34,8 @@ struct DCThunk_
   void       (*entry)();
 };
 
-#define DCTHUNK_ARM32_ARM_SIZE 12
+#define DCTHUNK_ARM32_SIZE 12
 
 
-#endif /* DYNCALL_THUNK_ARM32_ARM_H */
+#endif /* DYNCALL_THUNK_ARM32_H */
 

data/dyncall/dyncallback/dyncall_thunk_arm64.c

@@ -6,8 +6,8 @@
  Description: 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_thunk_arm64.h

@@ -6,8 +6,8 @@
  Description: Thunk - Header 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
@@ -26,17 +26,12 @@
 #ifndef DYNCALL_THUNK_ARM64_H
 #define DYNCALL_THUNK_ARM64_H
 
-struct DCThunk_
-{
-                                // off  size
-                                //-----|----------
-  unsigned int code[4];		//   0    16
-  void (*entry)();		//  16     8
-  void* reserved;         	//  24     8
-
-                                //  32 total size
-  
-};
+struct DCThunk_          /* off  size */
+{                        /* ----|---- */
+  unsigned int code[4];  /*   0   16  */
+  void (*entry)();       /*  16    8  */
+  void* reserved;        /*  24    8  */
+};                       /*  32 total */
 
 #endif /* DYNCALL_THUNK_ARM64_H */
 

data/dyncall/dyncallback/dyncall_thunk_mips.c

@@ -6,7 +6,7 @@
  Description: Thunk - Implementation for MIPS
  License:
 
-   Copyright (c) 2013-2015 Daniel Adler <dadler@uni-goettingen.de>,
+   Copyright (c) 2013-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,8 +25,8 @@
 
 #include "dyncall_thunk.h"
 
-unsigned short hi16(x) { return ( (unsigned short) (((unsigned int)x)>>16UL) ); }
-unsigned short lo16(x) { return ( (unsigned short)  ((unsigned int)x)        ); }
+static unsigned short hi16(x) { return ( (unsigned short) (((unsigned int)x)>>16UL) ); }
+static unsigned short lo16(x) { return ( (unsigned short)  ((unsigned int)x)        ); }
 
 void dcbInitThunk(DCThunk* p, void (*entry)())
 {
@@ -35,32 +35,28 @@ void dcbInitThunk(DCThunk* p, void (*entry)())
 Thunk Register: $t4 ($12)
 According to o32abi: $t9 
 
-'The Linux/MIPS convention is that all PIC calls use t9 to hold the address of the called function.'
-[See MIPS Run, p.413]
+'The Linux/MIPS convention is that all PIC calls use t9 to hold the address of
+the called function.' [See MIPS Run, p.413]
 
     mips thunk code:
       lui $t4,      %hi(p)
       lui $t9,      %hi(entry)
       ori $t9, $t9, %lo(entry)
       jr  $t9
-      ori $t4, $t4, %lo(p)    
+      ori $t4, $t4, %lo(p)        ; branch delay slot
 
-thunk.o:     file format elf32-tradbigmips
-
-
-Disassembly of section .text:
 
 00000000 <thunk>:
-   0:	3c0c0000 	lui	t4,0x0
-   4:	3c190000 	lui	t9,0x0
-   8:	37390000 	ori	t9,t9,0x0
-   c:	03200008 	jr	t9
-  10:	00200825 	move	at,at
-  14:	358c0000 	ori	t4,t4,0x0
-  18:	00200825 	move	at,at
-  1c:	00200825 	move	at,at
-
-  */
+   0:  3c0c0000  lui  t4,0x0
+   4:  3c190000  lui  t9,0x0
+   8:  37390000  ori  t9,t9,0x0
+   c:  03200008  jr   t9
+  10:  00200825  move at,at
+  14:  358c0000  ori  t4,t4,0x0
+  18:  00200825  move at,at
+  1c:  00200825  move at,at
+
+*/
 
 #if defined(DC__Endian_BIG)
 

data/dyncall/dyncallback/dyncall_thunk_mips.h

@@ -6,7 +6,7 @@
  Description: Thunk - Header for MIPS
  License:
 
-   Copyright (c) 2013-2015 Daniel Adler <dadler@uni-goettingen.de>,
+   Copyright (c) 2013-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,8 +31,10 @@ struct DCThunk_
 {
   unsigned short data[6];
   unsigned int   jump;
-  unsigned short bddt[2];
+  unsigned short bddt[2]; // branch delay slots
 };
 
+#define DCTHUNK_MIPS_SIZE 20
+
 #endif /* DYNCALL_THUNK_MIPS_H */
 

data/dyncall/dyncallback/dyncall_thunk_mips64.c

@@ -0,0 +1,103 @@
+/*
+
+ Package: dyncall
+ Library: dyncallback
+ File: dyncallback/dyncall_thunk_mips64.c
+ Description: Thunk - Implementation for MIPS64
+ License:
+
+   Copyright (c) 2016-2018 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
+   copyright notice and this permission notice appear in all copies.
+
+   THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+   WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+   MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+   ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+   WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+   ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+*/
+
+#include "dyncall_thunk.h"
+
+#define b_48_63(x) ((unsigned short)(((unsigned long long)x)>>48UL))
+#define b_32_47(x) ((unsigned short)(((unsigned long long)x)>>32UL))
+#define b_16_31(x) ((unsigned short)(((unsigned long long)x)>>16UL))
+#define b_00_15(x) ((unsigned short) ((unsigned long long)x)       )
+
+void dcbInitThunk(DCThunk* p, void (*entry)())
+{
+/*
+
+Thunk Register: $t8 ($24)
+Call Address (sticking to t9 as for PIC calls on mips32): $t9 ($25)
+
+mips64 thunk code:
+        lui  $t8, p[48:63]
+        ori  $t8, $t8, p[32:47]
+        dsll $t8, 16
+        ori  $t8, $t8, p[16:31]
+        dsll $t8, 16
+        lui  $t9, entry[48:63]
+        ori  $t9, $t9, entry[32:47]
+        dsll $t9, 16
+        ori  $t9, $t9, entry[16:31]
+        dsll $t9, 16
+        ori  $t9, $t9, entry[0:15]
+        jr   $t9
+        ori  $t8, $t8, p[0:15]  ; branch delay slot
+
+Disassembly of section .text:
+
+0000000000000000 <thunk>:
+   0:   3c180000        lui     t8,0x0
+   4:   37180000        ori     t8,t8,0x0
+   8:   0018c438        dsll    t8,t8,0x10
+   c:   37180000        ori     t8,t8,0x0
+  10:   0018c438        dsll    t8,t8,0x10
+  14:   3c190000        lui     t9,0x0
+  18:   37390000        ori     t9,t9,0x0
+  1c:   0019cc38        dsll    t9,t9,0x10
+  20:   37390000        ori     t9,t9,0x0
+  24:   0019cc38        dsll    t9,t9,0x10
+  28:   37390000        ori     t9,t9,0x0
+  2c:   03200008        jr      t9
+  30:   37180000        ori     t8,t8,0x0
+
+*/
+
+#if defined(DC__Endian_BIG)
+
+  p->text.s[ 0] = 0x3c18; p->text.s[ 1] = b_48_63(p);     /* lui $t8, p[48:63] */
+  p->text.s[ 2] = 0x3718; p->text.s[ 3] = b_32_47(p);     /* ori $t8, $t8, p[32:47] */
+  p->text.s[ 6] = 0x3718; p->text.s[ 7] = b_16_31(p);     /* ori $t8, $t8, p[16:31] */
+  p->text.s[10] = 0x3c19; p->text.s[11] = b_48_63(entry); /* lui $t9, entry[48:63] */
+  p->text.s[12] = 0x3739; p->text.s[13] = b_32_47(entry); /* ori $t9, $t9, entry[32:47] */
+  p->text.s[16] = 0x3739; p->text.s[17] = b_16_31(entry); /* ori $t9, $t9, entry[16:31] */
+  p->text.s[20] = 0x3739; p->text.s[21] = b_00_15(entry); /* ori $t9, $t9, entry[0:15] */
+  p->text.s[24] = 0x3718; p->text.s[25] = b_00_15(p);     /* ori $t8, $t8, p[0:15] - branch delay slot */
+
+#else /* defined(DC__Endian_LITTLE) */
+
+  p->text.s[ 1] = 0x3c18; p->text.s[ 0] = b_48_63(p);     /* lui $t8, p[48:63] */
+  p->text.s[ 3] = 0x3718; p->text.s[ 2] = b_32_47(p);     /* ori $t8, $t8, p[32:47] */
+  p->text.s[ 7] = 0x3718; p->text.s[ 6] = b_16_31(p);     /* ori $t8, $t8, p[16:31] */
+  p->text.s[11] = 0x3c19; p->text.s[10] = b_48_63(entry); /* lui $t9, entry[48:63] */
+  p->text.s[13] = 0x3739; p->text.s[12] = b_32_47(entry); /* ori $t9, $t9, entry[32:47] */
+  p->text.s[17] = 0x3739; p->text.s[16] = b_16_31(entry); /* ori $t9, $t9, entry[16:31] */
+  p->text.s[21] = 0x3739; p->text.s[20] = b_00_15(entry); /* ori $t9, $t9, entry[0:15] */
+  p->text.s[25] = 0x3718; p->text.s[24] = b_00_15(p);     /* ori $t8, $t8, p[0:15] - branch delay slot */
+
+#endif
+
+  p->text.i[ 2] = 0x0018c438; /* dsll t8,t8,0x10 */
+  p->text.i[ 4] = 0x0018c438; /* dsll t8,t8,0x10 */
+  p->text.i[ 7] = 0x0019cc38; /* dsll t9,t9,0x10 */
+  p->text.i[ 9] = 0x0019cc38; /* dsll t9,t9,0x10 */
+  p->text.i[11] = 0x03200008; /* jr $t9 */
+}
+

data/dyncall/dyncallback/{dyncall_callback_arm32_thumb.h → dyncall_thunk_mips64.h}

@@ -2,12 +2,11 @@
 
  Package: dyncall
  Library: dyncallback
- File: dyncallback/dyncall_callback_arm32_thumb.h
- Description: Callback - Header for ARM32 (THUMB mode)
+ File: dyncallback/dyncall_thunk_mips64.h
+ Description: Thunk - Header for MIPS64
  License:
 
-   Copyright (c) 2007-2015 Daniel Adler <dadler@uni-goettingen.de>,
-                           Tassilo Philipp <tphilipp@potion-studios.com>
+   Copyright (c) 2016-2018 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
@@ -24,11 +23,19 @@
 */
 
 
+#ifndef DYNCALL_THUNK_MIPS64_H
+#define DYNCALL_THUNK_MIPS64_H
 
-#ifndef DYNCALL_CALLBACK_ARM32_THUMB_H_
-#define DYNCALL_CALLBACK_ARM32_THUMB_H_
+struct DCThunk_
+{
+  union {
+    unsigned short s[26];
+    unsigned int   i[13]; /* don't change from 'int', must be 32bit wide */
+  } text;
+  unsigned int padding; /* 4 bytes, to get struct size to multiple of 8 */
+};
 
-#include "dyncall_callback_arm32_arm.h" /* Uses same code as ARM mode. */
+#define DCTHUNK_MIPS64_SIZE 56
 
-#endif /* DYNCALL_CALLBACK_ARM32_THUMB_H_ */
+#endif /* DYNCALL_THUNK_MIPS64_H */
 

data/dyncall/dyncallback/dyncall_thunk_ppc32.c

@@ -6,7 +6,7 @@
  Description: Thunk - Implementation for ppc32 darwin/apple
  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,8 +26,8 @@
 
 #include "dyncall_thunk.h"
 
-unsigned short hi16(x) { return ( (unsigned short) (((unsigned int)x)>>16UL) ); }
-unsigned short lo16(x) { return ( (unsigned short)  ((unsigned int)x)        ); }   
+static unsigned short hi16(x) { return ( (unsigned short) (((unsigned int)x)>>16UL) ); }
+static unsigned short lo16(x) { return ( (unsigned short)  ((unsigned int)x)        ); }   
 
 void dcbInitThunk(DCThunk* p, void (*entry)())
 {
@@ -42,7 +42,7 @@ void dcbInitThunk(DCThunk* p, void (*entry)())
 
   p->code_load_hi = 0x3c40U;     /* lis  r2, HI16(p) */
   p->addr_self_hi = hi16(p);
-  p->code_load_lo = 0x6042U; 	 /* ori  r2, r2, LO16(p) */
+  p->code_load_lo = 0x6042U;     /* ori  r2, r2, LO16(p) */
   p->addr_self_lo = lo16(p);
   p->code_jump[0] = 0x81820014U; /* lwz   r12, 20(r2) */
   p->code_jump[1] = 0x7d8903a6U; /* mtclr r12 */

data/dyncall/dyncallback/dyncall_thunk_ppc32.h

@@ -6,7 +6,7 @@
  Description: Thunk - Header for ppc32 (darwin/sysv)
  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