Skip to content

Commit 5d311a2

Browse files
committed
nearly complete lua refactor
1 parent 2b8b8d3 commit 5d311a2

File tree

8 files changed

+404
-107
lines changed

8 files changed

+404
-107
lines changed

source/backends/arm64.d

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -52,18 +52,18 @@ class BackendARM64 : CompilerBackend {
5252

5353
// built in structs
5454
types ~= Type("core", "Array", 24, false, true, [
55-
StructEntry(UsedType(GetType("usize"), false), "length", false, 8, 0),
56-
StructEntry(UsedType(GetType("usize"), false), "memberSize", false, 8, 8),
57-
StructEntry(UsedType(GetType("addr"), false), "elements", false, 8, 16)
55+
StructEntry(UsedType(GetType("core.usize"), false), "length", false, 8, 0),
56+
StructEntry(UsedType(GetType("core.usize"), false), "memberSize", false, 8, 8),
57+
StructEntry(UsedType(GetType("core.addr"), false), "elements", false, 8, 16)
5858
]);
5959
NewConst("core", "Array.length", 0);
6060
NewConst("core", "Array.memberSize", 8);
6161
NewConst("core", "Array.elements", 16);
6262
NewConst("core", "Array.sizeOf", 8 * 3);
6363

6464
types ~= Type("core", "Exception", 24 + 8, false, true, [
65-
StructEntry(UsedType(GetType("bool"), false), "error", false, 8, 0),
66-
StructEntry(UsedType(GetType("Array"), false), "msg", false, 8 * 3, 8)
65+
StructEntry(UsedType(GetType("core.bool"), false), "error", false, 8, 0),
66+
StructEntry(UsedType(GetType("core.Array"), false), "msg", false, 8 * 3, 8)
6767
]);
6868
NewConst("core", "Exception.bool", 0);
6969
NewConst("core", "Exception.msg", 8);
@@ -198,12 +198,7 @@ class BackendARM64 : CompilerBackend {
198198
// call constructors
199199
foreach (global ; globals) {
200200
if (global.type.hasInit && !global.type.ptr) {
201-
if (
202-
(output.mode == OutputMode.Module) &&
203-
(global.mod != output.GetModName())
204-
) {
205-
continue;
206-
}
201+
if (global.mod != output.GetModName()) continue;
207202

208203
LoadAddress("x9", Label("__global_", global.name.Sanitise()));
209204
output ~= "str x9, [x19], #8\n";
@@ -1095,7 +1090,7 @@ class BackendARM64 : CompilerBackend {
10951090
override void CompileString(StringNode node) {
10961091
auto arrayNode = new ArrayNode(node.error);
10971092

1098-
arrayNode.arrayType = new TypeNode(node.error, "u8", false);
1093+
arrayNode.arrayType = new TypeNode(node.error, "core.u8", false);
10991094
arrayNode.constant = node.constant;
11001095

11011096
foreach (ref ch ; node.value) {

0 commit comments

Comments
 (0)