Overview
| Comment: | runtime: Pass errno to Amiga library |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
7b030dc66c18c8db0eea70df56705f1d |
| User & Date: | js on 2020-11-22 15:34:24 |
| Other Links: | manifest | tags |
Context
|
2020-11-22
| ||
| 19:08 | runtime: Compile a copy of {mutex,once,tlskey}.m check-in: c1354656bc user: js tags: trunk | |
| 15:34 | runtime: Pass errno to Amiga library check-in: 7b030dc66c user: js tags: trunk | |
| 13:04 | Fix configure for real check-in: e80c24128f user: js tags: trunk | |
Changes
Modified src/runtime/amiga-library.m from [1bd0f3b745] to [a6d1d19c49].
| ︙ | ︙ | |||
584 585 586 587 588 589 590 591 592 593 594 595 596 597 |
#else
void
_Unwind_Resume(void *ex)
{
libc._Unwind_Resume(ex);
}
#endif
#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,
| > > > > > > | 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 |
#else
void
_Unwind_Resume(void *ex)
{
libc._Unwind_Resume(ex);
}
#endif
int *
objc_get_errno(void)
{
return libc.get_errno();
}
#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,
|
| ︙ | ︙ |
Modified src/runtime/linklib/linklib.m from [c59adcdfad] to [d383bccae9].
| ︙ | ︙ | |||
23 24 25 26 27 28 29 30 31 32 33 34 35 36 |
#include <proto/exec.h>
struct ObjFWRTBase;
#import "inline.h"
#include <stdio.h>
#include <stdlib.h>
#if defined(OF_AMIGAOS_M68K)
# include <stabs.h>
# define SYM(name) __asm__("_" name)
#elif defined(OF_MORPHOS)
| > | 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 |
#include <proto/exec.h>
struct ObjFWRTBase;
#import "inline.h"
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#if defined(OF_AMIGAOS_M68K)
# include <stabs.h>
# define SYM(name) __asm__("_" name)
#elif defined(OF_MORPHOS)
|
| ︙ | ︙ | |||
58 59 60 61 62 63 64 65 66 67 68 69 70 71 |
extern void _Unwind_Resume(void *);
#endif
extern void __register_frame_info(const void *, void *);
extern void *__deregister_frame_info(const void *);
struct Library *ObjFWRTBase;
void *__objc_class_name_Protocol;
static void __attribute__((__used__))
ctor(void)
{
static bool initialized = false;
struct objc_libc libc = {
.malloc = malloc,
| > > > > > > | 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 |
extern void _Unwind_Resume(void *);
#endif
extern void __register_frame_info(const void *, void *);
extern void *__deregister_frame_info(const void *);
struct Library *ObjFWRTBase;
void *__objc_class_name_Protocol;
static int *
get_errno(void)
{
return &errno;
}
static void __attribute__((__used__))
ctor(void)
{
static bool initialized = false;
struct objc_libc libc = {
.malloc = malloc,
|
| ︙ | ︙ | |||
93 94 95 96 97 98 99 100 101 102 103 104 105 106 |
#ifdef HAVE_SJLJ_EXCEPTIONS
._Unwind_SjLj_Resume = _Unwind_SjLj_Resume,
#else
._Unwind_Resume = _Unwind_Resume,
#endif
.__register_frame_info = __register_frame_info,
.__deregister_frame_info = __deregister_frame_info,
};
if (initialized)
return;
if ((ObjFWRTBase = OpenLibrary(OBJFWRT_AMIGA_LIB,
OBJFWRT_LIB_MINOR)) == NULL) {
| > | 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 |
#ifdef HAVE_SJLJ_EXCEPTIONS
._Unwind_SjLj_Resume = _Unwind_SjLj_Resume,
#else
._Unwind_Resume = _Unwind_Resume,
#endif
.__register_frame_info = __register_frame_info,
.__deregister_frame_info = __deregister_frame_info,
.get_errno = get_errno,
};
if (initialized)
return;
if ((ObjFWRTBase = OpenLibrary(OBJFWRT_AMIGA_LIB,
OBJFWRT_LIB_MINOR)) == NULL) {
|
| ︙ | ︙ |
Modified src/runtime/private.h from [7f0c22271c] to [e53897510c].
| ︙ | ︙ | |||
247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 | void (*_Nonnull _Unwind_SjLj_Resume)(void *_Nonnull); # else void (*_Nonnull _Unwind_Resume)(void *_Nonnull); # endif void (*_Nonnull __register_frame_info)(const void *_Nonnull, void *_Nonnull); void *(*_Nonnull __deregister_frame_info)(const void *_Nonnull); }; #endif #ifdef OBJC_COMPILING_AMIGA_LIBRARY # if defined(__MORPHOS__) # 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 # undef stdout # undef stderr | > > | > > | 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 |
void (*_Nonnull _Unwind_SjLj_Resume)(void *_Nonnull);
# else
void (*_Nonnull _Unwind_Resume)(void *_Nonnull);
# endif
void (*_Nonnull __register_frame_info)(const void *_Nonnull,
void *_Nonnull);
void *(*_Nonnull __deregister_frame_info)(const void *_Nonnull);
int *_Nonnull (*_Nonnull get_errno)(void);
};
#endif
#ifdef OBJC_COMPILING_AMIGA_LIBRARY
# if defined(__MORPHOS__)
# 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
# undef stdout
# undef stderr
# undef errno
extern FILE *_Nonnull stdout, *_Nonnull stderr;
extern int *_Nonnull objc_get_errno(void);
# define errno (*objc_get_errno())
#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);
|
| ︙ | ︙ |