Index: configure.ac ================================================================== --- configure.ac +++ configure.ac @@ -48,17 +48,18 @@ enable_shared="no" with_tls="no" supports_amiga_lib="yes" AS_IF([test x"$enable_amiga_lib" != x"no"], [ + AC_SUBST(OBJFW_AMIGA_LIB, 'objfw${OBJFW_LIB_MAJOR}.library') AC_SUBST(OBJFWRT_AMIGA_LIB, ['objfwrt${OBJFWRT_LIB_MAJOR}.library']) dnl For 68000, GCC emits calls to helper functions that dnl do not work properly in a library. - t="-mcpu=68020 -fbaserel -noixemul -ffreestanding" + t="-mcpu=68020 -fbaserel32 -noixemul -ffreestanding" AC_SUBST(AMIGA_LIB_CFLAGS, $t) - t="$t -resident -nostartfiles -nodefaultlibs -ldebug -lc" + t="$t -resident32 -nostartfiles -nodefaultlibs -ldebug -lc" AC_SUBST(AMIGA_LIB_LDFLAGS, $t) ]) AC_SUBST(LIBBASES_M, libbases.m) ;; @@ -81,16 +82,19 @@ enable_files="yes" # Required for reading ENV: enable_shared="no" supports_amiga_lib="yes" AS_IF([test x"$enable_amiga_lib" != x"no"], [ + AC_SUBST(OBJFW_AMIGA_LIB, + ['objfw${OBJFW_LIB_MAJOR}ppc.library']) AC_SUBST(OBJFWRT_AMIGA_LIB, - ['objfwrt${OBJFW_LIB_MAJOR}ppc.library']) + ['objfwrt${OBJFWRT_LIB_MAJOR}ppc.library']) t="-mresident32 -ffreestanding -noixemul" AC_SUBST(AMIGA_LIB_CFLAGS, $t) - t="-mresident32 -nostartfiles -nodefaultlibs -noixemul -ldebug" - AC_SUBST(AMIGA_LIB_LDFLAGS, "$t -lc") + t="-mresident32 -nostartfiles -nodefaultlibs -noixemul" + t="$t -laboxstubs -labox -lmath -ldebug -lc" + AC_SUBST(AMIGA_LIB_LDFLAGS, $t) ]) AC_SUBST(LIBBASES_M, libbases.m) ;; *-msdosdjgpp*) @@ -413,10 +417,14 @@ mingw*) AC_CHECK_TOOL(RC, windres) ;; esac +AC_ARG_ENABLE(amiga-lib, + AS_HELP_STRING([--disable-amiga-lib], [do not build Amiga library])) +AS_IF([test x"$supports_amiga_lib" != x"yes"], [enable_amiga_lib="no"]) + AC_ARG_ENABLE(shared, AS_HELP_STRING([--disable-shared], [do not build shared library])) AS_IF([test x"$enable_shared" != x"no"], [ BUILDSYS_SHARED_LIB BUILDSYS_PLUGIN @@ -428,33 +436,34 @@ BUILDSYS_FRAMEWORK([ AC_SUBST(OBJFW_FRAMEWORK, "ObjFW.framework") build_framework="yes" ]) + + AC_SUBST(OBJFW_LIBS, "-lobjfw") ], [ - AC_DEFINE(OF_NO_SHARED, 1, [Whether no shared library was built]) - AC_SUBST(LIBOBJFW_DEP, "../src/libobjfw.a") - AC_SUBST(LIBOBJFW_DEP_LVL2, "../../src/libobjfw.a") + AS_IF([test x"$enable_amiga_lib" != x"no"], [ + AC_SUBST(OBJFW_LIBS, "-lobjfw.library") + tmp="../src/linklib/libobjfw.library.a" + AC_SUBST(LIBOBJFW_DEP, "$tmp") + AC_SUBST(LIBOBJFW_DEP_LVL2, "../$tmp") + ], [ + AC_SUBST(OBJFW_LIBS, "-lobjfw") + AC_SUBST(LIBOBJFW_DEP, "../src/libobjfw.a") + AC_SUBST(LIBOBJFW_DEP_LVL2, "../../src/libobjfw.a") + + AC_DEFINE(OF_NO_SHARED, 1, [Whether no shared library is built]) + ]) ]) AS_IF([test x"$build_framework" = x"yes"], [ TESTS_LIBS="-framework ObjFW \${RUNTIME_FRAMEWORK_LIBS} $TESTS_LIBS" TESTS_LIBS="-F../src -F../src/runtime $TESTS_LIBS" ], [ - TESTS_LIBS="\${RUNTIME_LIBS} $TESTS_LIBS" + TESTS_LIBS="\${OBJFW_LIBS} \${RUNTIME_LIBS} $TESTS_LIBS" TESTS_LIBS="-L../src/runtime -L../src/runtime/linklib $TESTS_LIBS" - TESTS_LIBS="-L../src -lobjfw $TESTS_LIBS" -]) - -AC_ARG_ENABLE(amiga-lib, - AS_HELP_STRING([--disable-amiga-lib], [do not build Amiga library])) -AS_IF([test x"$supports_amiga_lib" != x"yes"], [enable_amiga_lib="no"]) -AS_IF([test x"$enable_amiga_lib" != x"no"], [ - AC_SUBST(OBJFW_STATIC_LIB, "libobjfw.a") - AC_SUBST(EXCEPTIONS_A, "exceptions.a") - AC_SUBST(FORWARDING_A, "forwarding.a") - AC_SUBST(LOOKUP_ASM_AMIGALIB_A, "lookup-asm.amigalib.a") + TESTS_LIBS="-L../src -L../src/linklib $TESTS_LIBS" ]) AC_ARG_ENABLE(static, AS_HELP_STRING([--enable-static], [build static library])) AS_IF([test x"$enable_shared" = x"no" -a x"$enable_amiga_lib" = x"no"], [ enable_static="yes" @@ -463,10 +472,16 @@ AC_SUBST(OBJFW_STATIC_LIB, "libobjfw.a") AC_SUBST(EXCEPTIONS_A, "exceptions.a") AC_SUBST(FORWARDING_A, "forwarding.a") AC_SUBST(LOOKUP_ASM_A, "lookup-asm.a") ]) + +AS_IF([test x"$enable_amiga_lib" != x"no"], [ + AC_SUBST(EXCEPTIONS_AMIGALIB_A, "exceptions.amigalib.a") + AC_SUBST(FORWARDING_AMIGALIB_A, "forwarding.amigalib.a") + AC_SUBST(LOOKUP_ASM_AMIGALIB_A, "lookup-asm.amigalib.a") +]) AC_DEFINE_UNQUOTED(PLUGIN_SUFFIX, "$PLUGIN_SUFFIX", [Suffix for plugins]) AS_IF([test x"$enable_files" != x"no" -a x"$PLUGIN_SUFFIX" != x""], [ AC_SUBST(USE_SRCS_PLUGINS, '${SRCS_PLUGINS}') AC_SUBST(TESTPLUGIN, "plugin") @@ -481,10 +496,14 @@ TESTPLUGIN_LIBS="-L../../src -L../../src/runtime" TESTPLUGIN_LIBS="$TESTPLUGIN_LIBS -lobjfw \${RUNTIME_LIBS}" ]) AC_SUBST(TESTPLUGIN_LIBS) ]) + +AS_IF([test x"$enable_amiga_lib" != x"no"], [ + AC_SUBST(LINKLIB, linklib) +]) AC_MSG_CHECKING(whether we need -D_GNU_SOURCE) AC_EGREP_CPP(egrep_cpp_yes, [ #include @@ -598,11 +617,10 @@ AC_SUBST(RUNTIME_FRAMEWORK_LIBS, "-framework ObjFWRT") ]) AS_IF([test x"$enable_amiga_lib" != x"no"], [ AC_SUBST(RUNTIME_LIBS, "-lobjfwrt.library") - AC_SUBST(LINKLIB, linklib) tmp="../src/runtime/linklib/libobjfwrt.library.a" AC_SUBST(LIBOBJFWRT_DEP, "$tmp") AC_SUBST(LIBOBJFWRT_DEP_LVL2, "../$tmp") ], [ AC_SUBST(RUNTIME_LIBS, "-lobjfwrt") @@ -953,11 +971,14 @@ ]) AC_SUBST(ENCODINGS_SRCS) AS_IF([test x"$enable_shared" != x"no"], [ AC_SUBST(ENCODINGS_LIB_A, "encodings.lib.a") ]) -AS_IF([test x"$enable_static" = x"yes" -o x"$enable_shared" = x"no"], [ +AS_IF([test x"$enable_amiga_lib" != x"no"], [ + AC_SUBST(ENCODINGS_AMIGALIB_A, "encodings.amigalib.a") +]) +AS_IF([test x"$enable_static" = x"yes"], [ AC_SUBST(ENCODINGS_A, "encodings.a") ]) AC_CHECK_FUNCS(arc4random arc4random_buf getrandom random, break) @@ -971,10 +992,13 @@ dnl When using it with code that uses __thread, it freezes the process dnl so that it has to be killed using SIGKILL. dnl When disabling __thread, it doesn't freeze, but all symbols are dnl wrong. ;; +morphos*) + dnl MorphOS has a dladdr symbol, but it doesn't work. + ;; *) AC_CHECK_FUNCS(dladdr) ;; esac Index: extra.mk.in ================================================================== --- extra.mk.in +++ extra.mk.in @@ -1,8 +1,9 @@ OBJFW_SHARED_LIB = @OBJFW_SHARED_LIB@ OBJFW_STATIC_LIB = @OBJFW_STATIC_LIB@ OBJFW_FRAMEWORK = @OBJFW_FRAMEWORK@ +OBJFW_AMIGA_LIB = @OBJFW_AMIGA_LIB@ OBJFW_LIB_MAJOR = 0 OBJFW_LIB_MINOR = 0 OBJFW_LIB_MAJOR_MINOR = ${OBJFW_LIB_MAJOR}.${OBJFW_LIB_MINOR} OBJFWRT_SHARED_LIB = @OBJFWRT_SHARED_LIB@ @@ -23,15 +24,18 @@ BIN_PREFIX = @BIN_PREFIX@ BRIDGE = @BRIDGE@ CVINCLUDE_INLINE_H = @CVINCLUDE_INLINE_H@ ENCODINGS_A = @ENCODINGS_A@ +ENCODINGS_AMIGALIB_A = @ENCODINGS_AMIGALIB_A@ ENCODINGS_LIB_A = @ENCODINGS_LIB_A@ ENCODINGS_SRCS = @ENCODINGS_SRCS@ EXCEPTIONS_A = @EXCEPTIONS_A@ +EXCEPTIONS_AMIGALIB_A = @EXCEPTIONS_AMIGALIB_A@ EXCEPTIONS_LIB_A = @EXCEPTIONS_LIB_A@ FORWARDING_A = @FORWARDING_A@ +FORWARDING_AMIGALIB_A = @FORWARDING_AMIGALIB_A@ FORWARDING_LIB_A = @FORWARDING_LIB_A@ LIBBASES_M = @LIBBASES_M@ LIBOBJFWRT_DEP = @LIBOBJFWRT_DEP@ LIBOBJFWRT_DEP_LVL2 = @LIBOBJFWRT_DEP_LVL2@ LIBOBJFW_DEP = @LIBOBJFW_DEP@ @@ -40,10 +44,11 @@ LOOKUP_ASM_A = @LOOKUP_ASM_A@ LOOKUP_ASM_AMIGALIB_A = @LOOKUP_ASM_AMIGALIB_A@ LOOKUP_ASM_LIB_A = @LOOKUP_ASM_LIB_A@ MAP_LDFLAGS = @MAP_LDFLAGS@ OBJC_SYNC = @OBJC_SYNC@ +OBJFW_LIBS = @OBJFW_LIBS@ OBJFW_NEW = @OBJFW_NEW@ OFARC = @OFARC@ OFDNS = @OFDNS@ OFHASH = @OFHASH@ OFHTTP = @OFHTTP@ Index: generators/library/LibraryGenerator.m ================================================================== --- generators/library/LibraryGenerator.m +++ generators/library/LibraryGenerator.m @@ -29,53 +29,57 @@ @end OF_APPLICATION_DELEGATE(LibraryGenerator) @implementation LibraryGenerator -- (void)applicationDidFinishLaunching: (OFNotification *)notification +- (void)generateInDirectory: (OFString *)directory { OFIRI *sourcesIRI = [[OFFileManager defaultManager].currentDirectoryIRI - IRIByAppendingPathComponent: @"../../src"]; - OFIRI *runtimeLibraryIRI = [sourcesIRI - IRIByAppendingPathComponent: @"runtime/amiga-library.xml"]; - OFIRI *runtimeLinkLibIRI = [sourcesIRI - IRIByAppendingPathComponent: @"runtime/linklib/linklib.m"]; - OFIRI *runtimeGlueHeaderIRI = [sourcesIRI - IRIByAppendingPathComponent: @"runtime/amiga-glue.h"]; - OFIRI *runtimeGlueIRI = [sourcesIRI - IRIByAppendingPathComponent: @"runtime/amiga-glue.m"]; - OFIRI *runtimeFuncArrayIRI = [sourcesIRI - IRIByAppendingPathComponent: @"runtime/amiga-funcarray.inc"]; - OFXMLElement *runtimeLibrary = [OFXMLElement elementWithStream: - [OFFile fileWithPath: runtimeLibraryIRI.fileSystemRepresentation - mode: @"r"]]; - OFFile *runtimeLinkLib = - [OFFile fileWithPath: runtimeLinkLibIRI.fileSystemRepresentation - mode: @"w"]; - OFFile *runtimeGlueHeader = - [OFFile fileWithPath: runtimeGlueHeaderIRI.fileSystemRepresentation - mode: @"w"]; - OFFile *runtimeGlue = - [OFFile fileWithPath: runtimeGlueIRI.fileSystemRepresentation - mode: @"w"]; - OFFile *runtimeFuncArray = - [OFFile fileWithPath: runtimeFuncArrayIRI.fileSystemRepresentation - mode: @"w"]; - LinkLibGenerator *runtimeLinkLibGenerator = [[[LinkLibGenerator alloc] - initWithLibrary: runtimeLibrary - implementation: runtimeLinkLib] autorelease]; - GlueGenerator *runtimeGlueGenerator = [[[GlueGenerator alloc] - initWithLibrary: runtimeLibrary - header: runtimeGlueHeader - implementation: runtimeGlue] autorelease]; - FuncArrayGenerator *runtimeFuncArrayGenerator; - runtimeFuncArrayGenerator = [[[FuncArrayGenerator alloc] - initWithLibrary: runtimeLibrary - include: runtimeFuncArray] autorelease]; - - [runtimeLinkLibGenerator generate]; - [runtimeGlueGenerator generate]; - [runtimeFuncArrayGenerator generate]; + IRIByAppendingPathComponent: directory]; + OFIRI *libraryIRI = [sourcesIRI + IRIByAppendingPathComponent: @"amiga-library.xml"]; + OFIRI *linkLibIRI = [sourcesIRI + IRIByAppendingPathComponent: @"linklib/linklib.m"]; + OFIRI *glueHeaderIRI = [sourcesIRI + IRIByAppendingPathComponent: @"amiga-glue.h"]; + OFIRI *glueIRI = [sourcesIRI + IRIByAppendingPathComponent: @"amiga-glue.m"]; + OFIRI *funcArrayIRI = [sourcesIRI + IRIByAppendingPathComponent: @"amiga-funcarray.inc"]; + OFXMLElement *library = [OFXMLElement elementWithStream: + [OFFile fileWithPath: libraryIRI.fileSystemRepresentation + mode: @"r"]]; + OFFile *linkLib = + [OFFile fileWithPath: linkLibIRI.fileSystemRepresentation + mode: @"w"]; + OFFile *glueHeader = + [OFFile fileWithPath: glueHeaderIRI.fileSystemRepresentation + mode: @"w"]; + OFFile *glue = + [OFFile fileWithPath: glueIRI.fileSystemRepresentation mode: @"w"]; + OFFile *funcArray = + [OFFile fileWithPath: funcArrayIRI.fileSystemRepresentation + mode: @"w"]; + LinkLibGenerator *linkLibGenerator = [[[LinkLibGenerator alloc] + initWithLibrary: library + implementation: linkLib] autorelease]; + GlueGenerator *glueGenerator = [[[GlueGenerator alloc] + initWithLibrary: library + header: glueHeader + implementation: glue] autorelease]; + FuncArrayGenerator *funcArrayGenerator = [[[FuncArrayGenerator alloc] + initWithLibrary: library + include: funcArray] autorelease]; + + [linkLibGenerator generate]; + [glueGenerator generate]; + [funcArrayGenerator generate]; +} + +- (void)applicationDidFinishLaunching: (OFNotification *)notification +{ + [self generateInDirectory: @"../../src"]; + [self generateInDirectory: @"../../src/runtime"]; [OFApplication terminate]; } @end Index: generators/library/LinkLibGenerator.m ================================================================== --- generators/library/LinkLibGenerator.m +++ generators/library/LinkLibGenerator.m @@ -82,10 +82,16 @@ [_impl writeFormat: @"\n" @"extern struct Library *%@;\n" @"\n", libBase]; + + [_impl writeString: + @"#if OF_GCC_VERSION >= 1100\n" + @"# pragma GCC diagnostic ignored \"-Warray-parameter\"\n" + @"#endif\n" + @"\n"]; functions = [_library elementsForName: @"function"]; for (OFXMLElement *function in functions) { OFString *name = [function attributeForName: @"name"].stringValue; @@ -145,12 +151,11 @@ [_impl writeString: @", "]; [_impl writeString: argType]; if (![argType hasSuffix: @"*"]) [_impl writeString: @" "]; - [_impl writeFormat: @"__asm__(\"%@\")", - m68kReg]; + [_impl writeFormat: @"__asm__(\"%@\")", m68kReg]; } [_impl writeFormat: @"))(((uintptr_t)%@) - %zu))(", libBase, 30 + funcIndex * 6]; Index: src/Makefile ================================================================== --- src/Makefile +++ src/Makefile @@ -1,14 +1,22 @@ include ../extra.mk SUBDIRS = ${RUNTIME} exceptions encodings forwarding -SUBDIRS_AFTER = ${BRIDGE} ${TLS} +SUBDIRS_AFTER = ${LINKLIB} ${BRIDGE} ${TLS} +CLEAN = amiga-end.amigalib.dep \ + amiga-end.amigalib.o \ + amiga-glue.amigalib.dep \ + amiga-glue.amigalib.o \ + amiga-library-functable.inc \ + amiga-library.amigalib.dep \ + amiga-library.amigalib.o DISTCLEAN = Info.plist objfw-defs.h SHARED_LIB = ${OBJFW_SHARED_LIB} STATIC_LIB = ${OBJFW_STATIC_LIB} FRAMEWORK = ${OBJFW_FRAMEWORK} +AMIGA_LIB = ${OBJFW_AMIGA_LIB} LIB_MAJOR = ${OBJFW_LIB_MAJOR} LIB_MINOR = ${OBJFW_LIB_MINOR} SRCS = OFApplication.m \ OFArray.m \ @@ -75,10 +83,11 @@ OFSHA512Hash.m \ OFScrypt.m \ OFSecureData.m \ OFSeekableStream.m \ OFSet.m \ + OFSettings.m \ OFSortedList.m \ OFStdIOStream.m \ OFStream.m \ OFString.m \ OFString+CryptographicHashing.m \ @@ -86,11 +95,10 @@ OFString+PercentEncoding.m \ OFString+PropertyListParsing.m \ OFString+XMLEscaping.m \ OFString+XMLUnescaping.m \ ${OF_SUBPROCESS_M} \ - OFSettings.m \ OFSystemInfo.m \ OFTarArchive.m \ OFTarArchiveEntry.m \ OFThread.m \ OFTimer.m \ @@ -228,20 +236,31 @@ encodings/encodings.a \ forwarding/forwarding.a LIB_OBJS_EXTRA = exceptions/exceptions.lib.a \ encodings/encodings.lib.a \ forwarding/forwarding.lib.a +AMIGA_LIB_OBJS_START = amiga-library.amigalib.o +AMIGA_LIB_OBJS_EXTRA = amiga-glue.amigalib.o \ + exceptions/exceptions.amigalib.a \ + encodings/encodings.amigalib.a \ + forwarding/forwarding.amigalib.a \ + amiga-end.amigalib.o include ../buildsys.mk -CPPFLAGS += -I. -I.. -Iexceptions -Iruntime +CPPFLAGS += -I. -I.. -Iexceptions -Iruntime \ + -DOBJFW_AMIGA_LIB=\"${OBJFW_AMIGA_LIB}\" \ + -DOBJFW_LIB_MAJOR=${OBJFW_LIB_MAJOR} \ + -DOBJFW_LIB_MINOR=${OBJFW_LIB_MINOR} +AMIGA_LIB_CFLAGS += -DOF_COMPILING_AMIGA_LIBRARY LD = ${OBJC} FRAMEWORK_LIBS := -Fruntime \ ${RUNTIME_FRAMEWORK_LIBS} \ ${REEXPORT_RUNTIME_FRAMEWORK} \ ${LIBS} -LIBS := -Lruntime ${RUNTIME_LIBS} ${REEXPORT_RUNTIME} ${LIBS} +AMIGA_LIB_LIBS := -Lruntime -Lruntime/linklib -lobjfwrt.library.amigalib ${LIBS} +LIBS := -Lruntime -Lruntime/linklib ${RUNTIME_LIBS} ${REEXPORT_RUNTIME} ${LIBS} RCFLAGS = --use-temp-file \ -DOBJFW_LIB_MAJOR=${OBJFW_LIB_MAJOR} \ -DOBJFW_LIB_MINOR=${OBJFW_LIB_MINOR} \ -DOBJFW_LIB_VERSION=\"${OBJFW_LIB_MAJOR}.${OBJFW_LIB_MINOR}\" \ -DOBJFW_SHARED_LIB=\"${OBJFW_SHARED_LIB}\" Index: src/OFObject.h ================================================================== --- src/OFObject.h +++ src/OFObject.h @@ -1477,10 +1477,17 @@ #endif extern id OFAllocObject(Class class_, size_t extraSize, size_t extraAlignment, void *_Nullable *_Nullable extra); extern void OF_NO_RETURN_FUNC OFMethodNotFound(id self, SEL _cmd); +/** + * @brief Initializes the specified hash. + * + * @param hash A pointer to the hash to initialize + */ +extern void OFHashInit(unsigned long *_Nonnull hash); + /** * @brief Returns 16 bit or non-cryptographical randomness. * * @return 16 bit or non-cryptographical randomness */ @@ -1497,17 +1504,10 @@ * @brief Returns 64 bit or non-cryptographical randomness. * * @return 64 bit or non-cryptographical randomness */ extern uint64_t OFRandom64(void); - -/** - * @brief Initializes the specified hash. - * - * @param hash A pointer to the hash to initialize - */ -extern void OFHashInit(unsigned long *_Nonnull hash); #ifdef __cplusplus } #endif OF_ASSUME_NONNULL_END Index: src/OFObject.m ================================================================== --- src/OFObject.m +++ src/OFObject.m @@ -94,10 +94,18 @@ static struct { Class isa; } allocFailedException; unsigned long OFHashSeed; + +#ifdef OF_AMIGAOS +unsigned long * +OFHashSeedRef(void) +{ + return &OFHashSeed; +} +#endif void * OFAllocMemory(size_t count, size_t size) { void *pointer; Index: src/OFOnce.h ================================================================== --- src/OFOnce.h +++ src/OFOnce.h @@ -29,10 +29,14 @@ # define OFOnceControlInitValue 0 #endif OF_ASSUME_NONNULL_BEGIN +/** @file */ + +typedef void (*OFOnceFunction)(void); + #ifdef __cplusplus extern "C" { #endif /** * @brief Executes the specified function exactly once in the application's @@ -40,11 +44,11 @@ * * @param control An OFOnceControl. This should be a static variable * preinitialized to `OFOnceControlInitValue`. * @param function The function to execute once */ -extern void OFOnce(OFOnceControl *control, void (*function)(void)); +extern void OFOnce(OFOnceControl *control, OFOnceFunction function); #ifdef __cplusplus } #endif OF_ASSUME_NONNULL_END Index: src/OFPBKDF2.h ================================================================== --- src/OFPBKDF2.h +++ src/OFPBKDF2.h @@ -64,13 +64,13 @@ * * @note This will call @ref OFHMAC::reset on the `HMAC` first, making it * possible to reuse the `HMAC`, but also meaning all previous results * from the `HMAC` get invalidated if they have not been copied. * - * @param param The parameters to use + * @param parameters The parameters to use */ -extern void OFPBKDF2(OFPBKDF2Parameters param); +extern void OFPBKDF2(OFPBKDF2Parameters parameters); #ifdef __cplusplus } #endif OF_ASSUME_NONNULL_END Index: src/OFScrypt.h ================================================================== --- src/OFScrypt.h +++ src/OFScrypt.h @@ -68,13 +68,13 @@ size_t costFactor, uint32_t *tmp); /** * @brief Derives a key from a password and a salt using scrypt. * - * @param param The parameters to use + * @param parameters The parameters to use */ -extern void OFScrypt(OFScryptParameters param); +extern void OFScrypt(OFScryptParameters parameters); #ifdef __cplusplus } #endif OF_ASSUME_NONNULL_END Index: src/OFStdIOStream.h ================================================================== --- src/OFStdIOStream.h +++ src/OFStdIOStream.h @@ -132,10 +132,11 @@ #ifdef __cplusplus extern "C" { #endif /** @file */ +#ifndef OF_AMIGAOS /** * @brief The standard input as an OFStream. */ extern OFStdIOStream *_Nullable OFStdIn; @@ -146,10 +147,18 @@ /** * @brief The standard error as an OFStream. */ extern OFStdIOStream *_Nullable OFStdErr; +#else +extern OFStdIOStream *_Nonnull *_Nullable OFStdInRef(void); +extern OFStdIOStream *_Nonnull *_Nullable OFStdOutRef(void); +extern OFStdIOStream *_Nonnull *_Nullable OFStdErrRef(void); +# define OFStdIn (*OFStdInRef()) +# define OFStdOut (*OFStdOutRef()) +# define OFStdErr (*OFStdErrRef()) +#endif /** * @brief Logs the specified printf-style format to @ref OFStdErr. * * This prefixes the output with the date, timestamp, process name and PID. Index: src/OFStdIOStream.m ================================================================== --- src/OFStdIOStream.m +++ src/OFStdIOStream.m @@ -66,14 +66,40 @@ _reference_to_OFWin32ConsoleStdIOStream(void) { [OFWin32ConsoleStdIOStream class]; } #endif + +#ifdef OF_AMIGAOS +# undef OFStdIn +# undef OFStdOut +# undef OFStdErr +#endif OFStdIOStream *OFStdIn = nil; OFStdIOStream *OFStdOut = nil; OFStdIOStream *OFStdErr = nil; + +#ifdef OF_AMIGAOS +OFStdIOStream ** +OFStdInRef(void) +{ + return &OFStdIn; +} + +OFStdIOStream ** +OFStdOutRef(void) +{ + return &OFStdOut; +} + +OFStdIOStream ** +OFStdErrRef(void) +{ + return &OFStdErr; +} +#endif #ifdef OF_AMIGAOS OF_DESTRUCTOR() { [OFStdIn dealloc]; ADDED src/amiga-end.m Index: src/amiga-end.m ================================================================== --- /dev/null +++ src/amiga-end.m @@ -0,0 +1,31 @@ +/* + * Copyright (c) 2008-2023 Jonathan Schleifer + * + * All rights reserved. + * + * This file is part of ObjFW. It may be distributed under the terms of the + * Q Public License 1.0, which can be found in the file LICENSE.QPL included in + * the packaging of this file. + * + * Alternatively, it may be distributed under the terms of the GNU General + * Public License, either version 2 or 3, which can be found in the file + * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this + * file. + */ + +#include "config.h" + +#include "platform.h" + +#ifdef OF_MORPHOS +__asm__ ( + ".section .eh_frame, \"aw\"\n" + " .long 0\n" + ".section .ctors, \"aw\"\n" + " .long 0" +); +#else +__asm__ ( + "" +); +#endif ADDED src/amiga-funcarray.inc Index: src/amiga-funcarray.inc ================================================================== --- /dev/null +++ src/amiga-funcarray.inc @@ -0,0 +1,86 @@ +/* + * Copyright (c) 2008-2023 Jonathan Schleifer + * + * All rights reserved. + * + * This file is part of ObjFW. It may be distributed under the terms of the + * Q Public License 1.0, which can be found in the file LICENSE.QPL included in + * the packaging of this file. + * + * Alternatively, it may be distributed under the terms of the GNU General + * Public License, either version 2 or 3, which can be found in the file + * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this + * file. + */ + +/* This file is automatically generated from amiga-library.xml */ + +(CONST_APTR)glue_OFInit, +(CONST_APTR)glue_OFAllocMemory, +(CONST_APTR)glue_OFAllocZeroedMemory, +(CONST_APTR)glue_OFResizeMemory, +(CONST_APTR)glue_OFFreeMemory, +(CONST_APTR)glue_OFHashInit, +(CONST_APTR)glue_OFRandom16, +(CONST_APTR)glue_OFRandom32, +(CONST_APTR)glue_OFRandom64, +(CONST_APTR)glue_OFHashSeedRef, +(CONST_APTR)glue_OFStdInRef, +(CONST_APTR)glue_OFStdOutRef, +(CONST_APTR)glue_OFStdErrRef, +(CONST_APTR)glue_OFLogV, +(CONST_APTR)glue_OFApplicationMain, +(CONST_APTR)glue__Block_copy, +(CONST_APTR)glue__Block_release, +(CONST_APTR)glue_OFDNSClassName, +(CONST_APTR)glue_OFDNSRecordTypeName, +(CONST_APTR)glue_OFDNSClassParseName, +(CONST_APTR)glue_OFDNSRecordTypeParseName, +(CONST_APTR)glue_OFRegisterEmbeddedFile, +(CONST_APTR)glue_OFHTTPRequestMethodName, +(CONST_APTR)glue_OFHTTPRequestMethodParseName, +(CONST_APTR)glue_OFHTTPStatusCodeString, +(CONST_APTR)glue_OFListItemNext, +(CONST_APTR)glue_OFListItemPrevious, +(CONST_APTR)glue_OFListItemObject, +(CONST_APTR)glue_OFSizeOfTypeEncoding, +(CONST_APTR)glue_OFAlignmentOfTypeEncoding, +(CONST_APTR)glue_OFOnce, +(CONST_APTR)glue_OFPBKDF2Wrapper, +(CONST_APTR)glue_OFScryptWrapper, +(CONST_APTR)glue_OFSalsa20_8Core, +(CONST_APTR)glue_OFScryptBlockMix, +(CONST_APTR)glue_OFScryptROMix, +(CONST_APTR)glue_OFSocketAddressParseIP, +(CONST_APTR)glue_OFSocketAddressParseIPv4, +(CONST_APTR)glue_OFSocketAddressParseIPv6, +(CONST_APTR)glue_OFSocketAddressMakeUNIX, +(CONST_APTR)glue_OFSocketAddressMakeIPX, +(CONST_APTR)glue_OFSocketAddressMakeAppleTalk, +(CONST_APTR)glue_OFSocketAddressEqual, +(CONST_APTR)glue_OFSocketAddressHash, +(CONST_APTR)glue_OFSocketAddressString, +(CONST_APTR)glue_OFSocketAddressSetIPPort, +(CONST_APTR)glue_OFSocketAddressIPPort, +(CONST_APTR)glue_OFSocketAddressUNIXPath, +(CONST_APTR)glue_OFSocketAddressSetIPXNetwork, +(CONST_APTR)glue_OFSocketAddressIPXNetwork, +(CONST_APTR)glue_OFSocketAddressSetIPXNode, +(CONST_APTR)glue_OFSocketAddressGetIPXNode, +(CONST_APTR)glue_OFSocketAddressSetIPXPort, +(CONST_APTR)glue_OFSocketAddressIPXPort, +(CONST_APTR)glue_OFSocketAddressSetAppleTalkNetwork, +(CONST_APTR)glue_OFSocketAddressAppleTalkNetwork, +(CONST_APTR)glue_OFSocketAddressSetAppleTalkNode, +(CONST_APTR)glue_OFSocketAddressAppleTalkNode, +(CONST_APTR)glue_OFSocketAddressSetAppleTalkPort, +(CONST_APTR)glue_OFSocketAddressAppleTalkPort, +(CONST_APTR)glue_OFTLSStreamErrorCodeDescription, +(CONST_APTR)glue_OFStrPTime, +(CONST_APTR)glue_OFStringEncodingParseName, +(CONST_APTR)glue_OFStringEncodingName, +(CONST_APTR)glue_OFUTF16StringLength, +(CONST_APTR)glue_OFUTF32StringLength, +(CONST_APTR)glue_OFZIPArchiveEntryVersionToString, +(CONST_APTR)glue_OFZIPArchiveEntryCompressionMethodName, +(CONST_APTR)glue_OFZIPArchiveEntryExtraFieldFind, ADDED src/amiga-glue.h Index: src/amiga-glue.h ================================================================== --- /dev/null +++ src/amiga-glue.h @@ -0,0 +1,116 @@ +/* + * Copyright (c) 2008-2023 Jonathan Schleifer + * + * All rights reserved. + * + * This file is part of ObjFW. It may be distributed under the terms of the + * Q Public License 1.0, which can be found in the file LICENSE.QPL included in + * the packaging of this file. + * + * Alternatively, it may be distributed under the terms of the GNU General + * Public License, either version 2 or 3, which can be found in the file + * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this + * file. + */ + +/* This file is automatically generated from amiga-library.xml */ + +#import "amiga-library.h" +#import "OFObject.h" +#import "OFStdIOStream.h" +#import "OFApplication.h" +#import "OFBlock.h" +#import "OFDNSResourceRecord.h" +#import "OFEmbeddedURIHandler.h" +#import "OFHTTPRequest.h" +#import "OFHTTPResponse.h" +#import "OFList.h" +#import "OFMethodSignature.h" +#import "OFOnce.h" +#import "OFPBKDF2.h" +#import "OFScrypt.h" +#import "OFSocket.h" +#import "OFTLSStream.h" +#import "OFStrPTime.h" +#import "OFString.h" +#import "OFZIPArchiveEntry.h" + +#ifdef OF_AMIGAOS_M68K +# define PPC_PARAMS(...) (void) +# define M68K_ARG(type, name, reg) \ + register type reg##name __asm__(#reg); \ + type name = reg##name; +#else +# define PPC_PARAMS(...) (__VA_ARGS__) +# define M68K_ARG(...) +#endif + +extern bool glue_OFInit PPC_PARAMS(unsigned int version, struct OFLibC *_Nonnull libc, struct Library *_Nonnull RTBase); +extern void *_Nullable glue_OFAllocMemory PPC_PARAMS(size_t count, size_t size); +extern void *_Nullable glue_OFAllocZeroedMemory PPC_PARAMS(size_t count, size_t size); +extern void *_Nullable glue_OFResizeMemory PPC_PARAMS(void *_Nullable pointer, size_t count, size_t size); +extern void glue_OFFreeMemory PPC_PARAMS(void *_Nullable pointer); +extern void glue_OFHashInit PPC_PARAMS(unsigned long *_Nonnull hash); +extern uint16_t glue_OFRandom16(void); +extern uint32_t glue_OFRandom32(void); +extern uint64_t glue_OFRandom64(void); +extern unsigned long *_Nonnull glue_OFHashSeedRef(void); +extern OFStdIOStream *_Nonnull *_Nullable glue_OFStdInRef(void); +extern OFStdIOStream *_Nonnull *_Nullable glue_OFStdOutRef(void); +extern OFStdIOStream *_Nonnull *_Nullable glue_OFStdErrRef(void); +extern void glue_OFLogV PPC_PARAMS(OFConstantString *format, va_list arguments); +extern int glue_OFApplicationMain PPC_PARAMS(int *_Nonnull argc, char *_Nullable *_Nonnull *_Nonnull argv, id delegate); +extern void *_Nullable glue__Block_copy PPC_PARAMS(const void *_Nullable block); +extern void glue__Block_release PPC_PARAMS(const void *_Nullable block); +extern OFString *_Nonnull glue_OFDNSClassName PPC_PARAMS(OFDNSClass DNSClass); +extern OFString *_Nonnull glue_OFDNSRecordTypeName PPC_PARAMS(OFDNSRecordType recordType); +extern OFDNSClass glue_OFDNSClassParseName PPC_PARAMS(OFString *_Nonnull string); +extern OFDNSRecordType glue_OFDNSRecordTypeParseName PPC_PARAMS(OFString *_Nonnull string); +extern void glue_OFRegisterEmbeddedFile PPC_PARAMS(OFString *_Nonnull name, const uint8_t *_Nonnull bytes, size_t size); +extern const char *_Nullable glue_OFHTTPRequestMethodName PPC_PARAMS(OFHTTPRequestMethod method); +extern OFHTTPRequestMethod glue_OFHTTPRequestMethodParseName PPC_PARAMS(OFString *string); +extern OFString *_Nonnull glue_OFHTTPStatusCodeString PPC_PARAMS(short code); +extern OFListItem _Nullable glue_OFListItemNext PPC_PARAMS(OFListItem _Nonnull listItem); +extern OFListItem _Nullable glue_OFListItemPrevious PPC_PARAMS(OFListItem _Nonnull listItem); +extern id _Nonnull glue_OFListItemObject PPC_PARAMS(OFListItem _Nonnull listItem); +extern size_t glue_OFSizeOfTypeEncoding PPC_PARAMS(const char *type); +extern size_t glue_OFAlignmentOfTypeEncoding PPC_PARAMS(const char *type); +extern void glue_OFOnce PPC_PARAMS(OFOnceControl *_Nonnull control, OFOnceFunction _Nonnull func); +extern void glue_OFPBKDF2Wrapper PPC_PARAMS(const OFPBKDF2Parameters *_Nonnull parameters); +extern void glue_OFScryptWrapper PPC_PARAMS(const OFScryptParameters *_Nonnull parameters); +extern void glue_OFSalsa20_8Core PPC_PARAMS(uint32_t *_Nonnull buffer); +extern void glue_OFScryptBlockMix PPC_PARAMS(uint32_t *_Nonnull output, const uint32_t *_Nonnull input, size_t blockSize); +extern void glue_OFScryptROMix PPC_PARAMS(uint32_t *buffer, size_t blockSize, size_t costFactor, uint32_t *tmp); +extern OFSocketAddress glue_OFSocketAddressParseIP PPC_PARAMS(OFString *IP, uint16_t port); +extern OFSocketAddress glue_OFSocketAddressParseIPv4 PPC_PARAMS(OFString *IP, uint16_t port); +extern OFSocketAddress glue_OFSocketAddressParseIPv6 PPC_PARAMS(OFString *IP, uint16_t port); +extern OFSocketAddress glue_OFSocketAddressMakeUNIX PPC_PARAMS(OFString *path); +extern OFSocketAddress glue_OFSocketAddressMakeIPX PPC_PARAMS(uint32_t network, const unsigned char *node, uint16_t port); +extern OFSocketAddress glue_OFSocketAddressMakeAppleTalk PPC_PARAMS(uint16_t network, uint8_t node, uint8_t port); +extern bool glue_OFSocketAddressEqual PPC_PARAMS(const OFSocketAddress *address1, const OFSocketAddress *address2); +extern unsigned long glue_OFSocketAddressHash PPC_PARAMS(const OFSocketAddress *address); +extern OFString *_Nonnull glue_OFSocketAddressString PPC_PARAMS(const OFSocketAddress *address); +extern void glue_OFSocketAddressSetIPPort PPC_PARAMS(OFSocketAddress *address, uint16_t port); +extern uint16_t glue_OFSocketAddressIPPort PPC_PARAMS(const OFSocketAddress *address); +extern OFString *glue_OFSocketAddressUNIXPath PPC_PARAMS(const OFSocketAddress *address); +extern void glue_OFSocketAddressSetIPXNetwork PPC_PARAMS(OFSocketAddress *address, uint32_t network); +extern uint32_t glue_OFSocketAddressIPXNetwork PPC_PARAMS(const OFSocketAddress *address); +extern void glue_OFSocketAddressSetIPXNode PPC_PARAMS(OFSocketAddress *address, const unsigned char *node); +extern void glue_OFSocketAddressGetIPXNode PPC_PARAMS(const OFSocketAddress *address, unsigned char *_Nonnull node); +extern void glue_OFSocketAddressSetIPXPort PPC_PARAMS(OFSocketAddress *address, uint16_t port); +extern uint16_t glue_OFSocketAddressIPXPort PPC_PARAMS(const OFSocketAddress *address); +extern void glue_OFSocketAddressSetAppleTalkNetwork PPC_PARAMS(OFSocketAddress *address, uint16_t network); +extern uint16_t glue_OFSocketAddressAppleTalkNetwork PPC_PARAMS(const OFSocketAddress *address); +extern void glue_OFSocketAddressSetAppleTalkNode PPC_PARAMS(OFSocketAddress *address, uint8_t node); +extern uint8_t glue_OFSocketAddressAppleTalkNode PPC_PARAMS(const OFSocketAddress *address); +extern void glue_OFSocketAddressSetAppleTalkPort PPC_PARAMS(OFSocketAddress *address, uint8_t port); +extern uint8_t glue_OFSocketAddressAppleTalkPort PPC_PARAMS(const OFSocketAddress *address); +extern OFString *glue_OFTLSStreamErrorCodeDescription PPC_PARAMS(OFTLSStreamErrorCode errorCode); +extern const char *_Nullable glue_OFStrPTime PPC_PARAMS(const char *buffer, const char *format, struct tm *tm, int16_t *_Nullable tz); +extern OFStringEncoding glue_OFStringEncodingParseName PPC_PARAMS(OFString *string); +extern OFString *_Nullable glue_OFStringEncodingName PPC_PARAMS(OFStringEncoding encoding); +extern size_t glue_OFUTF16StringLength PPC_PARAMS(const OFChar16 *string); +extern size_t glue_OFUTF32StringLength PPC_PARAMS(const OFChar32 *string); +extern OFString *_Nonnull glue_OFZIPArchiveEntryVersionToString PPC_PARAMS(uint16_t version); +extern OFString *_Nonnull glue_OFZIPArchiveEntryCompressionMethodName PPC_PARAMS(OFZIPArchiveEntryCompressionMethod compressionMethod); +extern size_t glue_OFZIPArchiveEntryExtraFieldFind PPC_PARAMS(OFData *extraField, OFZIPArchiveEntryExtraFieldTag tag, uint16_t *size); ADDED src/amiga-glue.m Index: src/amiga-glue.m ================================================================== --- /dev/null +++ src/amiga-glue.m @@ -0,0 +1,607 @@ +/* + * Copyright (c) 2008-2023 Jonathan Schleifer + * + * All rights reserved. + * + * This file is part of ObjFW. It may be distributed under the terms of the + * Q Public License 1.0, which can be found in the file LICENSE.QPL included in + * the packaging of this file. + * + * Alternatively, it may be distributed under the terms of the GNU General + * Public License, either version 2 or 3, which can be found in the file + * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this + * file. + */ + +/* This file is automatically generated from amiga-library.xml */ + +#include "config.h" + +#import "amiga-glue.h" + +#ifdef OF_MORPHOS +/* All __saveds functions in this file need to use the SysV ABI */ +__asm__ ( + ".section .text\n" + ".align 2\n" + "__restore_r13:\n" + " lwz %r13, 44(%r12)\n" + " blr\n" +); +#endif + +bool __saveds +glue_OFInit PPC_PARAMS(unsigned int version, struct OFLibC *_Nonnull libc, struct Library *_Nonnull RTBase) +{ + M68K_ARG(unsigned int, version, d0) + M68K_ARG(struct OFLibC *_Nonnull, libc, a0) + M68K_ARG(struct Library *_Nonnull, RTBase, a1) + + return OFInit(version, libc, RTBase); +} + +void *_Nullable __saveds +glue_OFAllocMemory PPC_PARAMS(size_t count, size_t size) +{ + M68K_ARG(size_t, count, d0) + M68K_ARG(size_t, size, d1) + + return OFAllocMemory(count, size); +} + +void *_Nullable __saveds +glue_OFAllocZeroedMemory PPC_PARAMS(size_t count, size_t size) +{ + M68K_ARG(size_t, count, d0) + M68K_ARG(size_t, size, d1) + + return OFAllocZeroedMemory(count, size); +} + +void *_Nullable __saveds +glue_OFResizeMemory PPC_PARAMS(void *_Nullable pointer, size_t count, size_t size) +{ + M68K_ARG(void *_Nullable, pointer, a0) + M68K_ARG(size_t, count, d0) + M68K_ARG(size_t, size, d1) + + return OFResizeMemory(pointer, count, size); +} + +void __saveds +glue_OFFreeMemory PPC_PARAMS(void *_Nullable pointer) +{ + M68K_ARG(void *_Nullable, pointer, a0) + + OFFreeMemory(pointer); +} + +void __saveds +glue_OFHashInit PPC_PARAMS(unsigned long *_Nonnull hash) +{ + M68K_ARG(unsigned long *_Nonnull, hash, a0) + + OFHashInit(hash); +} + +uint16_t __saveds +glue_OFRandom16(void) +{ + return OFRandom16(); +} + +uint32_t __saveds +glue_OFRandom32(void) +{ + return OFRandom32(); +} + +uint64_t __saveds +glue_OFRandom64(void) +{ + return OFRandom64(); +} + +unsigned long *_Nonnull __saveds +glue_OFHashSeedRef(void) +{ + return OFHashSeedRef(); +} + +OFStdIOStream *_Nonnull *_Nullable __saveds +glue_OFStdInRef(void) +{ + return OFStdInRef(); +} + +OFStdIOStream *_Nonnull *_Nullable __saveds +glue_OFStdOutRef(void) +{ + return OFStdOutRef(); +} + +OFStdIOStream *_Nonnull *_Nullable __saveds +glue_OFStdErrRef(void) +{ + return OFStdErrRef(); +} + +void __saveds +glue_OFLogV PPC_PARAMS(OFConstantString *format, va_list arguments) +{ + M68K_ARG(OFConstantString *, format, a0) + M68K_ARG(va_list, arguments, a1) + + OFLogV(format, arguments); +} + +int __saveds +glue_OFApplicationMain PPC_PARAMS(int *_Nonnull argc, char *_Nullable *_Nonnull *_Nonnull argv, id delegate) +{ + M68K_ARG(int *_Nonnull, argc, a0) + M68K_ARG(char *_Nullable *_Nonnull *_Nonnull, argv, a1) + M68K_ARG(id , delegate, a2) + + return OFApplicationMain(argc, argv, delegate); +} + +void *_Nullable __saveds +glue__Block_copy PPC_PARAMS(const void *_Nullable block) +{ + M68K_ARG(const void *_Nullable, block, a0) + + return _Block_copy(block); +} + +void __saveds +glue__Block_release PPC_PARAMS(const void *_Nullable block) +{ + M68K_ARG(const void *_Nullable, block, a0) + + _Block_release(block); +} + +OFString *_Nonnull __saveds +glue_OFDNSClassName PPC_PARAMS(OFDNSClass DNSClass) +{ + M68K_ARG(OFDNSClass, DNSClass, d0) + + return OFDNSClassName(DNSClass); +} + +OFString *_Nonnull __saveds +glue_OFDNSRecordTypeName PPC_PARAMS(OFDNSRecordType recordType) +{ + M68K_ARG(OFDNSRecordType, recordType, d0) + + return OFDNSRecordTypeName(recordType); +} + +OFDNSClass __saveds +glue_OFDNSClassParseName PPC_PARAMS(OFString *_Nonnull string) +{ + M68K_ARG(OFString *_Nonnull, string, a0) + + return OFDNSClassParseName(string); +} + +OFDNSRecordType __saveds +glue_OFDNSRecordTypeParseName PPC_PARAMS(OFString *_Nonnull string) +{ + M68K_ARG(OFString *_Nonnull, string, a0) + + return OFDNSRecordTypeParseName(string); +} + +void __saveds +glue_OFRegisterEmbeddedFile PPC_PARAMS(OFString *_Nonnull name, const uint8_t *_Nonnull bytes, size_t size) +{ + M68K_ARG(OFString *_Nonnull, name, a0) + M68K_ARG(const uint8_t *_Nonnull, bytes, a1) + M68K_ARG(size_t, size, d0) + + OFRegisterEmbeddedFile(name, bytes, size); +} + +const char *_Nullable __saveds +glue_OFHTTPRequestMethodName PPC_PARAMS(OFHTTPRequestMethod method) +{ + M68K_ARG(OFHTTPRequestMethod, method, d0) + + return OFHTTPRequestMethodName(method); +} + +OFHTTPRequestMethod __saveds +glue_OFHTTPRequestMethodParseName PPC_PARAMS(OFString *string) +{ + M68K_ARG(OFString *, string, a0) + + return OFHTTPRequestMethodParseName(string); +} + +OFString *_Nonnull __saveds +glue_OFHTTPStatusCodeString PPC_PARAMS(short code) +{ + M68K_ARG(short, code, d0) + + return OFHTTPStatusCodeString(code); +} + +OFListItem _Nullable __saveds +glue_OFListItemNext PPC_PARAMS(OFListItem _Nonnull listItem) +{ + M68K_ARG(OFListItem _Nonnull, listItem, a0) + + return OFListItemNext(listItem); +} + +OFListItem _Nullable __saveds +glue_OFListItemPrevious PPC_PARAMS(OFListItem _Nonnull listItem) +{ + M68K_ARG(OFListItem _Nonnull, listItem, a0) + + return OFListItemPrevious(listItem); +} + +id _Nonnull __saveds +glue_OFListItemObject PPC_PARAMS(OFListItem _Nonnull listItem) +{ + M68K_ARG(OFListItem _Nonnull, listItem, a0) + + return OFListItemObject(listItem); +} + +size_t __saveds +glue_OFSizeOfTypeEncoding PPC_PARAMS(const char *type) +{ + M68K_ARG(const char *, type, a0) + + return OFSizeOfTypeEncoding(type); +} + +size_t __saveds +glue_OFAlignmentOfTypeEncoding PPC_PARAMS(const char *type) +{ + M68K_ARG(const char *, type, a0) + + return OFAlignmentOfTypeEncoding(type); +} + +void __saveds +glue_OFOnce PPC_PARAMS(OFOnceControl *_Nonnull control, OFOnceFunction _Nonnull func) +{ + M68K_ARG(OFOnceControl *_Nonnull, control, a0) + M68K_ARG(OFOnceFunction _Nonnull, func, a1) + + OFOnce(control, func); +} + +void __saveds +glue_OFPBKDF2Wrapper PPC_PARAMS(const OFPBKDF2Parameters *_Nonnull parameters) +{ + M68K_ARG(const OFPBKDF2Parameters *_Nonnull, parameters, a0) + + OFPBKDF2Wrapper(parameters); +} + +void __saveds +glue_OFScryptWrapper PPC_PARAMS(const OFScryptParameters *_Nonnull parameters) +{ + M68K_ARG(const OFScryptParameters *_Nonnull, parameters, a0) + + OFScryptWrapper(parameters); +} + +void __saveds +glue_OFSalsa20_8Core PPC_PARAMS(uint32_t *_Nonnull buffer) +{ + M68K_ARG(uint32_t *_Nonnull, buffer, a0) + + OFSalsa20_8Core(buffer); +} + +void __saveds +glue_OFScryptBlockMix PPC_PARAMS(uint32_t *_Nonnull output, const uint32_t *_Nonnull input, size_t blockSize) +{ + M68K_ARG(uint32_t *_Nonnull, output, a0) + M68K_ARG(const uint32_t *_Nonnull, input, a1) + M68K_ARG(size_t, blockSize, d0) + + OFScryptBlockMix(output, input, blockSize); +} + +void __saveds +glue_OFScryptROMix PPC_PARAMS(uint32_t *buffer, size_t blockSize, size_t costFactor, uint32_t *tmp) +{ + M68K_ARG(uint32_t *, buffer, a0) + M68K_ARG(size_t, blockSize, d0) + M68K_ARG(size_t, costFactor, d1) + M68K_ARG(uint32_t *, tmp, a1) + + OFScryptROMix(buffer, blockSize, costFactor, tmp); +} + +OFSocketAddress __saveds +glue_OFSocketAddressParseIP PPC_PARAMS(OFString *IP, uint16_t port) +{ + M68K_ARG(OFString *, IP, a0) + M68K_ARG(uint16_t, port, d0) + + return OFSocketAddressParseIP(IP, port); +} + +OFSocketAddress __saveds +glue_OFSocketAddressParseIPv4 PPC_PARAMS(OFString *IP, uint16_t port) +{ + M68K_ARG(OFString *, IP, a0) + M68K_ARG(uint16_t, port, d0) + + return OFSocketAddressParseIPv4(IP, port); +} + +OFSocketAddress __saveds +glue_OFSocketAddressParseIPv6 PPC_PARAMS(OFString *IP, uint16_t port) +{ + M68K_ARG(OFString *, IP, a0) + M68K_ARG(uint16_t, port, d0) + + return OFSocketAddressParseIPv6(IP, port); +} + +OFSocketAddress __saveds +glue_OFSocketAddressMakeUNIX PPC_PARAMS(OFString *path) +{ + M68K_ARG(OFString *, path, a0) + + return OFSocketAddressMakeUNIX(path); +} + +OFSocketAddress __saveds +glue_OFSocketAddressMakeIPX PPC_PARAMS(uint32_t network, const unsigned char *node, uint16_t port) +{ + M68K_ARG(uint32_t, network, d0) + M68K_ARG(const unsigned char *, node, a0) + M68K_ARG(uint16_t, port, d1) + + return OFSocketAddressMakeIPX(network, node, port); +} + +OFSocketAddress __saveds +glue_OFSocketAddressMakeAppleTalk PPC_PARAMS(uint16_t network, uint8_t node, uint8_t port) +{ + M68K_ARG(uint16_t, network, d0) + M68K_ARG(uint8_t, node, d1) + M68K_ARG(uint8_t, port, d2) + + return OFSocketAddressMakeAppleTalk(network, node, port); +} + +bool __saveds +glue_OFSocketAddressEqual PPC_PARAMS(const OFSocketAddress *address1, const OFSocketAddress *address2) +{ + M68K_ARG(const OFSocketAddress *, address1, a0) + M68K_ARG(const OFSocketAddress *, address2, a1) + + return OFSocketAddressEqual(address1, address2); +} + +unsigned long __saveds +glue_OFSocketAddressHash PPC_PARAMS(const OFSocketAddress *address) +{ + M68K_ARG(const OFSocketAddress *, address, a0) + + return OFSocketAddressHash(address); +} + +OFString *_Nonnull __saveds +glue_OFSocketAddressString PPC_PARAMS(const OFSocketAddress *address) +{ + M68K_ARG(const OFSocketAddress *, address, a0) + + return OFSocketAddressString(address); +} + +void __saveds +glue_OFSocketAddressSetIPPort PPC_PARAMS(OFSocketAddress *address, uint16_t port) +{ + M68K_ARG(OFSocketAddress *, address, a0) + M68K_ARG(uint16_t, port, d0) + + OFSocketAddressSetIPPort(address, port); +} + +uint16_t __saveds +glue_OFSocketAddressIPPort PPC_PARAMS(const OFSocketAddress *address) +{ + M68K_ARG(const OFSocketAddress *, address, a0) + + return OFSocketAddressIPPort(address); +} + +OFString * __saveds +glue_OFSocketAddressUNIXPath PPC_PARAMS(const OFSocketAddress *address) +{ + M68K_ARG(const OFSocketAddress *, address, a0) + + return OFSocketAddressUNIXPath(address); +} + +void __saveds +glue_OFSocketAddressSetIPXNetwork PPC_PARAMS(OFSocketAddress *address, uint32_t network) +{ + M68K_ARG(OFSocketAddress *, address, a0) + M68K_ARG(uint32_t, network, d0) + + OFSocketAddressSetIPXNetwork(address, network); +} + +uint32_t __saveds +glue_OFSocketAddressIPXNetwork PPC_PARAMS(const OFSocketAddress *address) +{ + M68K_ARG(const OFSocketAddress *, address, a0) + + return OFSocketAddressIPXNetwork(address); +} + +void __saveds +glue_OFSocketAddressSetIPXNode PPC_PARAMS(OFSocketAddress *address, const unsigned char *node) +{ + M68K_ARG(OFSocketAddress *, address, a0) + M68K_ARG(const unsigned char *, node, a1) + + OFSocketAddressSetIPXNode(address, node); +} + +void __saveds +glue_OFSocketAddressGetIPXNode PPC_PARAMS(const OFSocketAddress *address, unsigned char *_Nonnull node) +{ + M68K_ARG(const OFSocketAddress *, address, a0) + M68K_ARG(unsigned char *_Nonnull, node, a1) + + OFSocketAddressGetIPXNode(address, node); +} + +void __saveds +glue_OFSocketAddressSetIPXPort PPC_PARAMS(OFSocketAddress *address, uint16_t port) +{ + M68K_ARG(OFSocketAddress *, address, a0) + M68K_ARG(uint16_t, port, d0) + + OFSocketAddressSetIPXPort(address, port); +} + +uint16_t __saveds +glue_OFSocketAddressIPXPort PPC_PARAMS(const OFSocketAddress *address) +{ + M68K_ARG(const OFSocketAddress *, address, a0) + + return OFSocketAddressIPXPort(address); +} + +void __saveds +glue_OFSocketAddressSetAppleTalkNetwork PPC_PARAMS(OFSocketAddress *address, uint16_t network) +{ + M68K_ARG(OFSocketAddress *, address, a0) + M68K_ARG(uint16_t, network, d0) + + OFSocketAddressSetAppleTalkNetwork(address, network); +} + +uint16_t __saveds +glue_OFSocketAddressAppleTalkNetwork PPC_PARAMS(const OFSocketAddress *address) +{ + M68K_ARG(const OFSocketAddress *, address, a0) + + return OFSocketAddressAppleTalkNetwork(address); +} + +void __saveds +glue_OFSocketAddressSetAppleTalkNode PPC_PARAMS(OFSocketAddress *address, uint8_t node) +{ + M68K_ARG(OFSocketAddress *, address, a0) + M68K_ARG(uint8_t, node, d0) + + OFSocketAddressSetAppleTalkNode(address, node); +} + +uint8_t __saveds +glue_OFSocketAddressAppleTalkNode PPC_PARAMS(const OFSocketAddress *address) +{ + M68K_ARG(const OFSocketAddress *, address, a0) + + return OFSocketAddressAppleTalkNode(address); +} + +void __saveds +glue_OFSocketAddressSetAppleTalkPort PPC_PARAMS(OFSocketAddress *address, uint8_t port) +{ + M68K_ARG(OFSocketAddress *, address, a0) + M68K_ARG(uint8_t, port, d0) + + OFSocketAddressSetAppleTalkPort(address, port); +} + +uint8_t __saveds +glue_OFSocketAddressAppleTalkPort PPC_PARAMS(const OFSocketAddress *address) +{ + M68K_ARG(const OFSocketAddress *, address, a0) + + return OFSocketAddressAppleTalkPort(address); +} + +OFString * __saveds +glue_OFTLSStreamErrorCodeDescription PPC_PARAMS(OFTLSStreamErrorCode errorCode) +{ + M68K_ARG(OFTLSStreamErrorCode, errorCode, d0) + + return OFTLSStreamErrorCodeDescription(errorCode); +} + +const char *_Nullable __saveds +glue_OFStrPTime PPC_PARAMS(const char *buffer, const char *format, struct tm *tm, int16_t *_Nullable tz) +{ + M68K_ARG(const char *, buffer, a0) + M68K_ARG(const char *, format, a1) + M68K_ARG(struct tm *, tm, a2) + M68K_ARG(int16_t *_Nullable, tz, a3) + + return OFStrPTime(buffer, format, tm, tz); +} + +OFStringEncoding __saveds +glue_OFStringEncodingParseName PPC_PARAMS(OFString *string) +{ + M68K_ARG(OFString *, string, a0) + + return OFStringEncodingParseName(string); +} + +OFString *_Nullable __saveds +glue_OFStringEncodingName PPC_PARAMS(OFStringEncoding encoding) +{ + M68K_ARG(OFStringEncoding, encoding, d0) + + return OFStringEncodingName(encoding); +} + +size_t __saveds +glue_OFUTF16StringLength PPC_PARAMS(const OFChar16 *string) +{ + M68K_ARG(const OFChar16 *, string, a0) + + return OFUTF16StringLength(string); +} + +size_t __saveds +glue_OFUTF32StringLength PPC_PARAMS(const OFChar32 *string) +{ + M68K_ARG(const OFChar32 *, string, a0) + + return OFUTF32StringLength(string); +} + +OFString *_Nonnull __saveds +glue_OFZIPArchiveEntryVersionToString PPC_PARAMS(uint16_t version) +{ + M68K_ARG(uint16_t, version, d0) + + return OFZIPArchiveEntryVersionToString(version); +} + +OFString *_Nonnull __saveds +glue_OFZIPArchiveEntryCompressionMethodName PPC_PARAMS(OFZIPArchiveEntryCompressionMethod compressionMethod) +{ + M68K_ARG(OFZIPArchiveEntryCompressionMethod, compressionMethod, d0) + + return OFZIPArchiveEntryCompressionMethodName(compressionMethod); +} + +size_t __saveds +glue_OFZIPArchiveEntryExtraFieldFind PPC_PARAMS(OFData *extraField, OFZIPArchiveEntryExtraFieldTag tag, uint16_t *size) +{ + M68K_ARG(OFData *, extraField, a0) + M68K_ARG(OFZIPArchiveEntryExtraFieldTag, tag, d0) + M68K_ARG(uint16_t *, size, a1) + + return OFZIPArchiveEntryExtraFieldFind(extraField, tag, size); +} ADDED src/amiga-library.h Index: src/amiga-library.h ================================================================== --- /dev/null +++ src/amiga-library.h @@ -0,0 +1,118 @@ +/* + * Copyright (c) 2008-2023 Jonathan Schleifer + * + * All rights reserved. + * + * This file is part of ObjFW. It may be distributed under the terms of the + * Q Public License 1.0, which can be found in the file LICENSE.QPL included in + * the packaging of this file. + * + * Alternatively, it may be distributed under the terms of the GNU General + * Public License, either version 2 or 3, which can be found in the file + * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this + * file. + */ + +#import "macros.h" +#import "OFPBKDF2.h" +#import "OFScrypt.h" + +#include + +#ifdef OF_MORPHOS +# include +# define OF_M68K_ARG(type, name, reg) type name = (type)REG_##reg; +#else +# define OF_M68K_ARG(type, name, reg) \ + register type reg_##name __asm__(#reg); \ + type name = reg_##name; +#endif + +#ifdef OF_MORPHOS +# include +#endif + +typedef void (*OFSignalHandler)(int); + +struct OFLibC { + /* + * Needed by the runtime. Some of them are also used by ObjFW, but we + * need all of them to pass them along to the runtime. + */ + void *_Nullable (*_Nonnull malloc)(size_t); + void *_Nullable (*_Nonnull calloc)(size_t, size_t); + void *_Nullable (*_Nonnull realloc)(void *_Nullable, size_t); + void (*_Nonnull free)(void *_Nullable); + void (*_Nonnull abort)(void); +#ifdef HAVE_SJLJ_EXCEPTIONS + int (*_Nonnull _Unwind_SjLj_RaiseException)(void *_Nonnull); +#else + int (*_Nonnull _Unwind_RaiseException)(void *_Nonnull); +#endif + void (*_Nonnull _Unwind_DeleteException)(void *_Nonnull); + void *_Nullable (*_Nonnull _Unwind_GetLanguageSpecificData)( + void *_Nonnull); + uintptr_t (*_Nonnull _Unwind_GetRegionStart)(void *_Nonnull); + uintptr_t (*_Nonnull _Unwind_GetDataRelBase)(void *_Nonnull); + uintptr_t (*_Nonnull _Unwind_GetTextRelBase)(void *_Nonnull); + uintptr_t (*_Nonnull _Unwind_GetIP)(void *_Nonnull); + uintptr_t (*_Nonnull _Unwind_GetGR)(void *_Nonnull, int); + void (*_Nonnull _Unwind_SetIP)(void *_Nonnull, uintptr_t); + void (*_Nonnull _Unwind_SetGR)(void *_Nonnull, int, uintptr_t); +#ifdef HAVE_SJLJ_EXCEPTIONS + void (*_Nonnull _Unwind_SjLj_Resume)(void *_Nonnull); +#else + void (*_Nonnull _Unwind_Resume)(void *_Nonnull); +#endif +#ifdef OF_AMIGAOS_M68K + void (*_Nonnull __register_frame_info)(const void *_Nonnull, + void *_Nonnull); + void *_Nullable (*_Nonnull __deregister_frame_info)( + const void *_Nonnull); +#endif +#ifdef OF_MORPHOS + void (*_Nonnull __register_frame)(void *_Nonnull); + void (*_Nonnull __deregister_frame)(void *_Nonnull); +#endif + int *_Nonnull (*_Nonnull errNo)(void); + + /* Needed only by ObjFW. */ +#ifdef OF_MORPHOS + int (*_Nonnull vasprintf)(char *_Nonnull *_Nullable restrict, + const char *_Nonnull restrict, va_list); +#else + int (*_Nonnull vsnprintf)(char *_Nonnull restrict, size_t, + const char *_Nonnull restrict, va_list); +#endif + float (*_Nonnull strtof)(const char *_Nonnull, + char *_Nullable *_Nullable); + double (*_Nonnull strtod)(const char *_Nonnull, + char *_Nullable *_Nullable); +#ifdef OF_MORPHOS + struct tm *(*_Nonnull gmtime_r)(const time_t *_Nonnull, + struct tm *_Nonnull); + struct tm *(*_Nonnull localtime_r)(const time_t *_Nonnull, + struct tm *_Nonnull); +#endif + time_t (*_Nonnull mktime)(struct tm *_Nonnull); + int (*_Nonnull gettimeofday)(struct timeval *_Nonnull, + struct timezone *_Nullable); + size_t (*_Nonnull strftime)(char *_Nonnull, size_t, + const char *_Nonnull, const struct tm *_Nonnull); + void (*_Nonnull exit)(int); + int (*_Nonnull atexit)(void (*_Nonnull)(void)); + OFSignalHandler _Nullable (*_Nonnull signal)(int, OFSignalHandler _Nullable); + char *_Nullable (*_Nonnull setlocale)(int, const char *_Nullable); + int (*_Nonnull _Unwind_Backtrace)(int (*_Nonnull)(void *_Nonnull, + void *_Null_unspecified), void *_Null_unspecified); +#ifdef OF_MORPHOS + int (*_Nonnull setjmp)(jmp_buf); + void __dead2 (*_Nonnull longjmp)(jmp_buf, int); +#endif +}; + +extern bool OFInit(unsigned int version, struct OFLibC *_Nonnull libC, + struct Library *_Nonnull RTBase); +extern unsigned long *OFHashSeedRef(void); +extern void OFPBKDF2Wrapper(const OFPBKDF2Parameters *_Nonnull parameters); +extern void OFScryptWrapper(const OFScryptParameters *_Nonnull parameters); ADDED src/amiga-library.m Index: src/amiga-library.m ================================================================== --- /dev/null +++ src/amiga-library.m @@ -0,0 +1,758 @@ +/* + * Copyright (c) 2008-2023 Jonathan Schleifer + * + * All rights reserved. + * + * This file is part of ObjFW. It may be distributed under the terms of the + * Q Public License 1.0, which can be found in the file LICENSE.QPL included in + * the packaging of this file. + * + * Alternatively, it may be distributed under the terms of the GNU General + * Public License, either version 2 or 3, which can be found in the file + * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this + * file. + */ + +#include "config.h" + +#import "OFDNSResourceRecord.h" +#import "OFHTTPRequest.h" +#import "OFSocket.h" +#import "OFStdIOStream.h" +#import "OFString.h" + +#import "macros.h" + +#import "amiga-glue.h" +#import "amiga-library.h" + +#include +#include +#include +#include + +#define CONCAT_VERSION2(major, minor) #major "." #minor +#define CONCAT_VERSION(major, minor) CONCAT_VERSION2(major, minor) +#define VERSION_STRING CONCAT_VERSION(OBJFW_LIB_MAJOR, OBJFW_LIB_MINOR) + +#if defined(OF_AMIGAOS_M68K) +# define DATA_OFFSET 0x7FFE +#elif defined(OF_MORPHOS) +# define DATA_OFFSET 0x8000 +#endif + +#ifdef OF_AMIGAOS_M68K +# define OF_M68K_REG(reg) __asm__(#reg) +#else +# define OF_M68K_REG(reg) +#endif + +/* This always needs to be the first thing in the file. */ +int +_start(void) +{ + return -1; +} + +#ifdef OF_AMIGAOS_M68K +void +__init_eh(void) +{ + /* Taken care of by OFInit() */ +} +#endif + +struct ObjFWBase { + struct Library library; + void *segList; + struct ObjFWBase *parent; + char *dataSeg; + bool initialized; +}; + +#ifdef OF_AMIGAOS_M68K +extern uintptr_t __CTOR_LIST__[]; +extern const void *_EH_FRAME_BEGINS__; +extern void *_EH_FRAME_OBJECTS__; +#endif + +#ifdef OF_MORPHOS +const ULONG __abox__ = 1; +#endif +struct ExecBase *SysBase; +struct OFLibC libC; +struct Library *ObjFWRTBase; + +#if defined(OF_AMIGAOS_M68K) +__asm__ ( + ".text\n" + ".globl ___restore_a4\n" + ".align 1\n" + "___restore_a4:\n" + " movea.l 42(a6), a4\n" + " rts" +); +#elif defined(OF_MORPHOS) +/* All __saveds functions in this file need to use the M68K ABI */ +__asm__ ( + ".section .text\n" + ".align 2\n" + "__restore_r13:\n" + " lwz %r13, 56(%r2)\n" + " lwz %r13, 44(%r13)\n" + " blr\n" +); +#endif + +static OF_INLINE char * +getDataSeg(void) +{ + char *dataSeg; + +#if defined(OF_AMIGAOS_M68K) + __asm__ ( + "move.l #___a4_init, %0" + : "=r"(dataSeg) + ); +#elif defined(OF_MORPHOS) + __asm__ ( + "lis %0, __r13_init@ha\n\t" + "la %0, __r13_init@l(%0)" + : "=r"(dataSeg) + ); +#endif + + return dataSeg; +} + +static OF_INLINE size_t +getDataSize(void) +{ + size_t dataSize; + +#if defined(OF_AMIGAOS_M68K) + __asm__ ( + "move.l #___data_size, %0\n\t" + "add.l #___bss_size, %0" + : "=r"(dataSize) + ); +#elif defined(OF_MORPHOS) + __asm__ ( + "lis %0, __sdata_size@ha\n\t" + "la %0, __sdata_size@l(%0)\n\t" + "lis %%r9, __sbss_size@ha\n\t" + "la %%r9, __sbss_size@l(%%r9)\n\t" + "add %0, %0, %%r9" + : "=r"(dataSize) + :: "r9" + ); +#endif + + return dataSize; +} + +static OF_INLINE size_t * +getDataDataRelocs(void) +{ + size_t *dataDataRelocs; + +#if defined(OF_AMIGAOS_M68K) + __asm__ ( + "move.l #___datadata_relocs, %0" + : "=r"(dataDataRelocs) + ); +#elif defined(OF_MORPHOS) + __asm__ ( + "lis %0, __datadata_relocs@ha\n\t" + "la %0, __datadata_relocs@l(%0)\n\t" + : "=r"(dataDataRelocs) + ); +#endif + + return dataDataRelocs; +} + +static struct Library * +libInit(struct ObjFWBase *base OF_M68K_REG(d0), + void *segList OF_M68K_REG(a0), struct ExecBase *sysBase OF_M68K_REG(a6)) +{ +#if defined(OF_AMIGAOS_M68K) + __asm__ __volatile__ ( + "move.l a6, _SysBase" + :: "a"(sysBase) + ); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "lis %%r9, SysBase@ha\n\t" + "stw %0, SysBase@l(%%r9)" + :: "r"(sysBase) : "r9" + ); +#endif + + base->segList = segList; + base->parent = NULL; + base->dataSeg = getDataSeg(); + + return &base->library; +} + +struct Library *__saveds +libOpen(void) +{ + OF_M68K_ARG(struct ObjFWBase *, base, a6) + + struct ObjFWBase *child; + size_t dataSize, *dataDataRelocs; + ptrdiff_t displacement; + + if (base->parent != NULL) + return NULL; + + base->library.lib_OpenCnt++; + base->library.lib_Flags &= ~LIBF_DELEXP; + + /* + * We cannot use malloc here, as that depends on the libC passed from + * the application. + */ + if ((child = AllocMem(base->library.lib_NegSize + + base->library.lib_PosSize, MEMF_ANY)) == NULL) { + base->library.lib_OpenCnt--; + return NULL; + } + + memcpy(child, (char *)base - base->library.lib_NegSize, + base->library.lib_NegSize + base->library.lib_PosSize); + + child = (struct ObjFWBase *)((char *)child + base->library.lib_NegSize); + child->library.lib_OpenCnt = 1; + child->parent = base; + + dataSize = getDataSize(); + + if ((child->dataSeg = AllocMem(dataSize, MEMF_ANY)) == NULL) { + FreeMem((char *)child - child->library.lib_NegSize, + child->library.lib_NegSize + child->library.lib_PosSize); + base->library.lib_OpenCnt--; + return NULL; + } + + memcpy(child->dataSeg, base->dataSeg - DATA_OFFSET, dataSize); + + dataDataRelocs = getDataDataRelocs(); + displacement = child->dataSeg - (base->dataSeg - DATA_OFFSET); + + for (size_t i = 1; i <= dataDataRelocs[0]; i++) + *(long *)(child->dataSeg + dataDataRelocs[i]) += displacement; + + child->dataSeg += DATA_OFFSET; + + return &child->library; +} + +static void * +expunge(struct ObjFWBase *base, struct ExecBase *sysBase) +{ +#define SysBase sysBase + void *segList; + + if (base->parent != NULL) { + base->parent->library.lib_Flags |= LIBF_DELEXP; + return 0; + } + + if (base->library.lib_OpenCnt > 0) { + base->library.lib_Flags |= LIBF_DELEXP; + return 0; + } + + segList = base->segList; + + Remove(&base->library.lib_Node); + FreeMem((char *)base - base->library.lib_NegSize, + base->library.lib_NegSize + base->library.lib_PosSize); + + return segList; +#undef SysBase +} + +static void *__saveds +libExpunge(void) +{ + OF_M68K_ARG(struct ObjFWBase *, base, a6) + + return expunge(base, SysBase); +} + +static void *__saveds +libClose(void) +{ + /* + * SysBase becomes invalid during this function, so we store it in + * sysBase and add a define to make the inlines use the right one. + */ + struct ExecBase *sysBase = SysBase; +#define SysBase sysBase + + OF_M68K_ARG(struct ObjFWBase *, base, a6) + + if (base->parent != NULL) { + struct ObjFWBase *parent; + +#ifdef OF_AMIGAOS_M68K + if (base->initialized) + for (void *const *frame = _EH_FRAME_BEGINS__; + *frame != NULL;) + libC.__deregister_frame_info(*frame++); +#endif + + parent = base->parent; + + FreeMem(base->dataSeg - DATA_OFFSET, getDataSize()); + FreeMem((char *)base - base->library.lib_NegSize, + base->library.lib_NegSize + base->library.lib_PosSize); + + base = parent; + } + + if (--base->library.lib_OpenCnt == 0 && + (base->library.lib_Flags & LIBF_DELEXP)) + return expunge(base, sysBase); + + return NULL; +#undef SysBase +} + +static void * +libNull(void) +{ + return NULL; +} + +static void __saveds +OFInitPart2(uintptr_t *iter0, struct Library *RTBase) +{ + uintptr_t *iter; + + ObjFWRTBase = RTBase; + + for (iter = iter0; *iter != 0; iter++); + + while (iter > iter0) { + void (*ctor)(void) = (void (*)(void))*--iter; + ctor(); + } +} + +bool +OFInit(unsigned int version, struct OFLibC *libC_, struct Library *RTBase) +{ +#ifdef OF_AMIGAOS_M68K + OF_M68K_ARG(struct ObjFWBase *, base, a6) +#else + register struct ObjFWBase *r12 __asm__("r12"); + struct ObjFWBase *base = r12; +#endif +#ifdef OF_MORPHOS + void *frame; +#endif + uintptr_t *iter0; + + if (version > 1) + return false; + + if (base->initialized) + return true; + + memcpy(&libC, libC_, sizeof(libC)); + +#ifdef OF_AMIGAOS_M68K + for (void *const *frame = _EH_FRAME_BEGINS__, + **object = _EH_FRAME_OBJECTS__; *frame != NULL;) + libC.__register_frame_info(*frame++, *object++); + + iter0 = &__CTOR_LIST__[1]; +#elif defined(OF_MORPHOS) + __asm__ ( + "lis %0, __EH_FRAME_BEGIN__@ha\n\t" + "la %0, __EH_FRAME_BEGIN__@l(%0)\n\t" + "lis %1, __CTOR_LIST__@ha\n\t" + "la %1, __CTOR_LIST__@l(%1)\n\t" + : "=r"(frame), "=r"(iter0) + ); + + libC.__register_frame(frame); +#endif + + OFInitPart2(iter0, RTBase); + + base->initialized = true; + + return true; +} + +void * +malloc(size_t size) +{ + return libC.malloc(size); +} + +void * +calloc(size_t count, size_t size) +{ + return libC.calloc(count, size); +} + +void * +realloc(void *ptr, size_t size) +{ + return libC.realloc(ptr, size); +} + +void +free(void *ptr) +{ + libC.free(ptr); +} + +void +abort(void) +{ + libC.abort(); + + OF_UNREACHABLE +} + +#ifdef HAVE_SJLJ_EXCEPTIONS +int +_Unwind_SjLj_RaiseException(void *ex) +{ + return libC._Unwind_SjLj_RaiseException(ex); +} +#else +int +_Unwind_RaiseException(void *ex) +{ + return libC._Unwind_RaiseException(ex); +} +#endif + +void +_Unwind_DeleteException(void *ex) +{ + libC._Unwind_DeleteException(ex); +} + +void * +_Unwind_GetLanguageSpecificData(void *ctx) +{ + return libC._Unwind_GetLanguageSpecificData(ctx); +} + +uintptr_t +_Unwind_GetRegionStart(void *ctx) +{ + return libC._Unwind_GetRegionStart(ctx); +} + +uintptr_t +_Unwind_GetDataRelBase(void *ctx) +{ + return libC._Unwind_GetDataRelBase(ctx); +} + +uintptr_t +_Unwind_GetTextRelBase(void *ctx) +{ + return libC._Unwind_GetTextRelBase(ctx); +} + +uintptr_t +_Unwind_GetIP(void *ctx) +{ + return libC._Unwind_GetIP(ctx); +} + +uintptr_t +_Unwind_GetGR(void *ctx, int gr) +{ + return libC._Unwind_GetGR(ctx, gr); +} + +void +_Unwind_SetIP(void *ctx, uintptr_t ip) +{ + libC._Unwind_SetIP(ctx, ip); +} + +void +_Unwind_SetGR(void *ctx, int gr, uintptr_t value) +{ + libC._Unwind_SetGR(ctx, gr, value); +} + +#ifdef HAVE_SJLJ_EXCEPTIONS +void +_Unwind_SjLj_Resume(void *ex) +{ + libC._Unwind_SjLj_Resume(ex); +} +#else +void +_Unwind_Resume(void *ex) +{ + libC._Unwind_Resume(ex); +} +#endif + +#ifdef OF_AMIGAOS_M68K +void +__register_frame_info(const void *begin, void *object) +{ + libC.__register_frame_info(begin, object); +} + +void +*__deregister_frame_info(const void *begin) +{ + return libC.__deregister_frame_info(begin); +} +#endif + +#ifdef OF_MORPHOS +void __register_frame(void *frame) +{ + libC.__register_frame(frame); +} + +void __deregister_frame(void *frame) +{ + libC.__deregister_frame(frame); +} +#endif + +int * +OFErrNo(void) +{ + return libC.errNo(); +} + +#ifdef OF_MORPHOS +int +vasprintf(char **restrict strp, const char *restrict fmt, va_list args) +{ + return libC.vasprintf(strp, fmt, args); +} + +int +asprintf(char **restrict strp, const char *restrict fmt, ...) +{ + va_list args; + int ret; + + va_start(args, fmt); + ret = vasprintf(strp, fmt, args); + va_end(args); + + return ret; +} +#else +int +vsnprintf(char *restrict str, size_t size, const char *restrict fmt, + va_list args) +{ + return libC.vsnprintf(str, size, fmt, args); +} +#endif + +float +strtof(const char *str, char **endptr) +{ + return libC.strtof(str, endptr); +} + +double +strtod(const char *str, char **endptr) +{ + return libC.strtod(str, endptr); +} + +#ifdef OF_MORPHOS +struct tm * +gmtime_r(const time_t *time, struct tm *tm) +{ + return libC.gmtime_r(time, tm); +} + +struct tm * +localtime_r(const time_t *time, struct tm *tm) +{ + return libC.localtime_r(time, tm); +} +#endif + +int +gettimeofday(struct timeval *tv, struct timezone *tz) +{ + return libC.gettimeofday(tv, tz); +} + +time_t +mktime(struct tm *tm) +{ + return libC.mktime(tm); +} + +size_t +strftime(char *str, size_t len, const char *fmt, const struct tm *tm) +{ + return libC.strftime(str, len, fmt, tm); +} + +void +exit(int status) +{ + libC.exit(status); + + OF_UNREACHABLE +} + +int +atexit(void (*function)(void)) +{ + return libC.atexit(function); +} + +OFSignalHandler +signal(int sig, OFSignalHandler func) +{ + return libC.signal(sig, func); +} + +char * +setlocale(int category, const char *locale) +{ + return libC.setlocale(category, locale); +} + +int +_Unwind_Backtrace(int (*callback)(void *, void *), void *data) +{ + return libC._Unwind_Backtrace(callback, data); +} + +#ifdef OF_MORPHOS +int +setjmp(jmp_buf env) +{ + return libC.setjmp(env); +} + +void +longjmp(jmp_buf env, int val) +{ + libC.longjmp(env, val); +} +#endif + +void +OFPBKDF2Wrapper(const OFPBKDF2Parameters *parameters) +{ + OFPBKDF2(*parameters); +} + +void +OFScryptWrapper(const OFScryptParameters *parameters) +{ + OFScrypt(*parameters); +} + +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpedantic" +static CONST_APTR functionTable[] = { +#ifdef OF_MORPHOS + (CONST_APTR)FUNCARRAY_BEGIN, + (CONST_APTR)FUNCARRAY_32BIT_NATIVE, +#endif + (CONST_APTR)libOpen, + (CONST_APTR)libClose, + (CONST_APTR)libExpunge, + (CONST_APTR)libNull, +#ifdef OF_MORPHOS + (CONST_APTR)-1, + (CONST_APTR)FUNCARRAY_32BIT_SYSTEMV, +#endif +#include "amiga-funcarray.inc" + (CONST_APTR)-1, +#ifdef OF_MORPHOS + (CONST_APTR)FUNCARRAY_END +#endif +}; +#pragma GCC diagnostic pop + +static struct { + ULONG dataSize; + CONST_APTR *functionTable; + ULONG *dataTable; + struct Library *(*initFunc)( + struct ObjFWBase *base OF_M68K_REG(d0), + void *segList OF_M68K_REG(a0), + struct ExecBase *execBase OF_M68K_REG(a6)); +} init_table = { + sizeof(struct ObjFWBase), + functionTable, + NULL, + libInit +}; + +struct Resident resident = { + .rt_MatchWord = RTC_MATCHWORD, + .rt_MatchTag = &resident, + .rt_EndSkip = &resident + 1, + .rt_Flags = RTF_AUTOINIT +#ifdef OF_MORPHOS + | RTF_PPC | RTF_EXTENDED +#endif + , + .rt_Version = OBJFW_LIB_MAJOR, + .rt_Type = NT_LIBRARY, + .rt_Pri = 0, + .rt_Name = (char *)OBJFW_AMIGA_LIB, + .rt_IdString = (char *)"ObjFW " VERSION_STRING + " \xA9 2008-2023 Jonathan Schleifer", + .rt_Init = &init_table, +#ifdef OF_MORPHOS + .rt_Revision = OBJFW_LIB_MINOR, + .rt_Tags = NULL, +#endif +}; + +#if defined(OF_MORPHOS) +__asm__ ( + ".section .eh_frame, \"aw\"\n" + ".globl __EH_FRAME_BEGIN__\n" + ".type __EH_FRAME_BEGIN__, @object\n" + "__EH_FRAME_BEGIN__:\n" + ".section .ctors, \"aw\"\n" + ".globl __CTOR_LIST__\n" + ".type __CTOR_LIST__, @object\n" + "__CTOR_LIST__:\n" + ".section .text" +); +#elif defined(OF_AMIGAOS_M68K) +__asm__ ( + ".section .list___EH_FRAME_BEGINS__, \"aw\"\n" + ".globl __EH_FRAME_BEGIN__\n" + ".type __EH_FRAME_BEGIN__, @object\n" + "__EH_FRAME_BEGINS__:\n" + ".section .dlist___EH_FRAME_OBJECTS__, \"aw\"\n" + ".globl __EH_FRAME_OBJECTS__\n" + ".type __EH_FRAME_OBJECTS__, @object\n" + "__EH_FRAME_OBJECTS__:\n" + ".section .list___CTOR_LIST__, \"aw\"\n" + ".globl ___CTOR_LIST__\n" + ".type ___CTOR_LIST__, @object\n" + "___CTOR_LIST__:\n" + ".section .text" +); +#endif ADDED src/amiga-library.xml Index: src/amiga-library.xml ================================================================== --- /dev/null +++ src/amiga-library.xml @@ -0,0 +1,265 @@ + + amiga-library.h + + + + + + + OFObject.h + + + + + + + + + + + + + + + + + + + + + + + + OFStdIOStream.h + + + + + + + + OFApplication.h + + + + + + OFBlock.h + + + + + + + OFDNSResourceRecord.h + + + + + + + + + + + + + OFEmbeddedURIHandler.h + + + + + + OFHTTPRequest.h + + + + + + + OFHTTPResponse.h + + + + OFList.h + + + + + + + + + + OFMethodSignature.h + + + + + + + OFOnce.h + + + + + OFPBKDF2.h + + + + OFScrypt.h + + + + + + + + + + + + + + + + + + + OFSocket.h + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + OFTLSStream.h + + + + + OFStrPTime.h + + + + + + + OFString.h + + + + + + + + + + + + + OFZIPArchiveEntry.h + + + + + + + + + + + + Index: src/encodings/Makefile ================================================================== --- src/encodings/Makefile +++ src/encodings/Makefile @@ -1,9 +1,10 @@ include ../../extra.mk STATIC_PIC_LIB_NOINST = ${ENCODINGS_LIB_A} STATIC_LIB_NOINST = ${ENCODINGS_A} +STATIC_AMIGA_LIB_NOINST = ${ENCODINGS_AMIGALIB_A} SRCS = ${ENCODINGS_SRCS} include ../../buildsys.mk Index: src/exceptions/Makefile ================================================================== --- src/exceptions/Makefile +++ src/exceptions/Makefile @@ -1,9 +1,10 @@ include ../../extra.mk STATIC_PIC_LIB_NOINST = ${EXCEPTIONS_LIB_A} STATIC_LIB_NOINST = ${EXCEPTIONS_A} +STATIC_AMIGA_LIB_NOINST = ${EXCEPTIONS_AMIGALIB_A} SRCS = OFAllocFailedException.m \ OFAlreadyOpenException.m \ OFChecksumMismatchException.m \ OFCopyItemFailedException.m \ Index: src/forwarding/Makefile ================================================================== --- src/forwarding/Makefile +++ src/forwarding/Makefile @@ -1,9 +1,10 @@ include ../../extra.mk STATIC_PIC_LIB_NOINST = ${FORWARDING_LIB_A} STATIC_LIB_NOINST = ${FORWARDING_A} +STATIC_AMIGA_LIB_NOINST = ${FORWARDING_AMIGALIB_A} SRCS = forwarding.S include ../../buildsys.mk Index: src/libbases.m ================================================================== --- src/libbases.m +++ src/libbases.m @@ -21,10 +21,13 @@ #import "OFInitializationFailedException.h" #import "macros.h" +#ifdef OF_COMPILING_AMIGA_LIBRARY +struct Library *DOSBase; +#endif #ifdef OF_AMIGAOS4 extern struct Library *DOSBase; extern struct DOSIFace *IDOS; #endif struct Library *LocaleBase; @@ -32,14 +35,16 @@ struct LocaleIFace *ILocale; #endif OF_CONSTRUCTOR() { -#ifdef OF_AMIGAOS4 +#if defined(OF_COMPILING_AMIGA_LIBRARY) || defined(OF_AMIGAOS4) if ((DOSBase = OpenLibrary("dos.library", 36)) == NULL) @throw [OFInitializationFailedException exception]; +#endif +#ifdef OF_AMIGAOS4 if ((IDOS = (struct DOSIFace *) GetInterface(DOSBase, "main", 1, NULL)) == NULL) @throw [OFInitializationFailedException exception]; #endif @@ -62,12 +67,14 @@ if (LocaleBase != NULL) CloseLibrary(LocaleBase); #ifdef OF_AMIGAOS4 - if (DOSBase != NULL) - CloseLibrary(DOSBase); - if (IDOS != NULL) DropInterface((struct Interface *)IDOS); #endif + +#if defined(OF_COMPILING_AMIGA_LIBRARY) || defined(OF_AMIGAOS4) + if (DOSBase != NULL) + CloseLibrary(DOSBase); +#endif } ADDED src/linklib/Makefile Index: src/linklib/Makefile ================================================================== --- /dev/null +++ src/linklib/Makefile @@ -0,0 +1,13 @@ +include ../../extra.mk + +STATIC_LIB = libobjfw.library.a +STATIC_AMIGA_LIB = libobjfw.library.amigalib.a +SRCS = init.m \ + linklib.m + +include ../../buildsys.mk + +CPPFLAGS += -I.. -I../.. -I../exceptions -I../runtime \ + -DOBJFW_AMIGA_LIB=\"${OBJFW_AMIGA_LIB}\" \ + -DOBJFW_LIB_MINOR=${OBJFW_LIB_MINOR} +AMIGA_LIB_CFLAGS += -DOF_AMIGA_LIB ADDED src/linklib/init.m Index: src/linklib/init.m ================================================================== --- /dev/null +++ src/linklib/init.m @@ -0,0 +1,428 @@ +/* + * Copyright (c) 2008-2023 Jonathan Schleifer + * + * All rights reserved. + * + * This file is part of ObjFW. It may be distributed under the terms of the + * Q Public License 1.0, which can be found in the file LICENSE.QPL included in + * the packaging of this file. + * + * Alternatively, it may be distributed under the terms of the GNU General + * Public License, either version 2 or 3, which can be found in the file + * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this + * file. + */ + +#include "config.h" + +#include +#include +#include +#include +#include + +#include + +#import "OFFileManager.h" +#import "OFRunLoop.h" +#import "OFStdIOStream.h" + +#import "macros.h" +#import "amiga-library.h" + +#define USE_INLINE_STDARG +#include +#include + +#if defined(OF_AMIGAOS_M68K) +# include +#elif defined(OF_MORPHOS) +# include +#endif + +extern struct Library *ObjFWRTBase; +#ifdef HAVE_SJLJ_EXCEPTIONS +extern int _Unwind_SjLj_RaiseException(void *); +#else +extern int _Unwind_RaiseException(void *); +#endif +extern void _Unwind_DeleteException(void *); +extern void *_Unwind_GetLanguageSpecificData(void *); +extern uintptr_t _Unwind_GetRegionStart(void *); +extern uintptr_t _Unwind_GetDataRelBase(void *); +extern uintptr_t _Unwind_GetTextRelBase(void *); +extern uintptr_t _Unwind_GetIP(void *); +extern uintptr_t _Unwind_GetGR(void *, int); +extern void _Unwind_SetIP(void *, uintptr_t); +extern void _Unwind_SetGR(void *, int, uintptr_t); +#ifdef HAVE_SJLJ_EXCEPTIONS +extern void _Unwind_SjLj_Resume(void *); +#else +extern void _Unwind_Resume(void *); +#endif +#ifdef OF_AMIGAOS_M68K +extern void __register_frame_info(const void *, void *); +extern void *__deregister_frame_info(const void *); +#endif +#ifdef OF_MORPHOS +extern void __register_frame(void *); +extern void __deregister_frame(void *); +#endif +extern int _Unwind_Backtrace(int (*)(void *, void *), void *); + +struct Library *ObjFWBase; +void *__objc_class_name_OFApplication; +void *__objc_class_name_OFArray; +void *__objc_class_name_OFCharacterSet; +void *__objc_class_name_OFColor; +void *__objc_class_name_OFConstantString; +void *__objc_class_name_OFCountedSet; +void *__objc_class_name_OFData; +void *__objc_class_name_OFDate; +void *__objc_class_name_OFDictionary; +void *__objc_class_name_OFEnumerator; +void *__objc_class_name_OFFileManager; +void *__objc_class_name_OFGZIPStream; +void *__objc_class_name_OFHMAC; +void *__objc_class_name_OFINICategory; +void *__objc_class_name_OFINIFile; +void *__objc_class_name_OFInflate64Stream; +void *__objc_class_name_OFInflateStream; +void *__objc_class_name_OFInvocation; +void *__objc_class_name_OFLHAArchive; +void *__objc_class_name_OFLHAArchiveEntry; +void *__objc_class_name_OFList; +void *__objc_class_name_OFLocale; +void *__objc_class_name_OFMD5Hash; +void *__objc_class_name_OFMapTable; +void *__objc_class_name_OFMapTableEnumerator; +void *__objc_class_name_OFMemoryStream; +void *__objc_class_name_OFMessagePackExtension; +void *__objc_class_name_OFMethodSignature; +void *__objc_class_name_OFMutableArray; +void *__objc_class_name_OFMutableData; +void *__objc_class_name_OFMutableDictionary; +void *__objc_class_name_OFMutableLHAArchiveEntry; +void *__objc_class_name_OFMutablePair; +void *__objc_class_name_OFMutableSet; +void *__objc_class_name_OFMutableString; +void *__objc_class_name_OFMutableTarArchiveEntry; +void *__objc_class_name_OFMutableTriple; +void *__objc_class_name_OFMutableURI; +void *__objc_class_name_OFMutableZIPArchiveEntry; +void *__objc_class_name_OFNotification; +void *__objc_class_name_OFNotificationCenter; +void *__objc_class_name_OFNull; +void *__objc_class_name_OFNumber; +void *__objc_class_name_OFObject; +void *__objc_class_name_OFOptionsParser; +void *__objc_class_name_OFPair; +void *__objc_class_name_OFRIPEMD160Hash; +void *__objc_class_name_OFRunLoop; +void *__objc_class_name_OFSHA1Hash; +void *__objc_class_name_OFSHA224Hash; +void *__objc_class_name_OFSHA224Or256Hash; +void *__objc_class_name_OFSHA256Hash; +void *__objc_class_name_OFSHA384Hash; +void *__objc_class_name_OFSHA384Or512Hash; +void *__objc_class_name_OFSHA512Hash; +void *__objc_class_name_OFSandbox; +void *__objc_class_name_OFSecureData; +void *__objc_class_name_OFSeekableStream; +void *__objc_class_name_OFSet; +void *__objc_class_name_OFSettings; +void *__objc_class_name_OFSortedList; +void *__objc_class_name_OFStdIOStream; +void *__objc_class_name_OFStream; +void *__objc_class_name_OFString; +void *__objc_class_name_OFSystemInfo; +void *__objc_class_name_OFTarArchive; +void *__objc_class_name_OFTarArchiveEntry; +void *__objc_class_name_OFThread; +void *__objc_class_name_OFTimer; +void *__objc_class_name_OFTriple; +void *__objc_class_name_OFURI; +void *__objc_class_name_OFURIHandler; +void *__objc_class_name_OFUUID; +void *__objc_class_name_OFValue; +void *__objc_class_name_OFXMLAttribute; +void *__objc_class_name_OFXMLCDATA; +void *__objc_class_name_OFXMLCharacters; +void *__objc_class_name_OFXMLComment; +void *__objc_class_name_OFXMLElement; +void *__objc_class_name_OFXMLElementBuilder; +void *__objc_class_name_OFXMLNode; +void *__objc_class_name_OFXMLParser; +void *__objc_class_name_OFXMLProcessingInstructions; +void *__objc_class_name_OFZIPArchive; +void *__objc_class_name_OFZIPArchiveEntry; +#ifdef OF_HAVE_FILES +void *__objc_class_name_OFFile; +#endif +#ifdef OF_HAVE_SOCKETS +void *__objc_class_name_OFAAAADNSResourceRecord; +void *__objc_class_name_OFADNSResourceRecord; +void *__objc_class_name_OFCNAMEDNSResourceRecord; +void *__objc_class_name_OFDNSQuery; +void *__objc_class_name_OFDNSResolver; +void *__objc_class_name_OFDNSResourceRecord; +void *__objc_class_name_OFDNSResponse; +void *__objc_class_name_OFDatagramSocket; +void *__objc_class_name_OFHINFODNSResourceRecord; +void *__objc_class_name_OFHTTPClient; +void *__objc_class_name_OFHTTPCookie; +void *__objc_class_name_OFHTTPCookieManager; +void *__objc_class_name_OFHTTPRequest; +void *__objc_class_name_OFHTTPResponse; +void *__objc_class_name_OFHTTPServer; +void *__objc_class_name_OFKernelEventObserver; +void *__objc_class_name_OFMXDNSResourceRecord; +void *__objc_class_name_OFNSDNSResourceRecord; +void *__objc_class_name_OFPTRDNSResourceRecord; +void *__objc_class_name_OFRPDNSResourceRecord; +void *__objc_class_name_OFSOADNSResourceRecord; +void *__objc_class_name_OFSRVDNSResourceRecord; +void *__objc_class_name_OFSequencedPacketSocket; +void *__objc_class_name_OFStreamSocket; +void *__objc_class_name_OFTCPSocket; +void *__objc_class_name_OFTLSStream; +void *__objc_class_name_OFTXTDNSResourceRecord; +void *__objc_class_name_OFUDPSocket; +#endif +#ifdef OF_HAVE_THREADS +void *__objc_class_name_OFCondition; +void *__objc_class_name_OFMutex; +void *__objc_class_name_OFRecursiveMutex; +#endif +void *__objc_class_name_OFAllocFailedException; +void *__objc_class_name_OFChecksumMismatchException; +void *__objc_class_name_OFCopyItemFailedException; +void *__objc_class_name_OFCreateDirectoryFailedException; +void *__objc_class_name_OFCreateSymbolicLinkFailedException; +void *__objc_class_name_OFEnumerationMutationException; +void *__objc_class_name_OFException; +void *__objc_class_name_OFGetItemAttributesFailedException; +void *__objc_class_name_OFGetOptionFailedException; +void *__objc_class_name_OFHashAlreadyCalculatedException; +void *__objc_class_name_OFHashNotCalculatedException; +void *__objc_class_name_OFInitializationFailedException; +void *__objc_class_name_OFInvalidArgumentException; +void *__objc_class_name_OFInvalidEncodingException; +void *__objc_class_name_OFInvalidFormatException; +void *__objc_class_name_OFInvalidJSONException; +void *__objc_class_name_OFInvalidServerResponseException; +void *__objc_class_name_OFLinkItemFailedException; +void *__objc_class_name_OFLockFailedException; +void *__objc_class_name_OFMalformedXMLException; +void *__objc_class_name_OFMoveItemFailedException; +void *__objc_class_name_OFNotImplementedException; +void *__objc_class_name_OFNotOpenException; +void *__objc_class_name_OFOpenItemFailedException; +void *__objc_class_name_OFOutOfMemoryException; +void *__objc_class_name_OFOutOfRangeException; +void *__objc_class_name_OFReadFailedException; +void *__objc_class_name_OFReadOrWriteFailedException; +void *__objc_class_name_OFRemoveItemFailedException; +void *__objc_class_name_OFSeekFailedException; +void *__objc_class_name_OFSetItemAttributesFailedException; +void *__objc_class_name_OFSetOptionFailedException; +void *__objc_class_name_OFStillLockedException; +void *__objc_class_name_OFTruncatedDataException; +void *__objc_class_name_OFUnboundNamespaceException; +void *__objc_class_name_OFUnboundPrefixException; +void *__objc_class_name_OFUndefinedKeyException; +void *__objc_class_name_OFUnknownXMLEntityException; +void *__objc_class_name_OFUnlockFailedException; +void *__objc_class_name_OFUnsupportedProtocolException; +void *__objc_class_name_OFUnsupportedVersionException; +void *__objc_class_name_OFWriteFailedException; +#ifdef OF_HAVE_FILES +void *__objc_class_name_OFChangeCurrentDirectoryFailedException; +void *__objc_class_name_OFGetCurrentDirectoryFailedException; +#endif +#ifdef OF_HAVE_SOCKETS +void *__objc_class_name_OFAcceptSocketFailedException; +void *__objc_class_name_OFAlreadyConnectedException; +void *__objc_class_name_OFBindIPSocketFailedException; +void *__objc_class_name_OFBindSocketFailedException; +void *__objc_class_name_OFConnectIPSocketFailedException; +void *__objc_class_name_OFConnectSocketFailedException; +void *__objc_class_name_OFDNSQueryFailedException; +void *__objc_class_name_OFHTTPRequestFailedException; +void *__objc_class_name_OFListenOnSocketFailedException; +void *__objc_class_name_OFObserveKernelEventsFailedException; +void *__objc_class_name_OFResolveHostFailedException; +void *__objc_class_name_OFTLSHandshakeFailedException; +#endif +#ifdef OF_HAVE_THREADS +void *__objc_class_name_OFBroadcastConditionFailedException; +void *__objc_class_name_OFConditionStillWaitingException; +void *__objc_class_name_OFJoinThreadFailedException; +void *__objc_class_name_OFSignalConditionFailedException; +void *__objc_class_name_OFStartThreadFailedException; +void *__objc_class_name_OFThreadStillRunningException; +void *__objc_class_name_OFWaitForConditionFailedException; +#endif +#include "OFFileManagerConstants.inc" +#include "OFRunLoopConstants.inc" +/* The following __objc_class_name_* are only required for the tests. */ +void *__objc_class_name_OFBitSetCharacterSet; +void *__objc_class_name_OFMapTableSet; +void *__objc_class_name_OFMutableMapTableSet; +void *__objc_class_name_OFMutableUTF8String; +void *__objc_class_name_OFRangeCharacterSet; +void *__objc_class_name_OFSelectKernelEventObserver; +void *__objc_class_name_OFUTF8String; + +#ifndef OF_AMIGA_LIB +struct Library *ObjFWBase; + +static void +error(const char *string, ULONG arg) +{ + struct Library *IntuitionBase = OpenLibrary("intuition.library", 0); + + if (IntuitionBase != NULL) { + struct EasyStruct easy = { + .es_StructSize = sizeof(easy), + .es_Flags = 0, + .es_Title = (UBYTE *)NULL, + .es_TextFormat = (UBYTE *)string, + (UBYTE *)"OK" + }; + + EasyRequest(NULL, &easy, NULL, arg); + + CloseLibrary(IntuitionBase); + } + + exit(EXIT_FAILURE); +} + +static int * +errNo(void) +{ + return &errno; +} + +static void __attribute__((__used__)) +ctor(void) +{ + static bool initialized = false; + struct OFLibC libC = { + .malloc = malloc, + .calloc = calloc, + .realloc = realloc, + .free = free, + .abort = abort, +#ifdef HAVE_SJLJ_EXCEPTIONS + ._Unwind_SjLj_RaiseException = _Unwind_SjLj_RaiseException, +#else + ._Unwind_RaiseException = _Unwind_RaiseException, +#endif + ._Unwind_DeleteException = _Unwind_DeleteException, + ._Unwind_GetLanguageSpecificData = + _Unwind_GetLanguageSpecificData, + ._Unwind_GetRegionStart = _Unwind_GetRegionStart, + ._Unwind_GetDataRelBase = _Unwind_GetDataRelBase, + ._Unwind_GetTextRelBase = _Unwind_GetTextRelBase, + ._Unwind_GetIP = _Unwind_GetIP, + ._Unwind_GetGR = _Unwind_GetGR, + ._Unwind_SetIP = _Unwind_SetIP, + ._Unwind_SetGR = _Unwind_SetGR, +#ifdef HAVE_SJLJ_EXCEPTIONS + ._Unwind_SjLj_Resume = _Unwind_SjLj_Resume, +#else + ._Unwind_Resume = _Unwind_Resume, +#endif +#ifdef OF_AMIGAOS_M68K + .__register_frame_info = __register_frame_info, + .__deregister_frame_info = __deregister_frame_info, +#endif +#ifdef OF_MORPHOS + .__register_frame = __register_frame, + .__deregister_frame = __deregister_frame, +#endif + .errNo = errNo, +#ifdef OF_MORPHOS + .vasprintf = vasprintf, +#else + .vsnprintf = vsnprintf, +#endif + .strtof = strtof, + .strtod = strtod, +#ifdef OF_MORPHOS + .gmtime_r = gmtime_r, + .localtime_r = localtime_r, +#endif + .mktime = mktime, + .gettimeofday = gettimeofday, + .strftime = strftime, + .exit = exit, + .atexit = atexit, + .signal = signal, + .setlocale = setlocale, + ._Unwind_Backtrace = _Unwind_Backtrace + }; + + if (initialized) + return; + + if ((ObjFWBase = OpenLibrary(OBJFW_AMIGA_LIB, OBJFW_LIB_MINOR)) == NULL) + error("Failed to open " OBJFW_AMIGA_LIB " version %lu!", + OBJFW_LIB_MINOR); + + if (!OFInit(1, &libC, ObjFWRTBase)) + error("Failed to initialize " OBJFW_AMIGA_LIB "!", 0); + + initialized = true; +} + +static void __attribute__((__used__)) +dtor(void) +{ + CloseLibrary(ObjFWBase); +} + +# if defined(OF_AMIGAOS_M68K) +ADD2INIT(ctor, -2); +ADD2EXIT(dtor, -2); +# elif defined(OF_MORPHOS) +CONSTRUCTOR_P(ObjFW, 5000) +{ + ctor(); + + return 0; +} + +DESTRUCTOR_P(ObjFW, 5000) +{ + dtor(); +} +# endif +#endif + +extern void OFPBKDF2Wrapper(const OFPBKDF2Parameters *parameters); +extern void OFScryptWrapper(const OFScryptParameters *parameters); + +void +OFLog(OFConstantString *format, ...) +{ + va_list arguments; + + va_start(arguments, format); + OFLogV(format, arguments); + va_end(arguments); +} + +void +OFPBKDF2(OFPBKDF2Parameters parameters) +{ + OFPBKDF2Wrapper(¶meters); +} + +void +OFScrypt(OFScryptParameters parameters) +{ + OFScryptWrapper(¶meters); +} ADDED src/linklib/linklib.m Index: src/linklib/linklib.m ================================================================== --- /dev/null +++ src/linklib/linklib.m @@ -0,0 +1,1217 @@ +/* + * Copyright (c) 2008-2023 Jonathan Schleifer + * + * All rights reserved. + * + * This file is part of ObjFW. It may be distributed under the terms of the + * Q Public License 1.0, which can be found in the file LICENSE.QPL included in + * the packaging of this file. + * + * Alternatively, it may be distributed under the terms of the GNU General + * Public License, either version 2 or 3, which can be found in the file + * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this + * file. + */ + +/* This file is automatically generated from amiga-library.xml */ + +#include "config.h" + +#import "amiga-library.h" +#import "OFObject.h" +#import "OFStdIOStream.h" +#import "OFApplication.h" +#import "OFBlock.h" +#import "OFDNSResourceRecord.h" +#import "OFEmbeddedURIHandler.h" +#import "OFHTTPRequest.h" +#import "OFHTTPResponse.h" +#import "OFList.h" +#import "OFMethodSignature.h" +#import "OFOnce.h" +#import "OFPBKDF2.h" +#import "OFScrypt.h" +#import "OFSocket.h" +#import "OFTLSStream.h" +#import "OFStrPTime.h" +#import "OFString.h" +#import "OFZIPArchiveEntry.h" + +extern struct Library *ObjFWBase; + +#if OF_GCC_VERSION >= 1100 +# pragma GCC diagnostic ignored "-Warray-parameter" +#endif + +bool +OFInit(unsigned int version, struct OFLibC *_Nonnull libc, struct Library *_Nonnull RTBase) +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + return ((bool (*)(unsigned int __asm__("d0"), struct OFLibC *_Nonnull __asm__("a0"), struct Library *_Nonnull __asm__("a1")))(((uintptr_t)ObjFWBase) - 30))(version, libc, RTBase); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + return __extension__ ((bool (*)(unsigned int, struct OFLibC *_Nonnull, struct Library *_Nonnull))*(void **)(((uintptr_t)ObjFWBase) - 28))(version, libc, RTBase); +#endif +} + +void *_Nullable +OFAllocMemory(size_t count, size_t size) +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + return ((void *_Nullable (*)(size_t __asm__("d0"), size_t __asm__("d1")))(((uintptr_t)ObjFWBase) - 36))(count, size); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + return __extension__ ((void *_Nullable (*)(size_t, size_t))*(void **)(((uintptr_t)ObjFWBase) - 34))(count, size); +#endif +} + +void *_Nullable +OFAllocZeroedMemory(size_t count, size_t size) +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + return ((void *_Nullable (*)(size_t __asm__("d0"), size_t __asm__("d1")))(((uintptr_t)ObjFWBase) - 42))(count, size); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + return __extension__ ((void *_Nullable (*)(size_t, size_t))*(void **)(((uintptr_t)ObjFWBase) - 40))(count, size); +#endif +} + +void *_Nullable +OFResizeMemory(void *_Nullable pointer, size_t count, size_t size) +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + return ((void *_Nullable (*)(void *_Nullable __asm__("a0"), size_t __asm__("d0"), size_t __asm__("d1")))(((uintptr_t)ObjFWBase) - 48))(pointer, count, size); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + return __extension__ ((void *_Nullable (*)(void *_Nullable, size_t, size_t))*(void **)(((uintptr_t)ObjFWBase) - 46))(pointer, count, size); +#endif +} + +void +OFFreeMemory(void *_Nullable pointer) +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + ((void (*)(void *_Nullable __asm__("a0")))(((uintptr_t)ObjFWBase) - 54))(pointer); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + __extension__ ((void (*)(void *_Nullable))*(void **)(((uintptr_t)ObjFWBase) - 52))(pointer); +#endif +} + +void +OFHashInit(unsigned long *_Nonnull hash) +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + ((void (*)(unsigned long *_Nonnull __asm__("a0")))(((uintptr_t)ObjFWBase) - 60))(hash); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + __extension__ ((void (*)(unsigned long *_Nonnull))*(void **)(((uintptr_t)ObjFWBase) - 58))(hash); +#endif +} + +uint16_t +OFRandom16() +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + return ((uint16_t (*)())(((uintptr_t)ObjFWBase) - 66))(); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + return __extension__ ((uint16_t (*)())*(void **)(((uintptr_t)ObjFWBase) - 64))(); +#endif +} + +uint32_t +OFRandom32() +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + return ((uint32_t (*)())(((uintptr_t)ObjFWBase) - 72))(); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + return __extension__ ((uint32_t (*)())*(void **)(((uintptr_t)ObjFWBase) - 70))(); +#endif +} + +uint64_t +OFRandom64() +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + return ((uint64_t (*)())(((uintptr_t)ObjFWBase) - 78))(); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + return __extension__ ((uint64_t (*)())*(void **)(((uintptr_t)ObjFWBase) - 76))(); +#endif +} + +unsigned long *_Nonnull +OFHashSeedRef() +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + return ((unsigned long *_Nonnull (*)())(((uintptr_t)ObjFWBase) - 84))(); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + return __extension__ ((unsigned long *_Nonnull (*)())*(void **)(((uintptr_t)ObjFWBase) - 82))(); +#endif +} + +OFStdIOStream *_Nonnull *_Nullable +OFStdInRef() +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + return ((OFStdIOStream *_Nonnull *_Nullable (*)())(((uintptr_t)ObjFWBase) - 90))(); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + return __extension__ ((OFStdIOStream *_Nonnull *_Nullable (*)())*(void **)(((uintptr_t)ObjFWBase) - 88))(); +#endif +} + +OFStdIOStream *_Nonnull *_Nullable +OFStdOutRef() +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + return ((OFStdIOStream *_Nonnull *_Nullable (*)())(((uintptr_t)ObjFWBase) - 96))(); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + return __extension__ ((OFStdIOStream *_Nonnull *_Nullable (*)())*(void **)(((uintptr_t)ObjFWBase) - 94))(); +#endif +} + +OFStdIOStream *_Nonnull *_Nullable +OFStdErrRef() +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + return ((OFStdIOStream *_Nonnull *_Nullable (*)())(((uintptr_t)ObjFWBase) - 102))(); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + return __extension__ ((OFStdIOStream *_Nonnull *_Nullable (*)())*(void **)(((uintptr_t)ObjFWBase) - 100))(); +#endif +} + +void +OFLogV(OFConstantString *format, va_list arguments) +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + ((void (*)(OFConstantString *__asm__("a0"), va_list __asm__("a1")))(((uintptr_t)ObjFWBase) - 108))(format, arguments); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + __extension__ ((void (*)(OFConstantString *, va_list))*(void **)(((uintptr_t)ObjFWBase) - 106))(format, arguments); +#endif +} + +int +OFApplicationMain(int *_Nonnull argc, char *_Nullable *_Nonnull *_Nonnull argv, id delegate) +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + return ((int (*)(int *_Nonnull __asm__("a0"), char *_Nullable *_Nonnull *_Nonnull __asm__("a1"), id __asm__("a2")))(((uintptr_t)ObjFWBase) - 114))(argc, argv, delegate); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + return __extension__ ((int (*)(int *_Nonnull, char *_Nullable *_Nonnull *_Nonnull, id ))*(void **)(((uintptr_t)ObjFWBase) - 112))(argc, argv, delegate); +#endif +} + +void *_Nullable +_Block_copy(const void *_Nullable block) +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + return ((void *_Nullable (*)(const void *_Nullable __asm__("a0")))(((uintptr_t)ObjFWBase) - 120))(block); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + return __extension__ ((void *_Nullable (*)(const void *_Nullable))*(void **)(((uintptr_t)ObjFWBase) - 118))(block); +#endif +} + +void +_Block_release(const void *_Nullable block) +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + ((void (*)(const void *_Nullable __asm__("a0")))(((uintptr_t)ObjFWBase) - 126))(block); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + __extension__ ((void (*)(const void *_Nullable))*(void **)(((uintptr_t)ObjFWBase) - 124))(block); +#endif +} + +OFString *_Nonnull +OFDNSClassName(OFDNSClass DNSClass) +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + return ((OFString *_Nonnull (*)(OFDNSClass __asm__("d0")))(((uintptr_t)ObjFWBase) - 132))(DNSClass); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + return __extension__ ((OFString *_Nonnull (*)(OFDNSClass))*(void **)(((uintptr_t)ObjFWBase) - 130))(DNSClass); +#endif +} + +OFString *_Nonnull +OFDNSRecordTypeName(OFDNSRecordType recordType) +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + return ((OFString *_Nonnull (*)(OFDNSRecordType __asm__("d0")))(((uintptr_t)ObjFWBase) - 138))(recordType); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + return __extension__ ((OFString *_Nonnull (*)(OFDNSRecordType))*(void **)(((uintptr_t)ObjFWBase) - 136))(recordType); +#endif +} + +OFDNSClass +OFDNSClassParseName(OFString *_Nonnull string) +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + return ((OFDNSClass (*)(OFString *_Nonnull __asm__("a0")))(((uintptr_t)ObjFWBase) - 144))(string); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + return __extension__ ((OFDNSClass (*)(OFString *_Nonnull))*(void **)(((uintptr_t)ObjFWBase) - 142))(string); +#endif +} + +OFDNSRecordType +OFDNSRecordTypeParseName(OFString *_Nonnull string) +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + return ((OFDNSRecordType (*)(OFString *_Nonnull __asm__("a0")))(((uintptr_t)ObjFWBase) - 150))(string); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + return __extension__ ((OFDNSRecordType (*)(OFString *_Nonnull))*(void **)(((uintptr_t)ObjFWBase) - 148))(string); +#endif +} + +void +OFRegisterEmbeddedFile(OFString *_Nonnull name, const uint8_t *_Nonnull bytes, size_t size) +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + ((void (*)(OFString *_Nonnull __asm__("a0"), const uint8_t *_Nonnull __asm__("a1"), size_t __asm__("d0")))(((uintptr_t)ObjFWBase) - 156))(name, bytes, size); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + __extension__ ((void (*)(OFString *_Nonnull, const uint8_t *_Nonnull, size_t))*(void **)(((uintptr_t)ObjFWBase) - 154))(name, bytes, size); +#endif +} + +const char *_Nullable +OFHTTPRequestMethodName(OFHTTPRequestMethod method) +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + return ((const char *_Nullable (*)(OFHTTPRequestMethod __asm__("d0")))(((uintptr_t)ObjFWBase) - 162))(method); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + return __extension__ ((const char *_Nullable (*)(OFHTTPRequestMethod))*(void **)(((uintptr_t)ObjFWBase) - 160))(method); +#endif +} + +OFHTTPRequestMethod +OFHTTPRequestMethodParseName(OFString *string) +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + return ((OFHTTPRequestMethod (*)(OFString *__asm__("a0")))(((uintptr_t)ObjFWBase) - 168))(string); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + return __extension__ ((OFHTTPRequestMethod (*)(OFString *))*(void **)(((uintptr_t)ObjFWBase) - 166))(string); +#endif +} + +OFString *_Nonnull +OFHTTPStatusCodeString(short code) +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + return ((OFString *_Nonnull (*)(short __asm__("d0")))(((uintptr_t)ObjFWBase) - 174))(code); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + return __extension__ ((OFString *_Nonnull (*)(short))*(void **)(((uintptr_t)ObjFWBase) - 172))(code); +#endif +} + +OFListItem _Nullable +OFListItemNext(OFListItem _Nonnull listItem) +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + return ((OFListItem _Nullable (*)(OFListItem _Nonnull __asm__("a0")))(((uintptr_t)ObjFWBase) - 180))(listItem); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + return __extension__ ((OFListItem _Nullable (*)(OFListItem _Nonnull))*(void **)(((uintptr_t)ObjFWBase) - 178))(listItem); +#endif +} + +OFListItem _Nullable +OFListItemPrevious(OFListItem _Nonnull listItem) +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + return ((OFListItem _Nullable (*)(OFListItem _Nonnull __asm__("a0")))(((uintptr_t)ObjFWBase) - 186))(listItem); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + return __extension__ ((OFListItem _Nullable (*)(OFListItem _Nonnull))*(void **)(((uintptr_t)ObjFWBase) - 184))(listItem); +#endif +} + +id _Nonnull +OFListItemObject(OFListItem _Nonnull listItem) +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + return ((id _Nonnull (*)(OFListItem _Nonnull __asm__("a0")))(((uintptr_t)ObjFWBase) - 192))(listItem); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + return __extension__ ((id _Nonnull (*)(OFListItem _Nonnull))*(void **)(((uintptr_t)ObjFWBase) - 190))(listItem); +#endif +} + +size_t +OFSizeOfTypeEncoding(const char *type) +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + return ((size_t (*)(const char *__asm__("a0")))(((uintptr_t)ObjFWBase) - 198))(type); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + return __extension__ ((size_t (*)(const char *))*(void **)(((uintptr_t)ObjFWBase) - 196))(type); +#endif +} + +size_t +OFAlignmentOfTypeEncoding(const char *type) +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + return ((size_t (*)(const char *__asm__("a0")))(((uintptr_t)ObjFWBase) - 204))(type); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + return __extension__ ((size_t (*)(const char *))*(void **)(((uintptr_t)ObjFWBase) - 202))(type); +#endif +} + +void +OFOnce(OFOnceControl *_Nonnull control, OFOnceFunction _Nonnull func) +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + ((void (*)(OFOnceControl *_Nonnull __asm__("a0"), OFOnceFunction _Nonnull __asm__("a1")))(((uintptr_t)ObjFWBase) - 210))(control, func); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + __extension__ ((void (*)(OFOnceControl *_Nonnull, OFOnceFunction _Nonnull))*(void **)(((uintptr_t)ObjFWBase) - 208))(control, func); +#endif +} + +void +OFPBKDF2Wrapper(const OFPBKDF2Parameters *_Nonnull parameters) +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + ((void (*)(const OFPBKDF2Parameters *_Nonnull __asm__("a0")))(((uintptr_t)ObjFWBase) - 216))(parameters); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + __extension__ ((void (*)(const OFPBKDF2Parameters *_Nonnull))*(void **)(((uintptr_t)ObjFWBase) - 214))(parameters); +#endif +} + +void +OFScryptWrapper(const OFScryptParameters *_Nonnull parameters) +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + ((void (*)(const OFScryptParameters *_Nonnull __asm__("a0")))(((uintptr_t)ObjFWBase) - 222))(parameters); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + __extension__ ((void (*)(const OFScryptParameters *_Nonnull))*(void **)(((uintptr_t)ObjFWBase) - 220))(parameters); +#endif +} + +void +OFSalsa20_8Core(uint32_t *_Nonnull buffer) +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + ((void (*)(uint32_t *_Nonnull __asm__("a0")))(((uintptr_t)ObjFWBase) - 228))(buffer); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + __extension__ ((void (*)(uint32_t *_Nonnull))*(void **)(((uintptr_t)ObjFWBase) - 226))(buffer); +#endif +} + +void +OFScryptBlockMix(uint32_t *_Nonnull output, const uint32_t *_Nonnull input, size_t blockSize) +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + ((void (*)(uint32_t *_Nonnull __asm__("a0"), const uint32_t *_Nonnull __asm__("a1"), size_t __asm__("d0")))(((uintptr_t)ObjFWBase) - 234))(output, input, blockSize); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + __extension__ ((void (*)(uint32_t *_Nonnull, const uint32_t *_Nonnull, size_t))*(void **)(((uintptr_t)ObjFWBase) - 232))(output, input, blockSize); +#endif +} + +void +OFScryptROMix(uint32_t *buffer, size_t blockSize, size_t costFactor, uint32_t *tmp) +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + ((void (*)(uint32_t *__asm__("a0"), size_t __asm__("d0"), size_t __asm__("d1"), uint32_t *__asm__("a1")))(((uintptr_t)ObjFWBase) - 240))(buffer, blockSize, costFactor, tmp); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + __extension__ ((void (*)(uint32_t *, size_t, size_t, uint32_t *))*(void **)(((uintptr_t)ObjFWBase) - 238))(buffer, blockSize, costFactor, tmp); +#endif +} + +OFSocketAddress +OFSocketAddressParseIP(OFString *IP, uint16_t port) +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + return ((OFSocketAddress (*)(OFString *__asm__("a0"), uint16_t __asm__("d0")))(((uintptr_t)ObjFWBase) - 246))(IP, port); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + return __extension__ ((OFSocketAddress (*)(OFString *, uint16_t))*(void **)(((uintptr_t)ObjFWBase) - 244))(IP, port); +#endif +} + +OFSocketAddress +OFSocketAddressParseIPv4(OFString *IP, uint16_t port) +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + return ((OFSocketAddress (*)(OFString *__asm__("a0"), uint16_t __asm__("d0")))(((uintptr_t)ObjFWBase) - 252))(IP, port); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + return __extension__ ((OFSocketAddress (*)(OFString *, uint16_t))*(void **)(((uintptr_t)ObjFWBase) - 250))(IP, port); +#endif +} + +OFSocketAddress +OFSocketAddressParseIPv6(OFString *IP, uint16_t port) +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + return ((OFSocketAddress (*)(OFString *__asm__("a0"), uint16_t __asm__("d0")))(((uintptr_t)ObjFWBase) - 258))(IP, port); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + return __extension__ ((OFSocketAddress (*)(OFString *, uint16_t))*(void **)(((uintptr_t)ObjFWBase) - 256))(IP, port); +#endif +} + +OFSocketAddress +OFSocketAddressMakeUNIX(OFString *path) +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + return ((OFSocketAddress (*)(OFString *__asm__("a0")))(((uintptr_t)ObjFWBase) - 264))(path); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + return __extension__ ((OFSocketAddress (*)(OFString *))*(void **)(((uintptr_t)ObjFWBase) - 262))(path); +#endif +} + +OFSocketAddress +OFSocketAddressMakeIPX(uint32_t network, const unsigned char *node, uint16_t port) +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + return ((OFSocketAddress (*)(uint32_t __asm__("d0"), const unsigned char *__asm__("a0"), uint16_t __asm__("d1")))(((uintptr_t)ObjFWBase) - 270))(network, node, port); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + return __extension__ ((OFSocketAddress (*)(uint32_t, const unsigned char *, uint16_t))*(void **)(((uintptr_t)ObjFWBase) - 268))(network, node, port); +#endif +} + +OFSocketAddress +OFSocketAddressMakeAppleTalk(uint16_t network, uint8_t node, uint8_t port) +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + return ((OFSocketAddress (*)(uint16_t __asm__("d0"), uint8_t __asm__("d1"), uint8_t __asm__("d2")))(((uintptr_t)ObjFWBase) - 276))(network, node, port); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + return __extension__ ((OFSocketAddress (*)(uint16_t, uint8_t, uint8_t))*(void **)(((uintptr_t)ObjFWBase) - 274))(network, node, port); +#endif +} + +bool +OFSocketAddressEqual(const OFSocketAddress *address1, const OFSocketAddress *address2) +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + return ((bool (*)(const OFSocketAddress *__asm__("a0"), const OFSocketAddress *__asm__("a1")))(((uintptr_t)ObjFWBase) - 282))(address1, address2); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + return __extension__ ((bool (*)(const OFSocketAddress *, const OFSocketAddress *))*(void **)(((uintptr_t)ObjFWBase) - 280))(address1, address2); +#endif +} + +unsigned long +OFSocketAddressHash(const OFSocketAddress *address) +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + return ((unsigned long (*)(const OFSocketAddress *__asm__("a0")))(((uintptr_t)ObjFWBase) - 288))(address); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + return __extension__ ((unsigned long (*)(const OFSocketAddress *))*(void **)(((uintptr_t)ObjFWBase) - 286))(address); +#endif +} + +OFString *_Nonnull +OFSocketAddressString(const OFSocketAddress *address) +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + return ((OFString *_Nonnull (*)(const OFSocketAddress *__asm__("a0")))(((uintptr_t)ObjFWBase) - 294))(address); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + return __extension__ ((OFString *_Nonnull (*)(const OFSocketAddress *))*(void **)(((uintptr_t)ObjFWBase) - 292))(address); +#endif +} + +void +OFSocketAddressSetIPPort(OFSocketAddress *address, uint16_t port) +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + ((void (*)(OFSocketAddress *__asm__("a0"), uint16_t __asm__("d0")))(((uintptr_t)ObjFWBase) - 300))(address, port); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + __extension__ ((void (*)(OFSocketAddress *, uint16_t))*(void **)(((uintptr_t)ObjFWBase) - 298))(address, port); +#endif +} + +uint16_t +OFSocketAddressIPPort(const OFSocketAddress *address) +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + return ((uint16_t (*)(const OFSocketAddress *__asm__("a0")))(((uintptr_t)ObjFWBase) - 306))(address); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + return __extension__ ((uint16_t (*)(const OFSocketAddress *))*(void **)(((uintptr_t)ObjFWBase) - 304))(address); +#endif +} + +OFString * +OFSocketAddressUNIXPath(const OFSocketAddress *address) +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + return ((OFString *(*)(const OFSocketAddress *__asm__("a0")))(((uintptr_t)ObjFWBase) - 312))(address); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + return __extension__ ((OFString *(*)(const OFSocketAddress *))*(void **)(((uintptr_t)ObjFWBase) - 310))(address); +#endif +} + +void +OFSocketAddressSetIPXNetwork(OFSocketAddress *address, uint32_t network) +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + ((void (*)(OFSocketAddress *__asm__("a0"), uint32_t __asm__("d0")))(((uintptr_t)ObjFWBase) - 318))(address, network); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + __extension__ ((void (*)(OFSocketAddress *, uint32_t))*(void **)(((uintptr_t)ObjFWBase) - 316))(address, network); +#endif +} + +uint32_t +OFSocketAddressIPXNetwork(const OFSocketAddress *address) +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + return ((uint32_t (*)(const OFSocketAddress *__asm__("a0")))(((uintptr_t)ObjFWBase) - 324))(address); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + return __extension__ ((uint32_t (*)(const OFSocketAddress *))*(void **)(((uintptr_t)ObjFWBase) - 322))(address); +#endif +} + +void +OFSocketAddressSetIPXNode(OFSocketAddress *address, const unsigned char *node) +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + ((void (*)(OFSocketAddress *__asm__("a0"), const unsigned char *__asm__("a1")))(((uintptr_t)ObjFWBase) - 330))(address, node); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + __extension__ ((void (*)(OFSocketAddress *, const unsigned char *))*(void **)(((uintptr_t)ObjFWBase) - 328))(address, node); +#endif +} + +void +OFSocketAddressGetIPXNode(const OFSocketAddress *address, unsigned char *_Nonnull node) +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + ((void (*)(const OFSocketAddress *__asm__("a0"), unsigned char *_Nonnull __asm__("a1")))(((uintptr_t)ObjFWBase) - 336))(address, node); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + __extension__ ((void (*)(const OFSocketAddress *, unsigned char *_Nonnull))*(void **)(((uintptr_t)ObjFWBase) - 334))(address, node); +#endif +} + +void +OFSocketAddressSetIPXPort(OFSocketAddress *address, uint16_t port) +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + ((void (*)(OFSocketAddress *__asm__("a0"), uint16_t __asm__("d0")))(((uintptr_t)ObjFWBase) - 342))(address, port); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + __extension__ ((void (*)(OFSocketAddress *, uint16_t))*(void **)(((uintptr_t)ObjFWBase) - 340))(address, port); +#endif +} + +uint16_t +OFSocketAddressIPXPort(const OFSocketAddress *address) +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + return ((uint16_t (*)(const OFSocketAddress *__asm__("a0")))(((uintptr_t)ObjFWBase) - 348))(address); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + return __extension__ ((uint16_t (*)(const OFSocketAddress *))*(void **)(((uintptr_t)ObjFWBase) - 346))(address); +#endif +} + +void +OFSocketAddressSetAppleTalkNetwork(OFSocketAddress *address, uint16_t network) +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + ((void (*)(OFSocketAddress *__asm__("a0"), uint16_t __asm__("d0")))(((uintptr_t)ObjFWBase) - 354))(address, network); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + __extension__ ((void (*)(OFSocketAddress *, uint16_t))*(void **)(((uintptr_t)ObjFWBase) - 352))(address, network); +#endif +} + +uint16_t +OFSocketAddressAppleTalkNetwork(const OFSocketAddress *address) +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + return ((uint16_t (*)(const OFSocketAddress *__asm__("a0")))(((uintptr_t)ObjFWBase) - 360))(address); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + return __extension__ ((uint16_t (*)(const OFSocketAddress *))*(void **)(((uintptr_t)ObjFWBase) - 358))(address); +#endif +} + +void +OFSocketAddressSetAppleTalkNode(OFSocketAddress *address, uint8_t node) +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + ((void (*)(OFSocketAddress *__asm__("a0"), uint8_t __asm__("d0")))(((uintptr_t)ObjFWBase) - 366))(address, node); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + __extension__ ((void (*)(OFSocketAddress *, uint8_t))*(void **)(((uintptr_t)ObjFWBase) - 364))(address, node); +#endif +} + +uint8_t +OFSocketAddressAppleTalkNode(const OFSocketAddress *address) +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + return ((uint8_t (*)(const OFSocketAddress *__asm__("a0")))(((uintptr_t)ObjFWBase) - 372))(address); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + return __extension__ ((uint8_t (*)(const OFSocketAddress *))*(void **)(((uintptr_t)ObjFWBase) - 370))(address); +#endif +} + +void +OFSocketAddressSetAppleTalkPort(OFSocketAddress *address, uint8_t port) +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + ((void (*)(OFSocketAddress *__asm__("a0"), uint8_t __asm__("d0")))(((uintptr_t)ObjFWBase) - 378))(address, port); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + __extension__ ((void (*)(OFSocketAddress *, uint8_t))*(void **)(((uintptr_t)ObjFWBase) - 376))(address, port); +#endif +} + +uint8_t +OFSocketAddressAppleTalkPort(const OFSocketAddress *address) +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + return ((uint8_t (*)(const OFSocketAddress *__asm__("a0")))(((uintptr_t)ObjFWBase) - 384))(address); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + return __extension__ ((uint8_t (*)(const OFSocketAddress *))*(void **)(((uintptr_t)ObjFWBase) - 382))(address); +#endif +} + +OFString * +OFTLSStreamErrorCodeDescription(OFTLSStreamErrorCode errorCode) +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + return ((OFString *(*)(OFTLSStreamErrorCode __asm__("d0")))(((uintptr_t)ObjFWBase) - 390))(errorCode); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + return __extension__ ((OFString *(*)(OFTLSStreamErrorCode))*(void **)(((uintptr_t)ObjFWBase) - 388))(errorCode); +#endif +} + +const char *_Nullable +OFStrPTime(const char *buffer, const char *format, struct tm *tm, int16_t *_Nullable tz) +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + return ((const char *_Nullable (*)(const char *__asm__("a0"), const char *__asm__("a1"), struct tm *__asm__("a2"), int16_t *_Nullable __asm__("a3")))(((uintptr_t)ObjFWBase) - 396))(buffer, format, tm, tz); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + return __extension__ ((const char *_Nullable (*)(const char *, const char *, struct tm *, int16_t *_Nullable))*(void **)(((uintptr_t)ObjFWBase) - 394))(buffer, format, tm, tz); +#endif +} + +OFStringEncoding +OFStringEncodingParseName(OFString *string) +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + return ((OFStringEncoding (*)(OFString *__asm__("a0")))(((uintptr_t)ObjFWBase) - 402))(string); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + return __extension__ ((OFStringEncoding (*)(OFString *))*(void **)(((uintptr_t)ObjFWBase) - 400))(string); +#endif +} + +OFString *_Nullable +OFStringEncodingName(OFStringEncoding encoding) +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + return ((OFString *_Nullable (*)(OFStringEncoding __asm__("d0")))(((uintptr_t)ObjFWBase) - 408))(encoding); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + return __extension__ ((OFString *_Nullable (*)(OFStringEncoding))*(void **)(((uintptr_t)ObjFWBase) - 406))(encoding); +#endif +} + +size_t +OFUTF16StringLength(const OFChar16 *string) +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + return ((size_t (*)(const OFChar16 *__asm__("a0")))(((uintptr_t)ObjFWBase) - 414))(string); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + return __extension__ ((size_t (*)(const OFChar16 *))*(void **)(((uintptr_t)ObjFWBase) - 412))(string); +#endif +} + +size_t +OFUTF32StringLength(const OFChar32 *string) +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + return ((size_t (*)(const OFChar32 *__asm__("a0")))(((uintptr_t)ObjFWBase) - 420))(string); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + return __extension__ ((size_t (*)(const OFChar32 *))*(void **)(((uintptr_t)ObjFWBase) - 418))(string); +#endif +} + +OFString *_Nonnull +OFZIPArchiveEntryVersionToString(uint16_t version) +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + return ((OFString *_Nonnull (*)(uint16_t __asm__("d0")))(((uintptr_t)ObjFWBase) - 426))(version); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + return __extension__ ((OFString *_Nonnull (*)(uint16_t))*(void **)(((uintptr_t)ObjFWBase) - 424))(version); +#endif +} + +OFString *_Nonnull +OFZIPArchiveEntryCompressionMethodName(OFZIPArchiveEntryCompressionMethod compressionMethod) +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + return ((OFString *_Nonnull (*)(OFZIPArchiveEntryCompressionMethod __asm__("d0")))(((uintptr_t)ObjFWBase) - 432))(compressionMethod); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + return __extension__ ((OFString *_Nonnull (*)(OFZIPArchiveEntryCompressionMethod))*(void **)(((uintptr_t)ObjFWBase) - 430))(compressionMethod); +#endif +} + +size_t +OFZIPArchiveEntryExtraFieldFind(OFData *extraField, OFZIPArchiveEntryExtraFieldTag tag, uint16_t *size) +{ +#if defined(OF_AMIGAOS_M68K) + register struct Library *a6 __asm__("a6") = ObjFWBase; + (void)a6; + return ((size_t (*)(OFData *__asm__("a0"), OFZIPArchiveEntryExtraFieldTag __asm__("d0"), uint16_t *__asm__("a1")))(((uintptr_t)ObjFWBase) - 438))(extraField, tag, size); +#elif defined(OF_MORPHOS) + __asm__ __volatile__ ( + "mr %%r12, %0" + :: "r"(ObjFWBase) : "r12" + ); + + return __extension__ ((size_t (*)(OFData *, OFZIPArchiveEntryExtraFieldTag, uint16_t *))*(void **)(((uintptr_t)ObjFWBase) - 436))(extraField, tag, size); +#endif +} Index: src/macros.h ================================================================== --- src/macros.h +++ src/macros.h @@ -312,10 +312,16 @@ #if __has_attribute(__objc_direct_members__) && defined(OF_APPLE_RUNTIME) # define OF_DIRECT_MEMBERS __attribute__((__objc_direct_members__)) #else # define OF_DIRECT_MEMBERS #endif + +#ifdef OF_COMPILING_AMIGA_LIBRARY +# undef errno +extern int *_Nonnull OFErrNo(void); +# define errno (*OFErrNo()) +#endif #ifdef OF_APPLE_RUNTIME # if defined(OF_AMD64) || defined(OF_X86) || defined(OF_ARM64) || \ defined(OF_ARM) || defined(OF_POWERPC) # define OF_HAVE_FORWARDING_TARGET_FOR_SELECTOR Index: src/runtime/amiga-glue.h ================================================================== --- src/runtime/amiga-glue.h +++ src/runtime/amiga-glue.h @@ -26,11 +26,11 @@ #else # define PPC_PARAMS(...) (__VA_ARGS__) # define M68K_ARG(...) #endif -extern bool glue_objc_init PPC_PARAMS(unsigned int version, struct objc_libc *libc); +extern bool glue_objc_init PPC_PARAMS(unsigned int version, struct objc_libC *libC); extern void glue___objc_exec_class PPC_PARAMS(struct objc_module *_Nonnull module); extern IMP _Nonnull glue_objc_msg_lookup PPC_PARAMS(id _Nullable object, SEL _Nonnull selector); extern IMP _Nonnull glue_objc_msg_lookup_stret PPC_PARAMS(id _Nullable object, SEL _Nonnull selector); extern IMP _Nonnull glue_objc_msg_lookup_super PPC_PARAMS(struct objc_super *_Nonnull super, SEL _Nonnull selector); extern IMP _Nonnull glue_objc_msg_lookup_super_stret PPC_PARAMS(struct objc_super *_Nonnull super, SEL _Nonnull selector); Index: src/runtime/amiga-glue.m ================================================================== --- src/runtime/amiga-glue.m +++ src/runtime/amiga-glue.m @@ -29,16 +29,16 @@ " blr\n" ); #endif bool __saveds -glue_objc_init PPC_PARAMS(unsigned int version, struct objc_libc *libc) +glue_objc_init PPC_PARAMS(unsigned int version, struct objc_libC *libC) { M68K_ARG(unsigned int, version, d0) - M68K_ARG(struct objc_libc *, libc, a0) + M68K_ARG(struct objc_libC *, libC, a0) - return objc_init(version, libc); + return objc_init(version, libC); } void __saveds glue___objc_exec_class PPC_PARAMS(struct objc_module *_Nonnull module) { Index: src/runtime/amiga-library.m ================================================================== --- src/runtime/amiga-library.m +++ src/runtime/amiga-library.m @@ -52,10 +52,11 @@ #ifdef OF_AMIGAOS_M68K void __init_eh(void) { + /* Taken care of by objc_init() */ } #endif struct ObjFWRTBase { struct Library library; @@ -73,11 +74,11 @@ #ifdef OF_MORPHOS const ULONG __abox__ = 1; #endif struct ExecBase *SysBase; -struct objc_libc libc; +struct objc_libC libC; #if defined(OF_AMIGAOS_M68K) __asm__ ( ".text\n" ".globl ___restore_a4\n" @@ -165,11 +166,11 @@ return dataDataRelocs; } static struct Library * -lib_init(struct ObjFWRTBase *base OBJC_M68K_REG(d0), +libInit(struct ObjFWRTBase *base OBJC_M68K_REG(d0), void *segList OBJC_M68K_REG(a0), struct ExecBase *sysBase OBJC_M68K_REG(a6)) { #if defined(OF_AMIGAOS_M68K) __asm__ __volatile__ ( "move.l a6, _SysBase" @@ -189,11 +190,11 @@ return &base->library; } struct Library *__saveds -lib_open(void) +libOpen(void) { OBJC_M68K_ARG(struct ObjFWRTBase *, base, a6) struct ObjFWRTBase *child; size_t dataSize, *dataDataRelocs; @@ -204,11 +205,11 @@ base->library.lib_OpenCnt++; base->library.lib_Flags &= ~LIBF_DELEXP; /* - * We cannot use malloc here, as that depends on the libc passed from + * We cannot use malloc here, as that depends on the libC passed from * the application. */ if ((child = AllocMem(base->library.lib_NegSize + base->library.lib_PosSize, MEMF_ANY)) == NULL) { base->library.lib_OpenCnt--; @@ -270,19 +271,19 @@ return segList; #undef SysBase } static void *__saveds -lib_expunge(void) +libExpunge(void) { OBJC_M68K_ARG(struct ObjFWRTBase *, base, a6) return expunge(base, SysBase); } static void *__saveds -lib_close(void) +libClose(void) { /* * SysBase becomes invalid during this function, so we store it in * sysBase and add a define to make the inlines use the right one. */ @@ -296,11 +297,11 @@ #ifdef OF_AMIGAOS_M68K if (base->initialized) for (void *const *frame = _EH_FRAME_BEGINS__; *frame != NULL;) - libc.__deregister_frame_info(*frame++); + libC.__deregister_frame_info(*frame++); #endif parent = base->parent; FreeMem(base->dataSeg - DATA_OFFSET, getDataSize()); @@ -317,17 +318,17 @@ return NULL; #undef SysBase } static void * -lib_null(void) +libNull(void) { return NULL; } bool -objc_init(unsigned int version, struct objc_libc *libc_) +objc_init(unsigned int version, struct objc_libC *libC_) { #ifdef OF_AMIGAOS_M68K OBJC_M68K_ARG(struct ObjFWRTBase *, base, a6) #else register struct ObjFWRTBase *r12 __asm__("r12"); @@ -339,16 +340,19 @@ uintptr_t *iter, *iter0; if (version > 1) return false; - memcpy(&libc, libc_, sizeof(libc)); + if (base->initialized) + return true; + + memcpy(&libC, libC_, sizeof(libC)); #ifdef OF_AMIGAOS_M68K - for (void *const *frame = _EH_FRAME_OBJECTS__, + for (void *const *frame = _EH_FRAME_BEGINS__, **object = _EH_FRAME_OBJECTS__; *frame != NULL;) - libc.__register_frame_info(*frame++, *object++); + libC.__register_frame_info(*frame++, *object++); iter0 = &__CTOR_LIST__[1]; #elif defined(OF_MORPHOS) __asm__ ( "lis %0, __EH_FRAME_BEGIN__@ha\n\t" @@ -356,11 +360,11 @@ "lis %1, __CTOR_LIST__@ha\n\t" "la %1, __CTOR_LIST__@l(%1)\n\t" : "=r"(frame), "=r"(iter0) ); - libc.__register_frame(frame); + libC.__register_frame(frame); #endif for (iter = iter0; *iter != 0; iter++); while (iter > iter0) { @@ -374,110 +378,136 @@ } void * malloc(size_t size) { - return libc.malloc(size); + return libC.malloc(size); } void * calloc(size_t count, size_t size) { - return libc.calloc(count, size); + return libC.calloc(count, size); } void * realloc(void *ptr, size_t size) { - return libc.realloc(ptr, size); + return libC.realloc(ptr, size); } void free(void *ptr) { - libc.free(ptr); + libC.free(ptr); } #ifdef HAVE_SJLJ_EXCEPTIONS int _Unwind_SjLj_RaiseException(void *ex) { - return libc._Unwind_SjLj_RaiseException(ex); + return libC._Unwind_SjLj_RaiseException(ex); } #else int _Unwind_RaiseException(void *ex) { - return libc._Unwind_RaiseException(ex); + return libC._Unwind_RaiseException(ex); } #endif void _Unwind_DeleteException(void *ex) { - libc._Unwind_DeleteException(ex); + libC._Unwind_DeleteException(ex); } void * _Unwind_GetLanguageSpecificData(void *ctx) { - return libc._Unwind_GetLanguageSpecificData(ctx); + return libC._Unwind_GetLanguageSpecificData(ctx); } uintptr_t _Unwind_GetRegionStart(void *ctx) { - return libc._Unwind_GetRegionStart(ctx); + return libC._Unwind_GetRegionStart(ctx); } uintptr_t _Unwind_GetDataRelBase(void *ctx) { - return libc._Unwind_GetDataRelBase(ctx); + return libC._Unwind_GetDataRelBase(ctx); } uintptr_t _Unwind_GetTextRelBase(void *ctx) { - return libc._Unwind_GetTextRelBase(ctx); + return libC._Unwind_GetTextRelBase(ctx); } uintptr_t _Unwind_GetIP(void *ctx) { - return libc._Unwind_GetIP(ctx); + return libC._Unwind_GetIP(ctx); } uintptr_t _Unwind_GetGR(void *ctx, int gr) { - return libc._Unwind_GetGR(ctx, gr); + return libC._Unwind_GetGR(ctx, gr); } void _Unwind_SetIP(void *ctx, uintptr_t ip) { - libc._Unwind_SetIP(ctx, ip); + libC._Unwind_SetIP(ctx, ip); } void _Unwind_SetGR(void *ctx, int gr, uintptr_t value) { - libc._Unwind_SetGR(ctx, gr, value); + libC._Unwind_SetGR(ctx, gr, value); } #ifdef HAVE_SJLJ_EXCEPTIONS void _Unwind_SjLj_Resume(void *ex) { - libc._Unwind_SjLj_Resume(ex); + libC._Unwind_SjLj_Resume(ex); } #else void _Unwind_Resume(void *ex) { - libc._Unwind_Resume(ex); + libC._Unwind_Resume(ex); +} +#endif + +#ifdef OF_AMIGAOS_M68K +void +__register_frame_info(const void *begin, void *object) +{ + libC.__register_frame_info(begin, object); +} + +void +*__deregister_frame_info(const void *begin) +{ + return libC.__deregister_frame_info(begin); +} +#endif + +#ifdef OF_MORPHOS +void __register_frame(void *frame) +{ + libC.__register_frame(frame); +} + +void __deregister_frame(void *frame) +{ + libC.__deregister_frame(frame); } #endif #ifdef OF_AMIGAOS_M68K int @@ -495,24 +525,24 @@ int vsnprintf(char *restrict str, size_t size, const char *restrict fmt, va_list args) { - return libc.vsnprintf(str, size, fmt, args); + return libC.vsnprintf(str, size, fmt, args); } #endif int atexit(void (*function)(void)) { - return libc.atexit(function); + return libC.atexit(function); } void exit(int status) { - libc.exit(status); + libC.exit(status); OF_UNREACHABLE } #pragma GCC diagnostic push @@ -520,14 +550,14 @@ static CONST_APTR functionTable[] = { #ifdef OF_MORPHOS (CONST_APTR)FUNCARRAY_BEGIN, (CONST_APTR)FUNCARRAY_32BIT_NATIVE, #endif - (CONST_APTR)lib_open, - (CONST_APTR)lib_close, - (CONST_APTR)lib_expunge, - (CONST_APTR)lib_null, + (CONST_APTR)libOpen, + (CONST_APTR)libClose, + (CONST_APTR)libExpunge, + (CONST_APTR)libNull, #ifdef OF_MORPHOS (CONST_APTR)-1, (CONST_APTR)FUNCARRAY_32BIT_SYSTEMV, #endif #include "amiga-funcarray.inc" @@ -548,11 +578,11 @@ struct ExecBase *execBase OBJC_M68K_REG(a6)); } init_table = { sizeof(struct ObjFWRTBase), functionTable, NULL, - lib_init + libInit }; struct Resident resident = { .rt_MatchWord = RTC_MATCHWORD, .rt_MatchTag = &resident, Index: src/runtime/amiga-library.xml ================================================================== --- src/runtime/amiga-library.xml +++ src/runtime/amiga-library.xml @@ -2,11 +2,11 @@ ObjFWRT.h private.h - + Index: src/runtime/linklib/Makefile ================================================================== --- src/runtime/linklib/Makefile +++ src/runtime/linklib/Makefile @@ -1,13 +1,14 @@ include ../../../extra.mk STATIC_LIB = libobjfwrt.library.a +STATIC_AMIGA_LIB = libobjfwrt.library.amigalib.a SRCS = init.m \ linklib.m include ../../../buildsys.mk -CPPFLAGS += -I.. -I../.. -I../../.. \ +CPPFLAGS += -I.. -I../.. -I../../.. \ -DOBJC_COMPILING_AMIGA_LINKLIB \ -DOBJFWRT_AMIGA_LIB=\"${OBJFWRT_AMIGA_LIB}\" \ -DOBJFWRT_LIB_MINOR=${OBJFWRT_LIB_MINOR} -LD = ${OBJC} +AMIGA_LIB_CFLAGS += -DOBJC_AMIGA_LIB Index: src/runtime/linklib/init.m ================================================================== --- src/runtime/linklib/init.m +++ src/runtime/linklib/init.m @@ -15,19 +15,18 @@ #include "config.h" #import "ObjFWRT.h" #import "private.h" -#import "macros.h" +#import "amiga-library.h" +#define USE_INLINE_STDARG #define Class IntuitionClass #include #include #undef Class -struct ObjFWRTBase; - #include #include #if defined(OF_AMIGAOS_M68K) # include @@ -61,14 +60,16 @@ #ifdef OF_MORPHOS extern void __register_frame(void *); extern void __deregister_frame(void *); #endif -struct Library *ObjFWRTBase; void *__objc_class_name_Protocol; -extern bool objc_init(unsigned int version, struct objc_libc *libc); +#ifndef OBJC_AMIGA_LIB +extern bool objc_init(unsigned int version, struct objc_libC *libC); + +struct Library *ObjFWRTBase; static void error(const char *string, ULONG arg) { struct Library *IntuitionBase = OpenLibrary("intuition.library", 0); @@ -92,11 +93,11 @@ static void __attribute__((__used__)) ctor(void) { static bool initialized = false; - struct objc_libc libc = { + struct objc_libC libC = { .malloc = malloc, .calloc = calloc, .realloc = realloc, .free = free, #ifdef HAVE_SJLJ_EXCEPTIONS @@ -140,11 +141,11 @@ if ((ObjFWRTBase = OpenLibrary(OBJFWRT_AMIGA_LIB, OBJFWRT_LIB_MINOR)) == NULL) error("Failed to open " OBJFWRT_AMIGA_LIB " version %lu!", OBJFWRT_LIB_MINOR); - if (!objc_init(1, &libc)) + if (!objc_init(1, &libC)) error("Failed to initialize " OBJFWRT_AMIGA_LIB "!", 0); initialized = true; } @@ -152,14 +153,14 @@ dtor(void) { CloseLibrary(ObjFWRTBase); } -#if defined(OF_AMIGAOS_M68K) +# if defined(OF_AMIGAOS_M68K) ADD2INIT(ctor, -5) ADD2EXIT(dtor, -5) -#elif defined(OF_MORPHOS) +# elif defined(OF_MORPHOS) CONSTRUCTOR_P(ObjFWRT, 4000) { ctor(); return 0; @@ -167,10 +168,11 @@ DESTRUCTOR_P(ObjFWRT, 0) { dtor(); } +# endif #endif extern int __gnu_objc_personality(int version, int actions, uint64_t *exClass, void *ex, void *ctx); Index: src/runtime/linklib/linklib.m ================================================================== --- src/runtime/linklib/linklib.m +++ src/runtime/linklib/linklib.m @@ -20,24 +20,28 @@ #import "ObjFWRT.h" #import "private.h" extern struct Library *ObjFWRTBase; +#if OF_GCC_VERSION >= 1100 +# pragma GCC diagnostic ignored "-Warray-parameter" +#endif + bool -objc_init(unsigned int version, struct objc_libc *libc) +objc_init(unsigned int version, struct objc_libC *libC) { #if defined(OF_AMIGAOS_M68K) register struct Library *a6 __asm__("a6") = ObjFWRTBase; (void)a6; - return ((bool (*)(unsigned int __asm__("d0"), struct objc_libc *__asm__("a0")))(((uintptr_t)ObjFWRTBase) - 30))(version, libc); + return ((bool (*)(unsigned int __asm__("d0"), struct objc_libC *__asm__("a0")))(((uintptr_t)ObjFWRTBase) - 30))(version, libC); #elif defined(OF_MORPHOS) __asm__ __volatile__ ( "mr %%r12, %0" :: "r"(ObjFWRTBase) : "r12" ); - return __extension__ ((bool (*)(unsigned int, struct objc_libc *))*(void **)(((uintptr_t)ObjFWRTBase) - 28))(version, libc); + return __extension__ ((bool (*)(unsigned int, struct objc_libC *))*(void **)(((uintptr_t)ObjFWRTBase) - 28))(version, libC); #endif } void __objc_exec_class(struct objc_module *_Nonnull module) Index: src/runtime/lookup-asm/Makefile ================================================================== --- src/runtime/lookup-asm/Makefile +++ src/runtime/lookup-asm/Makefile @@ -1,10 +1,11 @@ include ../../../extra.mk STATIC_PIC_LIB_NOINST = ${LOOKUP_ASM_LIB_A} STATIC_AMIGA_LIB_NOINST = ${LOOKUP_ASM_AMIGALIB_A} STATIC_LIB_NOINST = ${LOOKUP_ASM_A} +STATIC_AMIGA_LIB_NOINST = ${LOOKUP_ASM_AMIGALIB_A} SRCS = lookup-asm.S include ../../../buildsys.mk Index: src/runtime/private.h ================================================================== --- src/runtime/private.h +++ src/runtime/private.h @@ -215,11 +215,11 @@ } *_Nonnull buckets[256]; }; #if defined(OBJC_COMPILING_AMIGA_LIBRARY) || \ defined(OBJC_COMPILING_AMIGA_LINKLIB) -struct objc_libc { +struct objc_libC { void *_Nullable (*_Nonnull malloc)(size_t); void *_Nullable (*_Nonnull calloc)(size_t, size_t); void *_Nullable (*_Nonnull realloc)(void *_Nullable, size_t); void (*_Nonnull free)(void *_Nullable); # ifdef HAVE_SJLJ_EXCEPTIONS @@ -268,11 +268,11 @@ # define OBJC_M68K_ARG(type, name, reg) \ register type reg_##name __asm__(#reg); \ type name = reg_##name; # endif -extern bool objc_init(unsigned int, struct objc_libc *); +extern bool objc_init(unsigned int, struct objc_libC *); # ifdef HAVE_SJLJ_EXCEPTIONS # define __gnu_objc_personality(version, actions, exClass, ex, ctx) \ __gnu_objc_personality_sj0(version, actions, *exClass, ex, ctx) # else # define __gnu_objc_personality(version, actions, exClass, ex, ctx) \ Index: tests/Makefile ================================================================== --- tests/Makefile +++ tests/Makefile @@ -137,12 +137,14 @@ if test -f ../src/runtime/libobjfwrt.dylib; then \ ${LN_S} ../src/runtime/libobjfwrt.dylib \ libobjfwrt.${OBJFWRT_LIB_MAJOR}.dylib; \ fi if test -f ../src/runtime/${OBJFWRT_AMIGA_LIB}; then \ - ${LN_S} ../src/runtime/${OBJFWRT_AMIGA_LIB} \ - ${OBJFWRT_AMIGA_LIB}; \ + cp ../src/runtime/${OBJFWRT_AMIGA_LIB} ${OBJFWRT_AMIGA_LIB}; \ + fi + if test -f ../src/${OBJFW_AMIGA_LIB}; then \ + cp ../src/${OBJFW_AMIGA_LIB} ${OBJFW_AMIGA_LIB}; \ fi LD_LIBRARY_PATH=.$${LD_LIBRARY_PATH+:}$$LD_LIBRARY_PATH \ DYLD_FRAMEWORK_PATH=../src:../src/runtime$${DYLD_FRAMEWORK_PATH+:}$$DYLD_FRAMEWORK_PATH \ DYLD_LIBRARY_PATH=.$${DYLD_LIBRARY_PATH+:}$$DYLD_LIBRARY_PATH \ LIBRARY_PATH=.$${LIBRARY_PATH+:}$$LIBRARY_PATH \ Index: tests/TestsAppDelegate.m ================================================================== --- tests/TestsAppDelegate.m +++ tests/TestsAppDelegate.m @@ -67,11 +67,15 @@ lastConsoleUpdate = [[OFDate alloc] init]; } } #endif +#ifdef OF_AMIGAOS +extern unsigned long *OFHashSeedRef(void); +#else extern unsigned long OFHashSeed; +#endif #ifdef OF_PSP static int exitCallback(int arg1, int arg2, void *arg) { @@ -108,11 +112,15 @@ */ atexit(objc_deinit); #endif /* We need deterministic hashes for tests */ +#ifdef OF_AMIGAOS + *OFHashSeedRef() = 0; +#else OFHashSeed = 0; +#endif #ifdef OF_WII GXRModeObj *rmode; void *xfb; Index: tests/objc_sync/Makefile ================================================================== --- tests/objc_sync/Makefile +++ tests/objc_sync/Makefile @@ -64,9 +64,9 @@ rm -f objfwrt${OBJFWRT_LIB_MAJOR}.dll; \ rm -f libobjfwrt.${OBJFWRT_LIB_MAJOR}.dylib; \ exit $$EXIT CPPFLAGS += -I../../src -I../../src/runtime -I../.. -LIBS := -L../../src -lobjfw \ - -L../../src/runtime -L../../src/runtime/linklib ${RUNTIME_LIBS} \ +LIBS := -L../../src -L../../src/linklib ${OBJFW_LIBS} \ + -L../../src/runtime -L../../src/runtime/linklib ${RUNTIME_LIBS} \ ${LIBS} LD = ${OBJC} Index: tests/terminal/Makefile ================================================================== --- tests/terminal/Makefile +++ tests/terminal/Makefile @@ -64,9 +64,9 @@ rm -f objfwrt${OBJFWRT_LIB_MAJOR}.dll; \ rm -f libobjfwrt.${OBJFWRT_LIB_MAJOR}.dylib; \ exit $$EXIT CPPFLAGS += -I../../src -I../../src/exceptions -I../../src/runtime -I../.. -LIBS := -L../../src -lobjfw \ - -L../../src/runtime -L../../src/runtime/linklib ${RUNTIME_LIBS} \ +LIBS := -L../../src -L../../src/linklib ${OBJFW_LIBS} \ + -L../../src/runtime -L../../src/runtime/linklib ${RUNTIME_LIBS} \ ${LIBS} LD = ${OBJC} Index: utils/objfw-config.in ================================================================== --- utils/objfw-config.in +++ utils/objfw-config.in @@ -28,11 +28,11 @@ LIB_PREFIX="@LIB_PREFIX@" LIB_SUFFIX="@LIB_SUFFIX@" LDFLAGS="@LDFLAGS@" LDFLAGS_REEXPORT="@LDFLAGS_REEXPORT@" LDFLAGS_RPATH="@LDFLAGS_RPATH@" -LIBS="-L${libdir} -lobjfw @RUNTIME_LIBS@ @LIBS@" +LIBS="-L${libdir} @OBJFW_LIBS@ @RUNTIME_LIBS@ @LIBS@" FRAMEWORK_LIBS="-F${prefix}/Library/Frameworks -framework ObjFW" FRAMEWORK_LIBS="$FRAMEWORK_LIBS @RUNTIME_FRAMEWORK_LIBS@ @LIBS@" PLUGIN_CFLAGS="@PLUGIN_CFLAGS@" PLUGIN_LDFLAGS="@PLUGIN_LDFLAGS@" PLUGIN_SUFFIX="@PLUGIN_SUFFIX@" Index: utils/objfw-new/Makefile ================================================================== --- utils/objfw-new/Makefile +++ utils/objfw-new/Makefile @@ -12,10 +12,10 @@ CPPFLAGS += -I../../src \ -I../../src/runtime \ -I../../src/exceptions \ -I../.. -LIBS := -L../../src -lobjfw \ +LIBS := -L../../src -L../../src/linklib ${OBJFW_LIBS} \ -L../../src/runtime -L../../src/runtime/linklib ${RUNTIME_LIBS} \ ${LIBS} LD = ${OBJC} LDFLAGS += ${LDFLAGS_RPATH} Index: utils/ofarc/Makefile ================================================================== --- utils/ofarc/Makefile +++ utils/ofarc/Makefile @@ -18,10 +18,10 @@ CPPFLAGS += -I../../src \ -I../../src/runtime \ -I../../src/exceptions \ -I../.. \ -DLOCALIZATION_DIR=\"${datadir}/ofarc/localization\" -LIBS := -L../../src -lobjfw \ +LIBS := -L../../src -L../../src/linklib ${OBJFW_LIBS} \ -L../../src/runtime -L../../src/runtime/linklib ${RUNTIME_LIBS} \ ${LIBS} LD = ${OBJC} LDFLAGS += ${LDFLAGS_RPATH} Index: utils/ofdns/Makefile ================================================================== --- utils/ofdns/Makefile +++ utils/ofdns/Makefile @@ -14,10 +14,10 @@ CPPFLAGS += -I../../src \ -I../../src/runtime \ -I../../src/exceptions \ -I../.. \ -DLOCALIZATION_DIR=\"${datadir}/ofdns/localization\" -LIBS := -L../../src -lobjfw \ +LIBS := -L../../src -L../../src/linklib ${OBJFW_LIBS} \ -L../../src/runtime -L../../src/runtime/linklib ${RUNTIME_LIBS} \ ${LIBS} LD = ${OBJC} LDFLAGS += ${LDFLAGS_RPATH} Index: utils/ofhash/Makefile ================================================================== --- utils/ofhash/Makefile +++ utils/ofhash/Makefile @@ -14,10 +14,10 @@ CPPFLAGS += -I../../src \ -I../../src/runtime \ -I../../src/exceptions \ -I../.. \ -DLOCALIZATION_DIR=\"${datadir}/ofhash/localization\" -LIBS := -L../../src -lobjfw \ +LIBS := -L../../src -L../../src/linklib ${OBJFW_LIBS} \ -L../../src/runtime -L../../src/runtime/linklib ${RUNTIME_LIBS} \ ${LIBS} LD = ${OBJC} LDFLAGS += ${LDFLAGS_RPATH} Index: utils/ofhttp/Makefile ================================================================== --- utils/ofhttp/Makefile +++ utils/ofhttp/Makefile @@ -18,10 +18,11 @@ -I../../src/tls \ -I../.. \ -DLOCALIZATION_DIR='"${datadir}/ofhttp/localization"' \ -DLIB_PREFIX='"${LIB_PREFIX}"' \ -DLIB_SUFFIX='"${LIB_SUFFIX}"' -LIBS := -L../../src -L../../src/tls ${OFHTTP_LIBS} -lobjfw \ +LIBS := -L../../src -L../../src/linklib -L../../src/tls \ + ${OFHTTP_LIBS} ${OBJFW_LIBS} \ -L../../src/runtime -L../../src/runtime/linklib ${RUNTIME_LIBS} \ ${LIBS} LD = ${OBJC} LDFLAGS += ${LDFLAGS_RPATH}