rbdc 0.8.7 → 0.9.0

data/dyncall/autovar/autovar_CC.h

@@ -6,8 +6,8 @@
  Description: 
  License:
 
-   Copyright (c) 2011 Daniel Adler <dadler@uni-goettingen.de>,
-                      Tassilo Philipp <tphilipp@potion-studios.com>
+   Copyright (c) 2011-2015 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
@@ -22,6 +22,7 @@
    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 */
+
 #ifndef AUTOVAR_CC_H
 #define AUTOVAR_CC_H
 

data/dyncall/autovar/autovar_OS.h

@@ -6,8 +6,8 @@
  Description: 
  License:
 
-   Copyright (c) 2011 Daniel Adler <dadler@uni-goettingen.de>,
-                      Tassilo Philipp <tphilipp@potion-studios.com>
+   Copyright (c) 2011-2015 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
@@ -22,6 +22,7 @@
    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 */
+
 #ifndef AUTOVAR_OS_H
 #define AUTOVAR_OS_H
 

data/dyncall/autovar/autovar_OSFAMILY.h

@@ -6,8 +6,8 @@
  Description: 
  License:
 
-   Copyright (c) 2011 Daniel Adler <dadler@uni-goettingen.de>,
-                      Tassilo Philipp <tphilipp@potion-studios.com>
+   Copyright (c) 2011-2015 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
@@ -22,6 +22,7 @@
    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 */
+
 #ifndef AUTOVAR_OSFAMILY_H
 #define AUTOVAR_OSFAMILY_H
 

data/dyncall/buildsys/scripts/batch-build-linux.sh

@@ -1,11 +1,15 @@
+#!/bin/sh
+
+cd `dirname $0`/../../
+
 # Build libraries.
 
-make -f Makefile.generc clean all
+make -f Makefile.generic clean all
 
 # Build tests: dynload tests need '-ldl'.
 
 ( cd test ; make -f Makefile.generic clean )
-( cd test ; LDFLAGS=-ldl make -f Makefile.generic all-dynload )
+( cd test ; LDLIBS=-ldl make -f Makefile.generic all-dynload )
 ( cd test ; make -f Makefile.generic all )
 
 

data/dyncall/buildsys/scripts/batch-build-minix.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+cd `dirname $0`/../../
+
 # ---------------------------------------------------------- #
 # DynCall build script using Makefile.generic on Minix 3.1.8 #
 # ---------------------------------------------------------- #

data/dyncall/buildsys/scripts/batch-build-psp.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+cd `dirname $0`/../../
+
 # ------------------------------------------------------------- #
 # DynCall build script using Makefile.generic for PSP toolchain #
 # ------------------------------------------------------------- #
@@ -7,5 +9,6 @@
 # build libs and tests, but exclude dynload
 
 ./configure --target=PSP
-make libdyncall libdyncallback tests-libdyncallback tests-libdyncall
+#no callback for mips, yet, but build 'empty' libdyncallback to make linker happy
+make libdyncall libdyncallback tests-libdyncall # tests-libdyncallback
 

data/dyncall/buildsys/scripts/elf-to-psp-eboot.sh

@@ -0,0 +1,19 @@
+#!/bin/sh
+
+if ! [ -x "$1" ]; then
+	echo Usage: $0 \<elf\>
+	exit 1
+fi
+
+TITLE=`basename $1`
+SFO=/tmp/${TITLE}.sfo
+FIXED_ELF=/tmp/${TITLE}.fixed
+STRIPPED_ELF=/tmp/${TITLE}.stripped
+
+mksfo             dyncall_${TITLE} $SFO
+psp-fixup-imports -o $FIXED_ELF $1
+psp-strip         $FIXED_ELF -o $STRIPPED_ELF
+pack-pbp          EBOOT.PBP $SFO NULL NULL NULL NULL NULL $STRIPPED_ELF NULL
+rm $SFO
+rm $FIXED_ELF
+rm $STRIPPED_ELF

data/dyncall/configure

