ObjFW  Check-in [2a89141502]

Overview
Comment:amiga-library.xml: Fix typo
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | amiga-library
Files: files | file ages | folders
SHA3-256: 2a8914150247ee3eaaf64e6f17562ccc9b15e7c331983d3751e4a83c07376c0f
User & Date: js on 2022-11-15 22:31:57
Other Links: branch diff | manifest | tags
Context
2022-11-15
23:09
Merge trunk into branch "amiga-library" check-in: a151c9797b user: js tags: amiga-library
22:31
amiga-library.xml: Fix typo check-in: 2a89141502 user: js tags: amiga-library
22:30
Ignore -Warray-parameter for generated linklib check-in: 299216faf1 user: js tags: amiga-library
Changes

Modified src/amiga-glue.h from [5372b32e9d] to [6248efec7e].

98
99
100
101
102
103
104
105

106
107
108
109
110
111
112
113
114
98
99
100
101
102
103
104

105
106
107
108
109
110
111
112
113
114







-
+









extern void glue_OFSocketAddressSetIPXPort PPC_PARAMS(OFSocketAddress *address, uint16_t port);
extern uint16_t glue_OFSocketAddressIPXPort PPC_PARAMS(const OFSocketAddress *address);
extern void glue_OFSocketAddressSetAppleTalkNetwork PPC_PARAMS(OFSocketAddress *address, uint16_t network);
extern uint16_t glue_OFSocketAddressAppleTalkNetwork PPC_PARAMS(const OFSocketAddress *address);
extern void glue_OFSocketAddressSetAppleTalkNode PPC_PARAMS(OFSocketAddress *address, uint8_t node);
extern uint8_t glue_OFSocketAddressAppleTalkNode PPC_PARAMS(const OFSocketAddress *address);
extern void glue_OFSocketAddressSetAppleTalkPort PPC_PARAMS(OFSocketAddress *address, uint8_t port);
extern void glue_OFSocketAddressAppleTalkPort PPC_PARAMS(const OFSocketAddress *address);
extern uint8_t glue_OFSocketAddressAppleTalkPort PPC_PARAMS(const OFSocketAddress *address);
extern OFString *glue_OFTLSStreamErrorCodeDescription PPC_PARAMS(OFTLSStreamErrorCode errorCode);
extern const char *_Nullable glue_OFStrPTime PPC_PARAMS(const char *buffer, const char *format, struct tm *tm, int16_t *_Nullable tz);
extern OFStringEncoding glue_OFStringEncodingParseName PPC_PARAMS(OFString *string);
extern OFString *_Nullable glue_OFStringEncodingName PPC_PARAMS(OFStringEncoding encoding);
extern size_t glue_OFUTF16StringLength PPC_PARAMS(const OFChar16 *string);
extern size_t glue_OFUTF32StringLength PPC_PARAMS(const OFChar32 *string);
extern OFString *_Nonnull glue_OFZIPArchiveEntryVersionToString PPC_PARAMS(uint16_t version);
extern OFString *_Nonnull glue_OFZIPArchiveEntryCompressionMethodName PPC_PARAMS(OFZIPArchiveEntryCompressionMethod compressionMethod);
extern size_t glue_OFZIPArchiveEntryExtraFieldFind PPC_PARAMS(OFData *extraField, OFZIPArchiveEntryExtraFieldTag tag, uint16_t *size);

Modified src/amiga-glue.m from [9fa6751d3a] to [1e1ae95447].

507
508
509
510
511
512
513
514

515
516
517
518
519

520
521
522
523
524
525
526
507
508
509
510
511
512
513

514
515
516
517
518

519
520
521
522
523
524
525
526







-
+




-
+







{
	M68K_ARG(OFSocketAddress *, address, a0)
	M68K_ARG(uint8_t, port, (nil))

	OFSocketAddressSetAppleTalkPort(address, port);
}

void __saveds
uint8_t __saveds
glue_OFSocketAddressAppleTalkPort PPC_PARAMS(const OFSocketAddress *address)
{
	M68K_ARG(const OFSocketAddress *, address, a0)

	OFSocketAddressAppleTalkPort(address);
	return OFSocketAddressAppleTalkPort(address);
}

OFString * __saveds
glue_OFTLSStreamErrorCodeDescription PPC_PARAMS(OFTLSStreamErrorCode errorCode)
{
	M68K_ARG(OFTLSStreamErrorCode, errorCode, d0)

Modified src/amiga-library.xml from [442f134718] to [4e245c2002].

209
210
211
212
213
214
215
216

217
218
219
220
221
222
223
209
210
211
212
213
214
215

216
217
218
219
220
221
222
223







-
+







  <function name='OFSocketAddressAppleTalkNode' return-type='uint8_t'>
    <argument name='address' type='const OFSocketAddress *' m68k-reg='a0'/>
  </function>
  <function name='OFSocketAddressSetAppleTalkPort'>
    <argument name='address' type='OFSocketAddress *' m68k-reg='a0'/>
    <argument name='port' type='uint8_t' m68k-arg='d0'/>
  </function>
  <function name='OFSocketAddressAppleTalkPort' return='uint8_t'>
  <function name='OFSocketAddressAppleTalkPort' return-type='uint8_t'>
    <argument name='address' type='const OFSocketAddress *' m68k-reg='a0'/>
  </function>
  <include>OFTLSStream.h</include>
  <function name='OFTLSStreamErrorCodeDescription' return-type='OFString *'>
    <argument name='errorCode' type='OFTLSStreamErrorCode' m68k-reg='d0'/>
  </function>
  <!-- Only for tests. -->

Modified src/linklib/linklib.m from [1d41ffceae] to [9e12386157].

1022
1023
1024
1025
1026
1027
1028
1029

1030
1031
1032
1033
1034
1035

1036
1037
1038
1039
1040
1041
1042

1043
1044
1045
1046
1047
1048
1049
1022
1023
1024
1025
1026
1027
1028

1029
1030
1031
1032
1033
1034

1035
1036
1037
1038
1039
1040
1041

1042
1043
1044
1045
1046
1047
1048
1049







-
+





-
+






-
+







	    :: "r"(ObjFWBase) : "r12"
	);

	__extension__ ((void (*)(OFSocketAddress *, uint8_t))*(void **)(((uintptr_t)ObjFWBase) - 370))(address, port);
#endif
}

void
uint8_t
OFSocketAddressAppleTalkPort(const OFSocketAddress *address)
{
#if defined(OF_AMIGAOS_M68K)
	register struct Library *a6 __asm__("a6") = ObjFWBase;
	(void)a6;
	((void (*)(const OFSocketAddress *__asm__("a0")))(((uintptr_t)ObjFWBase) - 378))(address);
	return ((uint8_t (*)(const OFSocketAddress *__asm__("a0")))(((uintptr_t)ObjFWBase) - 378))(address);
#elif defined(OF_MORPHOS)
	__asm__ __volatile__ (
	    "mr		%%r12, %0"
	    :: "r"(ObjFWBase) : "r12"
	);

	__extension__ ((void (*)(const OFSocketAddress *))*(void **)(((uintptr_t)ObjFWBase) - 376))(address);
	return __extension__ ((uint8_t (*)(const OFSocketAddress *))*(void **)(((uintptr_t)ObjFWBase) - 376))(address);
#endif
}

OFString *
OFTLSStreamErrorCodeDescription(OFTLSStreamErrorCode errorCode)
{
#if defined(OF_AMIGAOS_M68K)