ObjFW  Check-in [a03b820df8]

Overview
Comment:Rename library.xml to amiga-library.xml
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | amiga-library
Files: files | file ages | folders
SHA3-256: a03b820df85e1dca0be4e51fc034dd45437604fe827b0885453208301647c4bf
User & Date: js on 2021-05-09 18:02:46
Other Links: branch diff | manifest | tags
Context
2021-05-13
20:13
Merge trunk into branch "amiga-library" check-in: 08361ff875 user: js tags: amiga-library
2021-05-09
18:02
Rename library.xml to amiga-library.xml check-in: a03b820df8 user: js tags: amiga-library
14:45
Merge trunk into branch "amiga-library" check-in: 3c88df0ce4 user: js tags: amiga-library
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Modified generators/library/FuncArrayGenerator.m from [51e8f1d0df] to [1c3582d45a].

︙
63
64
65
66
67
68
69
70
71


72
73
74
75
76
77
78

63
64
65
66
67
68
69


70
71
72
73
74
75
76
77
78








-
-
+
+








	[super dealloc];
}

- (void)generate
{
	[_include writeString: COPYRIGHT];
	[_include writeString:
	    @"/* This file is automatically generated from library.xml */\n"
	    @"\n"];
	    @"/* This file is automatically generated from "
	    @"amiga-library.xml */\n\n"];

	for (OFXMLElement *function in [_library elementsForName: @"function"])
		[_include writeFormat:
		    @"(CONST_APTR)glue_%@,\n",
		    [function attributeForName: @"name"].stringValue];
}
@end

Modified generators/library/GlueGenerator.m from [31aa00cfbb] to [7e6c4df2bf].

︙
68
69
70
71
72
73
74
75
76


77
78
79


80
81
82
83
84
85
86

68
69
70
71
72
73
74


75
76
77
78

79
80
81
82
83
84
85
86
87








-
-
+
+


-
+
+









- (void)generate
{
	[_header writeString: COPYRIGHT];
	[_impl writeString: COPYRIGHT];

	[_header writeString:
	    @"/* This file is automatically generated from library.xml */\n"
	    @"\n"];
	    @"/* This file is automatically generated from "
	    @"amiga-library.xml */\n\n"];

	[_impl writeString:
	    @"/* This file is automatically generated from library.xml */\n"
	    @"/* This file is automatically generated from "
	    @"amiga-library.xml */\n"
	    @"\n"
	    @"#include \"config.h\"\n"
	    @"\n"
	    @"#import \"amiga-glue.h\"\n"
	    @"\n"];

	for (OFXMLElement *include in [_library elementsForName: @"include"])
︙

Modified generators/library/LibraryGenerator.m from [c412c8dbe7] to [c4366e35fe].

︙
32
33
34
35
36
37
38
39

40
41
42
43
44
45
46

32
33
34
35
36
37
38

39
40
41
42
43
44
45
46








-
+