@@ -17,12 +17,20 @@ while [ $# -gt 0 ]; do
   shift 1
 # Shell common:
   case $X in
-    --help|-h)
+    --help|-h|-?)
 cat <<EOF
-usage: $0 --prefix=<dir> var1=name1..
+usage: $0 --<option>=<value> <var>=<value> ..
+
   --prefix=<dir>
-  --target=<platform>       MacOSX,iOS,iPhoneSimulator
-  --sdk=<version>
+  --target=<platform>       uname/special targets: MacOSX,iOS,iPhoneSimulator
+                            use "?" to get a list of explicitly specifiable
+                            targets
+  --sdk=<version>           Mac OS X/iOS SDK version (e.g. '6.1' or '10.9.3')
+                            Tested iOS SDK versions: 4.3, 6.1, 8.1 
+  --sdkroot=<dir>
+
+Useful variables CC, CXX, CFLAGS, CXXFLAGS, etc..
+
 EOF
       exit 1
       ;;
@@ -36,12 +44,15 @@ EOF
     --sdk=*)
       SDK=`printf -- "${X}" | cut -c 7-`
       ;;
+    --sdkroot=*)
+      SDKROOT=`printf -- "${X}" | cut -c 11-`
+      ;;
 # Environment variables:
     [A-Za-z_]*=*)
       printf "${X}\n" >>$C
       k=`printf "${X}" | cut -d = -f 1`
       v=`printf "${X}" | cut -d = -f 2`
-      export $k=$v
+      export $k="$v"
       ;;
 # Others fail:
     *)
@@ -56,18 +67,41 @@ case ${TARGET:=`uname`} in
     if [ -z "${CFLAGS}" ]; then
       printf "CFLAGS=-fPIC\n" >>$C
     fi
-    printf "LDFLAGS=-lm -ldl\n" >>$C
+    printf "LDLIBS=-lm -ldl\n" >>$C
     ;;
-  OpenBSD|NetBSD)
-    printf "LDFLAGS=-lm\n" >>$C
+  OpenBSD)
+    printf "LDLIBS=-lm\n" >>$C
+    ;;
+  DragonFly|NetBSD)
+    if [ -z "${CFLAGS}" ]; then
+      printf "CFLAGS=-fPIC\n" >>$C
+    fi
+    printf "LDLIBS=-lm\n" >>$C
     ;;
   FreeBSD)
-    printf "LDFLAGS=-lm\n" >>$C
+    if [ -z "${CFLAGS}" ]; then
+      printf "CFLAGS=-fPIC\n" >>$C
+    fi
+    printf "LDLIBS=-lm\n" >>$C
     printf "RM=rm -f\n" >>$C
     ;;
+  GNU/kFreeBSD)
+    if [ -z "${CFLAGS}" ]; then
+      printf "CFLAGS=-fPIC\n" >>$C
+    fi
+    printf "LDLIBS=-lm -ldl\n" >>$C
+    ;;
   MacOSX|Darwin)
-    printf "AR=libtool\n" >>$C
-    printf "ARFLAGS=-static -o\n" >>$C
+    # if Apple's libtool (not to be confused with GNU's) is available, which is according to libtool(1) "with -static [...] intended
+    # to replace ar(5) and ranlib", use it - if it is shadowed by some install of GNU's libtool assume that a foreign environment is
+    # intentionally used, and fall back to using 'ar rs' (the equivalent to 'libtool -static'), for compatibility:
+    if libtool -V >/dev/null 2>/dev/null; then # Apple's libtool has -V for version, which GNU does not.
+      printf "AR=libtool\n" >>$C
+      printf "ARFLAGS=-static -o\n" >>$C
+    else
+      printf "AR=ar\n" >>$C
+      printf "ARFLAGS=rs\n" >>$C # 's' is crucial for universal binary archives
+    fi
     if [ `uname -n` = 'iPhone' ]; then # building on iPhone itself, uname yields Darwin (gcc setup for current/correct arch)
       printf "CC=gcc\n" >>$C
     elif [ -z ${SDK} ]; then
