Overview
| Comment: | Add libc symbols needed by the runtime to of_libc |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | amiga-library |
| Files: | files | file ages | folders |
| SHA3-256: |
f822adb90507e63f61ad4f4c2d08db51 |
| User & Date: | js on 2020-06-07 16:03:16 |
| Other Links: | branch diff | manifest | tags |
Context
|
2020-06-07
| ||
| 16:34 | Pass __sF around instead of std* individually check-in: 514944f1ea user: js tags: amiga-library | |
| 16:03 | Add libc symbols needed by the runtime to of_libc check-in: f822adb905 user: js tags: amiga-library | |
| 15:36 | Add missing extern for of_init() check-in: eac02d83d6 user: js tags: amiga-library | |
Changes
Modified src/amiga-library.h from [131927e635] to [e0b880f183].
| ︙ | ︙ | |||
15 16 17 18 19 20 21 22 23 24 25 26 |
* file.
*/
#import "macros.h"
#if defined(OF_COMPILING_AMIGA_LIBRARY) || defined(OF_COMPILING_AMIGA_LINKLIB)
struct of_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);
int (*_Nonnull vfprintf)(FILE *_Nonnull restrict,
| > > > > < < > | > > > > > | | > > > > > > > > > > > > > > > > > > > | 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 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 |
* file.
*/
#import "macros.h"
#if defined(OF_COMPILING_AMIGA_LIBRARY) || defined(OF_COMPILING_AMIGA_LINKLIB)
struct of_libc {
/*
* 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);
int (*_Nonnull vfprintf)(FILE *_Nonnull restrict,
const char *_Nonnull restrict, va_list);
int (*_Nonnull fflush)(FILE *_Nonnull);
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
void (*_Nonnull __register_frame_info)(const void *_Nonnull,
void *_Nonnull);
void *_Nullable (*_Nonnull __deregister_frame_info)(
const void *_Nonnull);
/* Needed only by ObjFW. */
int (*_Nonnull vsnprintf)(const char *_Nonnull restrict, size_t,
const char *_Nonnull restrict, va_list);
void (*_Nonnull exit)(int);
char *_Nullable (*_Nonnull setlocale)(int, const char *_Nullable);
};
extern bool of_init(unsigned int version, struct of_libc *libc_, FILE *stderr_);
#endif
|
Modified src/amiga-library.m from [f8b63aa6c0] to [f07efda97e].
| ︙ | ︙ | |||
59 60 61 62 63 64 65 66 67 68 69 70 71 72 | #ifdef OF_AMIGAOS_M68K extern uintptr_t __CTOR_LIST__[]; extern const void *_EH_FRAME_BEGINS__; extern void *_EH_FRAME_OBJECTS__; #endif extern bool glue_of_init(void); #ifdef OF_MORPHOS const ULONG __abox__ = 1; #endif struct ExecBase *SysBase; struct of_libc libc; FILE *stderr; | > > > > > > > > | 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 |
#ifdef OF_AMIGAOS_M68K
extern uintptr_t __CTOR_LIST__[];
extern const void *_EH_FRAME_BEGINS__;
extern void *_EH_FRAME_OBJECTS__;
#endif
extern bool glue_of_init(void);
#ifdef OF_AMIGAOS_M68K
void
__init_eh(void)
{
/* Taken care of by of_init() */
}
#endif
#ifdef OF_MORPHOS
const ULONG __abox__ = 1;
#endif
struct ExecBase *SysBase;
struct of_libc libc;
FILE *stderr;
|
| ︙ | ︙ | |||
272 273 274 275 276 277 278 |
static void *__saveds
lib_close(void)
{
OF_M68K_ARG(struct ObjFWBase *, base, a6)
if (base->parent != NULL) {
| | > > > > > > > > > | 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 |
static void *__saveds
lib_close(void)
{
OF_M68K_ARG(struct ObjFWBase *, base, a6)
if (base->parent != NULL) {
struct ObjFWBase *parent;
#ifdef OF_AMIGAOS_M68K
if (base->initialized)
for (size_t i = 1; i <= (size_t)_EH_FRAME_BEGINS__; i++)
libc.__deregister_frame_info(
(&_EH_FRAME_BEGINS__)[i]);
#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;
}
|
| ︙ | ︙ | |||
380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 |
va_start(args, fmt);
ret = libc.vfprintf(stream, fmt, args);
va_end(args);
return ret;
}
int
vsnprintf(char *restrict str, size_t size, const char *restrict fmt,
va_list args)
{
return libc.vsnprintf(str, size, fmt, args);
}
void
exit(int status)
{
libc.exit(status);
| > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > < < < < < < < < | 397 398 399 400 401 402 403 404 405 406 407 408 409 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 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 |
va_start(args, fmt);
ret = libc.vfprintf(stream, fmt, args);
va_end(args);
return ret;
}
int
fflush(FILE *restrict stream)
{
return libc.fflush(stream);
}
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
int
vsnprintf(char *restrict str, size_t size, const char *restrict fmt,
va_list args)
{
return libc.vsnprintf(str, size, fmt, args);
}
void
exit(int status)
{
libc.exit(status);
OF_UNREACHABLE
}
char *
setlocale(int category, const char *locale)
{
return libc.setlocale(category, locale);
|
| ︙ | ︙ |