@implementation LibraryGenerator
- (void)generateInDirectory: (OFString *)directory
{
	OFURL *sourcesURL = [[OFFileManager defaultManager].currentDirectoryURL
	    URLByAppendingPathComponent: directory];
	OFURL *libraryURL = [sourcesURL
	    URLByAppendingPathComponent: @"library.xml"];
	    URLByAppendingPathComponent: @"amiga-library.xml"];
	OFURL *linkLibURL = [sourcesURL
	    URLByAppendingPathComponent: @"linklib/linklib.m"];
	OFURL *glueHeaderURL = [sourcesURL
	    URLByAppendingPathComponent: @"amiga-glue.h"];
	OFURL *glueURL = [sourcesURL
	    URLByAppendingPathComponent: @"amiga-glue.m"];
	OFURL *funcArrayURL = [sourcesURL
︙

Modified generators/library/LinkLibGenerator.m from [39332583d0] to [1db6f70617].

︙
67
68
69
70
71
72
73
74


75
76
77
78
79
80
81

67
68
69
70
71
72
73

74
75
76
77
78
79
80
81
82








-
+
+








{
	OFString *libBase = [_library attributeForName: @"base"].stringValue;
	OFArray OF_GENERIC(OFXMLElement *) *functions;
	size_t funcIndex = 0;

	[_impl writeString: COPYRIGHT];
	[_impl writeString:
	    @"/* This file is automatically generated from library.xml */\n"
	    @"/* This file is automatically generated from "
	    @"amiga-library.xml */\n"
	    @"\n"
	    @"#include \"config.h\"\n"
	    @"\n"];

	for (OFXMLElement *include in [_library elementsForName: @"include"])
		[_impl writeFormat: @"#import \"%@\"\n",
				    include.stringValue];
︙
143
144
145
146
147
148
149
150

151
152
153
154
155
156
157
158

144
145
146
147
148
149
150

151

152
153
154
155
156
157
158








-
+
-









			if (argumentIndex++ > 0)
				[_impl writeString: @", "];

			[_impl writeString: argType];
			if (![argType hasSuffix: @"*"])
				[_impl writeString: @" "];
			[_impl writeFormat: @"__asm__(\"%@\")",
			[_impl writeFormat: @"__asm__(\"%@\")", m68kReg];
						    m68kReg];
		}

		[_impl writeFormat: @"))(((uintptr_t)%@) - %zu))(",
				    libBase, 30 + funcIndex * 6];

		argumentIndex = 0;
		for (OFXMLElement *argument in
︙

Modified src/amiga-funcarray.inc from [49370bf0a9] to [4661af4786].

︙
9
10
11
12
13
14
15
16

17
18
19
20
21
22
23

9
10
11
12
13
14
15

16
17
18
19
20
21
22
23








-
+








 *
 * Alternatively, it may be distributed under the terms of the GNU General
 * Public License, either version 2 or 3, which can be found in the file
 * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
 * file.
 */

/* This file is automatically generated from library.xml */
/* This file is automatically generated from amiga-library.xml */

(CONST_APTR)glue_OFInit,
(CONST_APTR)glue_OFAllocMemory,
(CONST_APTR)glue_OFAllocZeroedMemory,
(CONST_APTR)glue_OFResizeMemory,
(CONST_APTR)glue_OFFreeMemory,
(CONST_APTR)glue_OFHashInit,
︙

Modified src/amiga-glue.h from [2e0af03a29] to [5f8aad8c81].

︙
9
10
11
12
13
14
15
16

17
18
19
20
21
22
23

9
10
11
12
13
14
15

16
17
18
19
20
21
22
23








-
+








 *
 * Alternatively, it may be distributed under the terms of the GNU General
 * Public License, either version 2 or 3, which can be found in the file
 * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
 * file.
 */

/* This file is automatically generated from library.xml */
/* This file is automatically generated from amiga-library.xml */

#import "amiga-library.h"
#import "OFObject.h"
#import "OFStdIOStream.h"
#import "OFApplication.h"
#import "OFBlock.h"
#import "OFDNSResourceRecord.h"
︙

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

︙
9
10
11
12
13
14
15
16

17
18
19
20
21
22
23

9
10
11
12
13
14
15

16
17
18
19
20
21
22
23








-
+








 *
 * Alternatively, it may be distributed under the terms of the GNU General
 * Public License, either version 2 or 3, which can be found in the file
 * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
 * file.
 */

/* This file is automatically generated from library.xml */
/* This file is automatically generated from amiga-library.xml */

#include "config.h"

#import "amiga-glue.h"

#ifdef OF_MORPHOS
/* All __saveds functions in this file need to use the SysV ABI */
︙

Name change from src/library.xml to src/amiga-library.xml.

︙

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

︙
9
10
11
12
13
14
15
16

17
18
19
20
21
22
23

9
10
11
12
13
14
15

16
17
18
19
20
21
22
23








-
+








 *
 * Alternatively, it may be distributed under the terms of the GNU General
 * Public License, either version 2 or 3, which can be found in the file
 * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
 * file.
 */

/* This file is automatically generated from library.xml */
/* This file is automatically generated from amiga-library.xml */

#include "config.h"

#import "amiga-library.h"
#import "OFObject.h"
#import "OFStdIOStream.h"
#import "OFApplication.h"
︙

Modified src/runtime/amiga-funcarray.inc from [eca72c7d0a] to [4a87a7ea0f].

︙
9
10
11
12
13
14
15
16

17
18
19
20
21
22
23

9
10
11
12
13
14
15

16
17
18
19
20
21
22
23








-
+








 *
 * Alternatively, it may be distributed under the terms of the GNU General
 * Public License, either version 2 or 3, which can be found in the file
 * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
 * file.
 */

/* This file is automatically generated from library.xml */
/* This file is automatically generated from amiga-library.xml */

(CONST_APTR)glue_objc_init,
(CONST_APTR)glue___objc_exec_class,
(CONST_APTR)glue_objc_msg_lookup,
(CONST_APTR)glue_objc_msg_lookup_stret,
(CONST_APTR)glue_objc_msg_lookup_super,
(CONST_APTR)glue_objc_msg_lookup_super_stret,
︙

Modified src/runtime/amiga-glue.h from [2ca426ebf9] to [f6e0849e8b].

︙
9
10
11
12
13
14
15
16

17
18
19
20
21
22
23

9
10
11
12
13
14
15

16
17
18
19
20
21
22
23








-
+








 *
 * Alternatively, it may be distributed under the terms of the GNU General
 * Public License, either version 2 or 3, which can be found in the file
 * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
 * file.
 */

/* This file is automatically generated from library.xml */
/* This file is automatically generated from amiga-library.xml */

#import "ObjFWRT.h"
#import "private.h"

#ifdef OF_AMIGAOS_M68K
# define PPC_PARAMS(...) (void)
# define M68K_ARG(type, name, reg)		\
︙

Modified src/runtime/amiga-glue.m from [7d3bd6cbde] to [f5c525c10e].

︙
9
10
11
12
13
14
15
16

17
18
19
20
21
22
23

9
10
11
12
13
14
15

16
17
18
19
20
21
22
23








-
+








 *
 * Alternatively, it may be distributed under the terms of the GNU General
 * Public License, either version 2 or 3, which can be found in the file
 * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
 * file.
 */

/* This file is automatically generated from library.xml */
/* This file is automatically generated from amiga-library.xml */

#include "config.h"

#import "amiga-glue.h"

#ifdef OF_MORPHOS
/* All __saveds functions in this file need to use the SysV ABI */
︙

Name change from src/runtime/library.xml to src/runtime/amiga-library.xml.

︙

Modified src/runtime/linklib/linklib.m from [9056a4e93e] to [2cef24eea5].

︙
9
10
11
12
13
14
15
16

17
18
19
20
21
22
23

9
10
11
12
13
14
15

16
17
18
19
20
21
22
23








-
+








 *
 * Alternatively, it may be distributed under the terms of the GNU General
 * Public License, either version 2 or 3, which can be found in the file
 * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
 * file.
 */

/* This file is automatically generated from library.xml */
/* This file is automatically generated from amiga-library.xml */

#include "config.h"

#import "ObjFWRT.h"
#import "private.h"

extern struct Library *ObjFWRTBase;
︙

Fossil 2.23 [47362306a7] 2023-11-01 18:56:47
This page was generated in about 0.023s