@@ -75,13 +109,16 @@ case ${TARGET:=`uname`} in
         10.4.*)
           ARCHS="-arch ppc -arch i386 -arch x86_64" 
           ;;
-        10.[56].*)
+        10.5.*)
           ARCHS="-arch i386 -arch x86_64 -arch ppc"
           ;;
         10.6.*)
           ARCHS="-arch i386 -arch x86_64"
           ;;
-        10.[78].*)
+        10.10.*)
+          ARCHS="-arch x86_64 -arch i386"
+          ;;
+        10.[789].*)
           ARCHS="-arch x86_64 -arch i386"
           ;;
       esac
@@ -89,28 +126,40 @@ case ${TARGET:=`uname`} in
       printf "CFLAGS=${ARCHS}\n" >>$C
       printf "CXXFLAGS=${ARCHS}\n" >>$C
     else
-      SDKROOT="`xcode-select -print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX${SDK}.sdk"
+      if [ -z ${SDKROOT} ]; then
+        SDKROOT="`xcode-select -print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX${SDK}.sdk"
+      fi
       printf "CFLAGS=-isysroot ${SDKROOT}\n" >>$C
       printf "CXXFLAGS=-isysroot ${SDKROOT}\n" >>$C
     fi
     ;;
   iPhoneOS|iOS)
-    SDKROOT="`xcode-select -print-path`/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS${SDK}.sdk"
-    case "${SDK}" in
-      4.3)
-        ARCHS="-arch armv6"
-        ;;
-      6.1)
-        ARCHS="-arch armv7"
-        ;;
-    esac
+    if [ -z ${SDKROOT} ]; then
+      SDKROOT="`xcode-select -print-path`/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS${SDK}.sdk"
+    fi
+    if [ -z "${ARCHS}" ]; then
+      case "${SDK}" in
+        [45].*)
+          ARCHS="-arch armv6"
+          ;;
+        [67].*)
+          ARCHS="-arch armv7"
+          ;;
+        [89].*)
+          ARCHS="-arch armv7 -arch arm64"
+          ;;
+      esac
+    fi
+    printf "ARFLAGS=rs\n" >>$C # 's' is crucial for universal binary archives
     printf "ASFLAGS=${ARCHS} -isysroot ${SDKROOT}\n" >>$C
     printf "CFLAGS=${ARCHS} -isysroot ${SDKROOT}\n" >>$C
     printf "CXXFLAGS=${ARCHS} -isysroot ${SDKROOT}\n" >>$C
     printf "LDFLAGS=-Wl,-syslibroot ${SDKROOT}\n" >>$C
     ;;
   iPhoneSimulator)
-    SDKROOT="`xcode-select -print-path`/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator${SDK}.sdk"
+    if [ -z ${SDKROOT} ]; then
+      SDKROOT="`xcode-select -print-path`/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator${SDK}.sdk"
+    fi
     ARCHS="-arch i386"
     printf "ASFLAGS=${ARCHS} -isysroot ${SDKROOT}\n" >>$C
     printf "CFLAGS=${ARCHS} -isysroot ${SDKROOT}\n" >>$C
@@ -118,10 +167,10 @@ case ${TARGET:=`uname`} in
     printf "LDFLAGS=-Wl,-syslibroot ${SDKROOT}\n" >>$C
     ;;
   SunOS)
-    X=`type CC`
-    if [ $? -eq 0 ]; then
-      printf "CXX=CC\n" >>$C
-    fi
+    # open distributions often don't come with default cc and CC, check for common alternatives.
+    printf "CC=` (which cc || which gcc || which clang  ) | grep -v '^no '`\n" >>$C
+    printf "CXX=`(which CC || which g++ || which clang++) | grep -v '^no '`\n" >>$C # C++ compiler traditionally named CC
+    printf "CCC=${CXX}\n" >>$C # Sun make's rules use CCC for c++ compiler
     printf "LDLIBS=-lm\n" >>$C
     ;;
   Minix)
