Overview
Comment: | runtime: Don't pass std{out,err} to Amiga .library |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
08d155e3f025fad6fb3c83f39c02d63a |
User & Date: | js on 2020-12-21 00:25:11 |
Other Links: | manifest | tags |
Context
2020-12-21
| ||
00:36 | Add destructors for global mutexes check-in: 68214158ee user: js tags: trunk | |
00:25 | runtime: Don't pass std{out,err} to Amiga .library check-in: 08d155e3f0 user: js tags: trunk | |
2020-12-20
| ||
21:29 | runtime: Remove errno from Amiga library check-in: 8c90e88939 user: js tags: trunk | |
Changes
Modified src/runtime/amiga-glue.m from [15f440e90e] to [7a9a2d20bd].
︙ | ︙ | |||
25 26 27 28 29 30 31 | # define PPC_PARAMS(...) (void) # define M68K_ARG OBJC_M68K_ARG #else # define PPC_PARAMS(...) (__VA_ARGS__) # define M68K_ARG(...) #endif | | | < < < | | 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 | # define PPC_PARAMS(...) (void) # define M68K_ARG OBJC_M68K_ARG #else # define PPC_PARAMS(...) (__VA_ARGS__) # define M68K_ARG(...) #endif extern bool objc_init(unsigned int, struct objc_libc *); #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_objc_init PPC_PARAMS(unsigned int version, struct objc_libc *libc) { M68K_ARG(unsigned int, version, d0) M68K_ARG(struct objc_libc *, libc, a0) return objc_init(version, libc); } void __saveds glue___objc_exec_class PPC_PARAMS(struct objc_module *module) { M68K_ARG(struct objc_module *, module, a0) |
︙ | ︙ |
Modified src/runtime/amiga-library.m from [6e1b91ee55] to [359a58f2d8].
︙ | ︙ | |||
161 162 163 164 165 166 167 | extern id glue_objc_createTaggedPointer(void); #ifdef OF_MORPHOS const ULONG __abox__ = 1; #endif struct ExecBase *SysBase; struct objc_libc libc; | < < | 161 162 163 164 165 166 167 168 169 170 171 172 173 174 | extern id glue_objc_createTaggedPointer(void); #ifdef OF_MORPHOS const ULONG __abox__ = 1; #endif struct ExecBase *SysBase; struct objc_libc libc; #if defined(OF_AMIGAOS_M68K) __asm__ ( ".text\n" ".globl ___restore_a4\n" ".align 1\n" "___restore_a4:\n" |
︙ | ︙ | |||
412 413 414 415 416 417 418 | static void * lib_null(void) { return NULL; } bool | | < < < | 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 | static void * lib_null(void) { return NULL; } bool 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"); struct ObjFWRTBase *base = r12; #endif #ifdef OF_MORPHOS void *frame; #endif uintptr_t *iter, *iter0; if (version > 1) return false; memcpy(&libc, libc_, sizeof(libc)); #ifdef OF_AMIGAOS_M68K if ((size_t)_EH_FRAME_BEGINS__ != (size_t)_EH_FRAME_OBJECTS__) return false; for (size_t i = 1; i <= (size_t)_EH_FRAME_BEGINS__; i++) libc.__register_frame_info((&_EH_FRAME_BEGINS__)[i], |
︙ | ︙ |
Modified src/runtime/amigaos3.sfd from [52fd389150] to [27d28cf09f].
1 2 3 4 5 6 | ==base _ObjFWRTBase ==basetype struct Library * ==libname objfwrt68k.library ==bias 30 ==public * The following function is only for the linklib. | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 | ==base _ObjFWRTBase ==basetype struct Library * ==libname objfwrt68k.library ==bias 30 ==public * The following function is only for the linklib. bool glue_objc_init(unsigned int version, struct objc_libc *libc)(d0,a0) void glue___objc_exec_class(struct objc_module *_Nonnull module)(a0) IMP _Nonnull glue_objc_msg_lookup(id _Nullable object, SEL _Nonnull selector)(a0,a1) IMP _Nonnull glue_objc_msg_lookup_stret(id _Nullable object, SEL _Nonnull selector)(a0,a1) IMP _Nonnull glue_objc_msg_lookup_super(struct objc_super *_Nonnull super, SEL _Nonnull selector)(a0,a1) IMP _Nonnull glue_objc_msg_lookup_super_stret(struct objc_super *_Nonnull super, SEL _Nonnull selector)(a0,a1) Class _Nullable glue_objc_lookUpClass(const char *_Nonnull name)(a0) Class _Nullable glue_objc_getClass(const char *_Nonnull name)(a0) |
︙ | ︙ |
Modified src/runtime/linklib/linklib.m from [5e0b11dcbb] to [32b1f9e0eb].
︙ | ︙ | |||
140 141 142 143 144 145 146 | return; if ((ObjFWRTBase = OpenLibrary(OBJFWRT_AMIGA_LIB, OBJFWRT_LIB_MINOR)) == NULL) error("Failed to open " OBJFWRT_AMIGA_LIB " version %lu!", OBJFWRT_LIB_MINOR); | | | 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 | return; if ((ObjFWRTBase = OpenLibrary(OBJFWRT_AMIGA_LIB, OBJFWRT_LIB_MINOR)) == NULL) error("Failed to open " OBJFWRT_AMIGA_LIB " version %lu!", OBJFWRT_LIB_MINOR); if (!glue_objc_init(1, &libc)) error("Failed to initialize " OBJFWRT_AMIGA_LIB "!", 0); initialized = true; } static void __attribute__((__used__)) dtor(void) |
︙ | ︙ |
Modified src/runtime/morphos-clib.h from [8a12dfceaa] to [750cbb9d7c].
1 | /* The following function is only for the linklib. */ | | | 1 2 3 4 5 6 7 8 9 | /* The following function is only for the linklib. */ bool glue_objc_init(unsigned int, struct objc_libc *); void glue___objc_exec_class(struct objc_module *); IMP glue_objc_msg_lookup(id, SEL); IMP glue_objc_msg_lookup_stret(id, SEL); IMP glue_objc_msg_lookup_super(struct objc_super *, SEL); IMP glue_objc_msg_lookup_super_stret(struct objc_super *, SEL); Class glue_objc_lookUpClass(const char *); Class glue_objc_getClass(const char *); |
︙ | ︙ |
Modified src/runtime/morphos.fd from [f88311d1a0] to [4a176c28f2].
1 2 3 4 | ##base _ObjFWRTBase ##bias 30 ##public * The following function is only for the linklib. | | | 1 2 3 4 5 6 7 8 9 10 11 12 | ##base _ObjFWRTBase ##bias 30 ##public * The following function is only for the linklib. glue_objc_init(version,libc)(sysv,r12base) glue___objc_exec_class(module)(sysv,r12base) glue_objc_msg_lookup(object,selector)(sysv,r12base) glue_objc_msg_lookup_stret(object,selector)(sysv,r12base) glue_objc_msg_lookup_super(super,selector)(sysv,r12base) glue_objc_msg_lookup_super_stret(super,selector)(sysv,r12base) glue_objc_lookUpClass(name)(sysv,r12base) glue_objc_getClass(name)(sysv,r12base) |
︙ | ︙ |
Modified src/runtime/private.h from [67e48517bd] to [ddffadab35].
︙ | ︙ | |||
268 269 270 271 272 273 274 | # include <ppcinline/macros.h> # define OBJC_M68K_ARG(type, name, reg) type name = (type)REG_##reg; # else # define OBJC_M68K_ARG(type, name, reg) \ register type reg_##name __asm__(#reg); \ type name = reg_##name; # endif | < < < | 268 269 270 271 272 273 274 275 276 277 278 279 280 281 | # include <ppcinline/macros.h> # define OBJC_M68K_ARG(type, name, reg) type name = (type)REG_##reg; # else # define OBJC_M68K_ARG(type, name, reg) \ register type reg_##name __asm__(#reg); \ type name = reg_##name; # endif #endif extern void objc_register_all_categories(struct objc_symtab *_Nonnull); extern struct objc_category *_Nullable *_Nullable objc_categories_for_class(Class _Nonnull); extern void objc_unregister_all_categories(void); extern void objc_initialize_class(Class _Nonnull); |
︙ | ︙ |