ObjFW  Check-in [e4ead87504]

Overview
Comment:src/amiga-linklib.xml: Fix typo
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | amiga-library
Files: files | file ages | folders
SHA3-256: e4ead87504f69b1707f83aca5c16da4b559baaa82cdda0526260d5bc7eafce8b
User & Date: js on 2021-10-16 12:41:48
Other Links: branch diff | manifest | tags
Context
2021-10-16
14:34
Amiga library: Wrap OFPBKDF2 & OFScrypt check-in: 00246bf4bd user: js tags: amiga-library
12:41
src/amiga-linklib.xml: Fix typo check-in: e4ead87504 user: js tags: amiga-library
12:01
tests: Symlink Amiga library check-in: 56cc282fcc user: js tags: amiga-library
Changes

Modified src/amiga-glue.m from [4ee8e2fbd6] to [3a131dec1c].

256
257
258
259
260
261
262
263
264


265
266
267
268
269
270
271
256
257
258
259
260
261
262


263
264
265
266
267
268
269
270
271







-
-
+
+








	return OFAlignmentOfTypeEncoding(type);
}

void __saveds
glue_OFOnce PPC_PARAMS(OFOnceControl *_Nonnull control, OFOnceFunction _Nonnull func)
{
	M68K_ARG(OFOnceControl *_Nonnull, control, (nil))
	M68K_ARG(OFOnceFunction _Nonnull, func, (nil))
	M68K_ARG(OFOnceControl *_Nonnull, control, a0)
	M68K_ARG(OFOnceFunction _Nonnull, func, a1)

	OFOnce(control, func);
}

void __saveds
glue_OFPBKDF2 PPC_PARAMS(OFPBKDF2Parameters parameters)
{

Modified src/amiga-library.xml from [25b5953f80] to [99e036ac2d].

95
96
97
98
99
100
101
102
103


104
105
106
107
108
109
110
95
96
97
98
99
100
101


102
103
104
105
106
107
108
109
110







-
-
+
+







    <argument name='type' type='const char *' m68k-reg='a0'/>
  </function>
  <function name='OFAlignmentOfTypeEncoding' return-type='size_t'>
    <argument name='type' type='const char *' m68k-reg='a0'/>
  </function>
  <include>OFOnce.h</include>
  <function name='OFOnce'>
    <argument name='control' type='OFOnceControl *_Nonnull' m68k-arg='a0'/>
    <argument name='func' type='OFOnceFunction _Nonnull' m68k-arg='a1'/>
    <argument name='control' type='OFOnceControl *_Nonnull' m68k-reg='a0'/>
    <argument name='func' type='OFOnceFunction _Nonnull' m68k-reg='a1'/>
  </function>
  <include>OFPBKDF2.h</include>
  <function name='OFPBKDF2'>
    <argument name='parameters' type='OFPBKDF2Parameters' m68k-reg='a0'/>
  </function>
  <include>OFScrypt.h</include>
  <function name='OFScrypt'>

Modified src/linklib/linklib.m from [90370ec947] to [01f67f8836].

532
533
534
535
536
537
538
539

540
541
542
543
544
545
546
532
533
534
535
536
537
538

539
540
541
542
543
544
545
546







-
+








void
OFOnce(OFOnceControl *_Nonnull control, OFOnceFunction _Nonnull func)
{
#if defined(OF_AMIGAOS_M68K)
	register struct Library *a6 __asm__("a6") = ObjFWBase;
	(void)a6;
	((void (*)(OFOnceControl *_Nonnull __asm__("(nil)"), OFOnceFunction _Nonnull __asm__("(nil)")))(((uintptr_t)ObjFWBase) - 204))(control, func);
	((void (*)(OFOnceControl *_Nonnull __asm__("a0"), OFOnceFunction _Nonnull __asm__("a1")))(((uintptr_t)ObjFWBase) - 204))(control, func);
#elif defined(OF_MORPHOS)
	__asm__ __volatile__ (
	    "mr		%%r12, %0"
	    :: "r"(ObjFWBase) : "r12"
	);

	__extension__ ((void (*)(OFOnceControl *_Nonnull, OFOnceFunction _Nonnull))*(void **)(((uintptr_t)ObjFWBase) - 202))(control, func);