@@ -137,11 +186,15 @@ case ${TARGET:=`uname`} in
     printf "CFLAGS=-I${SDKROOT}/include/\n" >>$C
     printf "CXXFLAGS=-I${SDKROOT}/include/\n" >>$C
     # Pulling in dyncall libs below is a hack, for some reason psp-ld is super-picky about order.
-	# Use your C lib of choice, from the PSPSDK, or...
+    # Use your C lib of choice, from the PSPSDK, or...
     #printf "LDLIBS=-L${SDKROOT}/lib/ -L`dirname ${FULL}`/dyncall -L`dirname ${FULL}`/dyncallback -ldyncall_s -ldyncallback_s -lm -lpspdebug -lpspdisplay -lpspge -lpspctrl -lpspsdk -lstdc++ -lpsplibc -lpspnet -lpspnet_inet -lpspnet_apctl -lpspnet_resolver -lpsputility -lpspuser \n" >>$C
-	# ... newlib.
+    # ... newlib.
     printf "LDLIBS=-L${SDKROOT}/lib/ -L`dirname ${FULL}`/dyncall -L`dirname ${FULL}`/dyncallback -ldyncall_s -ldyncallback_s -lm -lpspdebug -lpspdisplay -lpspge -lpspctrl -lpspsdk -lstdc++ -lc       -lpspnet -lpspnet_inet -lpspnet_apctl -lpspnet_resolver -lpsputility -lpspuser \n" >>$C
     ;;
+  ?)
+    cat $0 | awk '/^esac$/{b=0}/^  [A-Za-z0-9|]+\)/{if(b==1) print substr($1,1,length($1)-1)}BEGIN{b=0}/^case.*TARGET.*uname.*in$/{b=1}' | tr '|' '\n'
+    exit 0
+    ;;
 esac
 
 BLDTOP="$PWD"

data/dyncall/dyncall/dyncall.3

@@ -70,6 +70,10 @@ semantics
 .Ft DCpointer
 .Fn dcCallPointer "DCCallVM * vm" "DCpointer funcptr"
 .Ft void
+.Fn dcArgF "DCCallVM * vm" "const DCsigchar * signature" "..."
+.Ft void
+.Fn dcVArgF "DCCallVM * vm" "const DCsigchar * signature" "va_list args"
+.Ft void
 .Fn dcCallF "DCCallVM * vm" "DCValue * result" "DCpointer funcptr" "const DCsigchar * signature" "..."
 .Ft void
 .Fn dcVCallF "DCCallVM * vm" "DCValue * result" "DCpointer funcptr" "const DCsigchar * signature" "va_list args"
@@ -110,10 +114,12 @@ sense (e.g. using a PowerPC calling convention on a MIPS platform) and are
 silently ignored.
 .Pp
 .Fn dcReset
-resets the internal stack of arguments and prepares it for the selected mode.
+resets the internal stack of arguments and prepares it for a new call.
 This function should be called after setting the call mode (using dcMode), but
 prior to binding arguments to the CallVM. Use it also when reusing a CallVM, as
 arguments don't get flushed automatically after a function call invocation.
+Note: you should also call this function after initial creation of the a CallVM
+object, as dcNewCallVM doesn't do this, implicitly.
 .Pp
 .Fn dcArgBool ,
 .Fn dcArgChar ,
@@ -149,12 +155,18 @@ using the same arguments can be issued. Call
 .Fn reset
 to clear the internal argument stack.
 .Pp
+.Fn dcArgF ,
+.Fn dcVArgF ,
 .Fn dcCallF
 and
 .Fn dcVCallF
-can be used to issue a printf-style function call, using a signature
-string encoding the argument types and return type. The return value will be
-stored in
+can be used to bind arguments in a printf-style call, using a signature
+string encoding the argument types and return type. The former 2 only bind
+the arguments to the
+.Ar vm
+object (and ignore return types specified in the
+signature), whereas the latter two issue a call to the given function pointer,
+afterwards. The return value will be stored in
 .Ar result .
 For information about the signature format, refer to the
 .Nm

