Differences From Artifact [47fd246f7b]:
- File
src/amiga-library.m
— part of check-in
[8cedd82180]
at
2022-11-17 16:37:08
on branch amiga-library
— src/amiga-library.m: Don't make OFInit __saveds
__saveds doesn't work in OFInit() yet - the entire point of OFInit() is
to set up things so that __saveds works. (user: js, size: 13459) [annotate] [blame] [check-ins using]
To Artifact [530b254cbd]:
- File src/amiga-library.m — part of check-in [0846f898ea] at 2022-11-17 17:15:43 on branch amiga-library — More consistency between the two amiga-library.m (user: js, size: 13949) [annotate] [blame] [check-ins using]
︙ | ︙ | |||
11 12 13 14 15 16 17 | * 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" | < < < < < > > > | > > > > | 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 | * 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 <exec/libraries.h> #include <exec/nodes.h> #include <exec/resident.h> #include <proto/exec.h> #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) |
︙ | ︙ | |||
47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 | /* This always needs to be the first thing in the file. */ int _start(void) { return -1; } 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 | > > > > > > > > < < < < < < < < < < < | 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 | /* 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; #if defined(OF_AMIGAOS_M68K) __asm__ ( ".text\n" ".globl ___restore_a4\n" ".align 1\n" "___restore_a4:\n" |
︙ | ︙ | |||
169 170 171 172 173 174 175 | ); #endif return dataDataRelocs; } static struct Library * | | | | 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 | ); #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) |
︙ | ︙ | |||
326 327 328 329 330 331 332 | static void * libNull(void) { return NULL; } bool | | < | 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 | static void * libNull(void) { return NULL; } bool OFInit(unsigned int version, struct OFLibC *libC_) { #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 *iter, *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]; |
︙ | ︙ | |||
714 715 716 717 718 719 720 | .rt_Init = &init_table, #ifdef OF_MORPHOS .rt_Revision = OBJFW_LIB_MINOR, .rt_Tags = NULL, #endif }; | | > > > > > > > > > > > > > > > > | 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 | .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 |