ObjFW  Check-in [ad47ca2bf3]

Overview
Comment:Adjust Amiga library to changed function names
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | amiga-library
Files: files | file ages | folders
SHA3-256: ad47ca2bf37a433a5d65a28d97be38486ad06589051c81789d348fcd5fa834a1
User & Date: js on 2020-11-14 12:31:43
Other Links: branch diff | manifest | tags
Context
2020-11-14
19:26
Merge trunk into branch "amiga-library" check-in: 2f8792bc1d user: js tags: amiga-library
12:31
Adjust Amiga library to changed function names check-in: ad47ca2bf3 user: js tags: amiga-library
12:28
Merge trunk into branch "amiga-library" check-in: a55863c2ed user: js tags: amiga-library
Changes

Modified src/amiga-glue.m from [54d11b7653] to [fd6300fe11].

70
71
72
73
74
75
76
77

78
79
80
81
82

83
84
85
86

87
88
89
90
91

92
93
94
95
96
97
98
70
71
72
73
74
75
76

77
78
79
80
81

82
83
84
85

86
87
88
89
90

91
92
93
94
95
96
97
98







-
+




-
+



-
+




-
+







	M68K_ARG(char ***, argv, a1)
	M68K_ARG(id <OFApplicationDelegate>, delegate, a2)

	return of_application_main(argc, argv, delegate);
}

void *__saveds
glue_of_malloc PPC_PARAMS(size_t count, size_t size)
glue_of_alloc PPC_PARAMS(size_t count, size_t size)
{
	M68K_ARG(size_t, count, d0)
	M68K_ARG(size_t, size, d1)

	return of_malloc(count, size);
	return of_alloc(count, size);
}

void *__saveds
glue_of_calloc PPC_PARAMS(size_t count, size_t size)
glue_of_alloc_zeroed PPC_PARAMS(size_t count, size_t size)
{
	M68K_ARG(size_t, count, d0)
	M68K_ARG(size_t, size, d1)

	return of_calloc(count, size);
	return of_alloc_zeroed(count, size);
}

void *__saveds
glue_of_realloc PPC_PARAMS(void *pointer, size_t count, size_t size)
{
	M68K_ARG(void *, pointer, a0)
	M68K_ARG(size_t, count, d0)

Modified src/amiga-library.m from [b2786dba2d] to [2eef08ac58].

66
67
68
69
70
71
72
73
74


75
76
77
78
79
80
81
66
67
68
69
70
71
72


73
74
75
76
77
78
79
80
81







-
-
+
+







extern const void *_EH_FRAME_BEGINS__;
extern void *_EH_FRAME_OBJECTS__;
void __register_frame_info(const void *, void *);
void *__deregister_frame_info(const void *);
#endif

extern bool glue_of_init(void);
extern void *glue_of_malloc(void);
extern void *glue_of_calloc(void);
extern void *glue_of_alloc(void);
extern void *glue_of_alloc_zeroed(void);
extern void *glue_of_realloc(void);
extern uint32_t *glue_of_hash_seed_ref(void);
extern OFStdIOStream **glue_of_stdin_ref(void);
extern OFStdIOStream **glue_of_stdout_ref(void);
extern OFStdIOStream **glue_of_stderr_ref(void);
extern void glue_of_logv(void);
extern int glue_of_application_main(void);
626
627
628
629
630
631
632
633
634


635
636
637
638
639
640
641
626
627
628
629
630
631
632


633
634
635
636
637
638
639
640
641







-
-
+
+







	(CONST_APTR)lib_expunge,
	(CONST_APTR)lib_null,
#ifdef OF_MORPHOS
	(CONST_APTR)-1,
	(CONST_APTR)FUNCARRAY_32BIT_SYSTEMV,
#endif
	(CONST_APTR)glue_of_init,
	(CONST_APTR)glue_of_malloc,
	(CONST_APTR)glue_of_calloc,
	(CONST_APTR)glue_of_alloc,
	(CONST_APTR)glue_of_alloc_zeroed,
	(CONST_APTR)glue_of_realloc,
	(CONST_APTR)glue_of_hash_seed_ref,
	(CONST_APTR)glue_of_stdin_ref,
	(CONST_APTR)glue_of_stdout_ref,
	(CONST_APTR)glue_of_stderr_ref,
	(CONST_APTR)glue_of_logv,
	(CONST_APTR)glue_of_application_main,

Modified src/amigaos3.sfd from [aef82a1560] to [79d92f1a5f].

1
2
3
4
5
6
7
8
9


10
11
12
13
14
15
16
1
2
3
4
5
6
7


8
9
10
11
12
13
14
15
16







-
-
+
+







==base _ObjFWBase
==basetype struct Library *
==libname objfw68k.library
==bias 30
==public
* The following function is only for the linklib.
bool glue_of_init(unsigned int version, struct of_libc *_Nonnull libc, FILE *_Nonnull *_Nonnull sF)(d0,a0,a1)
void *_Nullable glue_of_malloc(size_t count, size_t size)(d0,d1)
void *_Nullable glue_of_calloc(size_t count, size_t size)(d0,d1)
void *_Nullable glue_of_alloc(size_t count, size_t size)(d0,d1)
void *_Nullable glue_of_alloc_zeroed(size_t count, size_t size)(d0,d1)
void *_Nullable glue_of_realloc(void *_Nullable pointer, size_t count, size_t size)(a0,d0,d1)
uint32_t *_Nonnull glue_of_hash_seed_ref(void)()
OFStdIOStream *_Nonnull *_Nullable glue_of_stdin_ref(void)()
OFStdIOStream *_Nonnull *_Nullable glue_of_stdout_ref(void)()
OFStdIOStream *_Nonnull *_Nullable glue_of_stderr_ref(void)()
void glue_of_logv(OFConstantString *format, va_list arguments)(a0,a1)
int glue_of_application_main(int *_Nonnull argc, char *_Nullable *_Nonnull *_Nonnull argv, id <OFApplicationDelegate> delegate)(a0,a1,a2)

Modified src/linklib/linklib.m from [c2cc9e0cf6] to [4e6a5f801d].

366
367
368
369
370
371
372
373

374
375

376
377
378
379

380
381

382
383
384
385
386
387
388
366
367
368
369
370
371
372

373
374

375
376
377
378

379
380

381
382
383
384
385
386
387
388







-
+

-
+



-
+

-
+







DESTRUCTOR_P(ObjFW, 4000)
{
	dtor();
}
#endif

void *
of_malloc(size_t count, size_t size)
of_alloc(size_t count, size_t size)
{
	return glue_of_malloc(count, size);
	return glue_of_alloc(count, size);
}

void *
of_calloc(size_t count, size_t size)
of_alloc_zeroed(size_t count, size_t size)
{
	return glue_of_calloc(count, size);
	return glue_of_alloc_zeroed(count, size);
}

void *
of_realloc(void *pointer, size_t count, size_t size)
{
	return glue_of_realloc(pointer, count, size);
}