data/dyncall/dyncall/dyncall.h

@@ -6,7 +6,7 @@
  Description: public header for library dyncall
  License:
 
-   Copyright (c) 2007-2011 Daniel Adler <dadler@uni-goettingen.de>, 
+   Copyright (c) 2007-2015 Daniel Adler <dadler@uni-goettingen.de>, 
                            Tassilo Philipp <tphilipp@potion-studios.com>
 
    Permission to use, copy, modify, and distribute this software for any
@@ -29,6 +29,8 @@
   dyncall C API
 
   REVISION
+  2015/07/08 added SYS_PPC64 system call
+  2015/01/16 added SYS_PPC32 system call
   2007/12/11 initial
   
 */
@@ -75,9 +77,15 @@ typedef struct DCstruct_    DCstruct;
 #define DC_CALL_C_X86_PLAN9            19
 #define DC_CALL_C_SPARC32              20
 #define DC_CALL_C_SPARC64              21
+#define DC_CALL_C_ARM64                22
+#define DC_CALL_C_PPC64                23
+#define DC_CALL_C_PPC64_LINUX          DC_CALL_C_PPC64 /* alias */
 #define DC_CALL_SYS_DEFAULT           200
 #define DC_CALL_SYS_X86_INT80H_LINUX  201
 #define DC_CALL_SYS_X86_INT80H_BSD    202
+#define DC_CALL_SYS_PPC32             210
+#define DC_CALL_SYS_PPC64             211
+
 /* Error codes. */
 
 #define DC_ERROR_NONE                0

data/dyncall/dyncall/dyncall_alloc.h

@@ -6,7 +6,7 @@
  Description: heap memory management interface (header only)
  License:
 
-   Copyright (c) 2007-2011 Daniel Adler <dadler@uni-goettingen.de>, 
+   Copyright (c) 2007-2015 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,7 @@
 */
 
 
+
 #ifndef DYNCALL_ALLOC_H
 #define DYNCALL_ALLOC_H
 

data/dyncall/dyncall/dyncall_api.c

@@ -6,7 +6,7 @@
  Description: C interface to call vm
  License:
 
-   Copyright (c) 2007-2011 Daniel Adler <dadler@uni-goettingen.de>, 
+   Copyright (c) 2007-2015 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,7 @@
 */
 
 
+
 #include "dyncall.h"
 #include "dyncall_callvm.h"
 #include "dyncall_alloc.h"

data/dyncall/dyncall/dyncall_call.S

@@ -6,7 +6,7 @@
  Description: assembly call kernel, auto-selected by gcc / Plan9 build system
  License:
 
-   Copyright (c) 2007-2011 Daniel Adler <dadler@uni-goettingen.de>, 
+   Copyright (c) 2007-2015 Daniel Adler <dadler@uni-goettingen.de>, 
                            Tassilo Philipp <tphilipp@potion-studios.com>
 
    Permission to use, copy, modify, and distribute this software for any
@@ -23,7 +23,9 @@
 
 */
 
+
 #include "dyncall_macros.h"
+
 /* Plan9 */
 #if defined(DC__OS_Plan9)
 #  if defined(DC__Arch_Intel_x86)
@@ -58,8 +60,12 @@
 #        include "dyncall_call_arm32_thumb_gas.s"
 #      endif
 #    endif
-#  elif defined(DC__Arch_PowerPC)
+#  elif defined(DC__Arch_ARM64)
+#    include "dyncall_call_arm64.S"
+#  elif defined(DC__Arch_PPC32)
 #    include "dyncall_call_ppc32.S"
+#  elif defined(DC__Arch_PPC64)
+#    include "dyncall_call_ppc64.S"
 #  elif defined(DC__Arch_MIPS) || defined(DC__Arch_MIPS64)
 #    include "dyncall_call_mips_gas.S"
 #  elif defined(DC__Arch_Sparcv9)
@@ -70,3 +76,4 @@
 #    error Unsupported Architecture.
 #  endif
 #endif
+