From 6e2a99a6f46c3139f4433d568ea54f0f8f24b333 Mon Sep 17 00:00:00 2001
From: nub31 <oliverlhs@outlook.com>
Date: Mon, 18 Aug 2025 21:25:03 +0200
Subject: [PATCH] Fix archive issues in cli

---
 example/src/main.nub                          |  13 ++++-
 src/compiler/NubLang.CLI/NubLang.CLI.csproj   |   6 ++-
 src/compiler/NubLang.CLI/Program.cs           |  47 ++++++++++--------
 .../assets/{libruntime_x64.a => runtime.o}    | Bin 7550 -> 4928 bytes
 src/compiler/NubLang.CLI/assets/x64.o         | Bin 0 -> 2344 bytes
 .../NubLang/Generation/QBE/QBEGenerator.cs    |   2 +-
 src/runtime/.gitignore                        |   3 +-
 src/runtime/makefile                          |  14 +++---
 8 files changed, 51 insertions(+), 34 deletions(-)
 rename src/compiler/NubLang.CLI/assets/{libruntime_x64.a => runtime.o} (55%)
 create mode 100644 src/compiler/NubLang.CLI/assets/x64.o

diff --git a/example/src/main.nub b/example/src/main.nub
index 8bf7d2e..d063ee0 100644
--- a/example/src/main.nub
+++ b/example/src/main.nub
@@ -1,8 +1,19 @@
 // c
 extern func puts(text: cstring)
 
+struct Human {
+    name: cstring
+    age: u32
+}
+
 func main(args: []cstring): i64
 {
-    puts("Hello, World")
+    let x: Human = struct {
+        name = "Oliver"
+        age = 23
+    } 
+
+    puts(x.name)
+
     return 0
 }
diff --git a/src/compiler/NubLang.CLI/NubLang.CLI.csproj b/src/compiler/NubLang.CLI/NubLang.CLI.csproj
index a686430..2f25112 100644
--- a/src/compiler/NubLang.CLI/NubLang.CLI.csproj
+++ b/src/compiler/NubLang.CLI/NubLang.CLI.csproj
@@ -14,8 +14,10 @@
     </ItemGroup>
 
     <ItemGroup>
-      <None Remove="assets\libruntime_x64.a" />
-      <EmbeddedResource Include="assets\libruntime_x64.a" />
+      <None Remove="assets\runtime.o" />
+      <EmbeddedResource Include="assets\runtime.o" />
+      <None Remove="assets\x64.o" />
+      <EmbeddedResource Include="assets\x64.o" />
     </ItemGroup>
 
 </Project>
diff --git a/src/compiler/NubLang.CLI/Program.cs b/src/compiler/NubLang.CLI/Program.cs
index 2b9f706..3f4f122 100644
--- a/src/compiler/NubLang.CLI/Program.cs
+++ b/src/compiler/NubLang.CLI/Program.cs
@@ -124,32 +124,38 @@ for (var i = 0; i < typedSyntaxTrees.Count; i++)
     objectFiles.Add(objFilePath);
 }
 
-const string runtimeName = "libruntime_x64.a";
-
 var resources = Assembly.GetExecutingAssembly().GetManifestResourceNames();
-var runtime = resources.First(r => r.EndsWith(runtimeName));
 
-await using var reader = Assembly.GetExecutingAssembly().GetManifestResourceStream(runtime);
+string[] runtimeObjects = ["runtime.o", "x64.o"];
 
-if (reader == null)
+foreach (var runtimeObject in runtimeObjects)
 {
-    Console.Error.WriteLine($"Cannot open stream to '{runtimeName}'");
-    return 1;
+    var runtime = resources.First(r => r.EndsWith(runtimeObject));
+
+    await using var reader = Assembly
+        .GetExecutingAssembly()
+        .GetManifestResourceStream(runtime);
+
+    if (reader == null)
+    {
+        Console.Error.WriteLine($"Cannot open read stream to '{runtimeObject}'");
+        return 1;
+    }
+
+    var runtimePath = Path.Combine("build", "runtime", runtimeObject);
+    var runtimeDir = Path.GetDirectoryName(runtimePath);
+    if (!string.IsNullOrEmpty(runtimeDir))
+    {
+        Directory.CreateDirectory(runtimeDir);
+    }
+
+    await using var writer = new FileStream(runtimePath, FileMode.Create);
+
+    reader.CopyTo(writer);
+
+    objectFiles.Add(runtimePath);
 }
 
-var runtimePath = Path.Combine("build", "runtime", runtimeName);
-var runtimeDir = Path.GetDirectoryName(runtimePath);
-if (!string.IsNullOrEmpty(runtimeDir))
-{
-    Directory.CreateDirectory(runtimeDir);
-}
-
-await using var writer = new FileStream(runtimePath, FileMode.Create);
-
-reader.CopyTo(writer);
-
-objectFiles.Add(runtimePath);
-
 var outPath = options.OutputPath ?? Path.Combine("build", "out.a");
 var outDir = Path.GetDirectoryName(outPath);
 if (!string.IsNullOrEmpty(outDir))
@@ -163,4 +169,5 @@ if (!archiveResult)
     return 1;
 }
 
+
 return 0;
\ No newline at end of file
diff --git a/src/compiler/NubLang.CLI/assets/libruntime_x64.a b/src/compiler/NubLang.CLI/assets/runtime.o
similarity index 55%
rename from src/compiler/NubLang.CLI/assets/libruntime_x64.a
rename to src/compiler/NubLang.CLI/assets/runtime.o
index d43a5680dbe79e118fb2c5f907a572b0754c015a..26e46783222c42d32759941cddfbcdfee24891d2 100644
GIT binary patch
delta 332
zcmexobwF+7t!S3|0BgQO20UK_iy9Yg+rrAG#%5;rYz41c?-eVJLV<#+ASnT%q%HS9
z|DNHbJ~chv<20jZF@F%7^PXuuu@>_$9^5L+)U>Hlg3UY1MMBLl*!5Bk&+o&5Z%!@M
zc;&iL!)505(tTRyO461Bd8R^Eiyz&vx|*N=S}j{^VkXCvUNsv|x2xOpru|=|Cf~&v
zyzj-;=;Qwje%$Q0s7k5O+;4qWNO<vX<7J!HE5-Z06!vtEefL53Q_DQwtvNc4+Yf5?
zd|+0LwPl<<vFyX-U#wls=0=v2SBn^L-o>WD#OOKsF~@sG;mMad^%)H&Gjqi=T24;p
za%YsCyqc?AQiTBm)EFT&7m#8DVy(&6-0vlwAc739F=U;2${C$D@8<c>!uVivyp;In
IOM)Iu0L8C$X#fBK

delta 1748
zcma)5du&rx7(b`)+pV|HrK}TLP?rr{Z?|?uV1riYHXT8TOq3z(>t-8nE4JMzi&7rb
zY($f~FF`bF#1SRxlHpKe)QE&Q`~#G*=pxFp7?~z08l#Cw#B=UFw;79xe#yDt^Zvfa
z`OeAmzgKTtS{F^lJJ%Wo&&}kUr^@pDug9~h5D+mUgtX+meDiU*U{t^6?)G#hn#!P5
zUvH+XNAxCHqQdVa&wS)yARuK9tg5+FE+JwZZ`0)RVSc~Qa?f1FM@VBCD%;}y=Kb`y
zq0$!n;TQUMOkHR@>au_L_HQ%ScUL~Sefj6-@`vmrm#zFHOm8XM6x{v%bFVIc<F#XN
zHYWV~Q!h2%)v@{U{teH3aPi%<UvEvgjut<aT~T^%=i1Q&kFL~eM0NH0Lnnr+?^xf~
z)LC!b_u=`$1C1Nwa}QqeZ_OUu|C#Xf(_jAj@hy8U`_C;Y-F`Ot-aE0S*Ve>G_Ha);
za^JdVS5JM<&y1)Cf>XzjYcA<t_kC&}Jn_3GpYQ(>fk%5#9jK|D7}K_?upKzVRonu9
z8U)-4m0UZ142HQT+zRKpU8UQ|I4PB5nbR@r$caJJcoh%8rXnYfL08c(JTNg^bVGw@
zCT1<|s=912P?$2E;D1fJ#?MCXi5T-0RmU`PI{FPsVhGug6*Ujf{Xo^`;mPL7lXXNg
zYY~iT{kaw*YmotY3C9@!#hWOjRg*&mw~B}osfcWrG^r<yxPr@B|8RYuN=4#@&SZ}$
zB)hxP8Bs`yJCkXlw=Y)J9qsK9(y6$>HVKin>JT$&l%ox&(QPDy7GVQT#3m-?L=KtB
zU%VGvk;Q4nHnW;9<8SBfbaNRgzxkMMVLbcdg=i!ai6PAE5}s3g7b8?Ojapa%b%I>L
z|E;@eL#rqJfTzYA2zY&f`DO5y&INzyd~iv(2pfo{M6E_VB-JHa3vC6CnC;j??2a6J
zOg+)AURs-SRg}}luiubq8Fdm;UZ$*(Rbql-uVA{;uwqyA+6D1dild%6=){z%QIj-%
z!YPm%e$qSPioQ5(r7l7Xqg}FDil&>b&=Mw46l&+eT5Q)+DG0Mg_Qi#zAr|G13fNF>
zy48^qyQAKWn9U$>BASUJZ!DdLizb&VA;$VT+Pk}YMdB&QWUMKOn`$}PL^aH>0}HRm
z9tiVp?0_S@8$!GW8qAK$aaO=0lAn^99GYM0Ua^<MKHiBp6D%i;^A-r1HE^1DFv~Bz
z15R5V+(Q(CkdNH68{Z3`n4R2^Y(n?byto0vW@qIYmNm<KG%KCS!mO<jwmP}5SX2<A
zRyW=up_<rLRY<6!gc?%Ifq52BQ8{uJqV`J&wG2U;2Ob7YYTd|ef>i&Yg!%<TRrZCV
z7XJ(CVX4*}LujD2LbJgFd7Gi+46{y?|0vO$*29=>1@{V@gb8MCD>>yAjMA?D0j||i
ArT_o{

diff --git a/src/compiler/NubLang.CLI/assets/x64.o b/src/compiler/NubLang.CLI/assets/x64.o
new file mode 100644
index 0000000000000000000000000000000000000000..f4f53cd0591139fe4fa14ee096425a972817a52a
GIT binary patch
literal 2344
zcmb_cPfyfP5TCad1d;uNCK!pjF-kaSs|GlUSrb$YMop9iPteM9S+m<EZI>)3ICzko
zM-LuMym<5@5HD~v@gUzozk?<^)6R6e&n6n<B(F2`d%yY9d9U5Rb?<gTDG*U`1A3mI
z0Pm0V>{@KrU<@j-u>18JxeL4d3;TQ5(JBp)PxLA-a_-z;f&!>L!X&pc{Kc3%1U7M$
z`d%C*MQmJXoGYLiO9Aat?8Uhh45wS;b5G_v1uUhU^>#};?Pep4v=iu!cIfyW?{d@i
z>rNOvb%Kr`HCh@XH>m3<gzoIL9l`}HFaT<Z>PVw;&6DwyA8JQcpgdktV<oFNQM_0@
z5x;S=D`8idTxQ*U^VwZpUG+c}2iK|}cg_He9Ks^kcar*l+cgffdh=2Bnms*ZOChe4
zr>y>$NhuZ#r*_t`U?l6NwgrQ!oi!|oCzgd`+k)b67|o}g(+_2kS@i|2ggB!JT5iK9
zT&^K$iuv&~k@K{Patv4IIAAhHd-xRlGB)9hKV$F(pJSZ*mop|v-kkDS1h9;<CR}<Z
zsKU6J=QQKQ&rbQQfy+d*?@Rny=1DB&NxuuUWwvHru*0oZ<a(&1Akph$1-j|lk?uxd
zuep&6wikwA`|U{Eb-!b81nmtSL|b6T#5L`8>MPBLuaTbGczi)0q2WJk3&HigKyUVK
zy8(Wp8p|XpDEhxh6|>O0%X}nhjg7u99I@;f6J-JyonsAGRzC2MPcc|RO|fz>1fOI)
zdq*hbF+Fm`tbYkPl=ENXuVU;`T-iH;E-cdnMecdx_4*h8E*fS}wD*z;4_J#bx%0S@
zH@^dJsLO#gKRP3GeoKf^PP5N1h>^(sPrP2Q(#Lb$5L-B;M;V;Tf@qsujaXj)H9nA6
z98dkzU)Ah?6EQO<h0HMcr~9`n@sgN=Q66%<lep>Apur2=$?N|U_b+p${*U95c)7o?
z5u;MVLo=3bu0JmTYlhQzCf~e!L_J{QA;*<b(>*oo(@f2~Pa$tPsr+vVBa!-vm;870
P;^Uzp>75W+oAJK@gWaBb

literal 0
HcmV?d00001

diff --git a/src/compiler/NubLang/Generation/QBE/QBEGenerator.cs b/src/compiler/NubLang/Generation/QBE/QBEGenerator.cs
index af0acbd..4734cdc 100644
--- a/src/compiler/NubLang/Generation/QBE/QBEGenerator.cs
+++ b/src/compiler/NubLang/Generation/QBE/QBEGenerator.cs
@@ -939,7 +939,7 @@ public class QBEGenerator
         {
             destination = TmpName();
             var size = SizeOf(structInitializer.StructType);
-            _writer.Indented($"{destination} =l alloc8 {size}");
+            _writer.Indented($"{destination} =l call $malloc(l {size})");
         }
 
         foreach (var field in structDef.Fields)
diff --git a/src/runtime/.gitignore b/src/runtime/.gitignore
index 4c66b30..378eac2 100644
--- a/src/runtime/.gitignore
+++ b/src/runtime/.gitignore
@@ -1,2 +1 @@
-bin
-bin-int
\ No newline at end of file
+build
diff --git a/src/runtime/makefile b/src/runtime/makefile
index d868586..ef774d8 100644
--- a/src/runtime/makefile
+++ b/src/runtime/makefile
@@ -3,14 +3,12 @@ TARGET ?= x64
 
 CFLAGS = -Wall -Werror -Wextra -g
 
-libruntime: bin-int/runtime.o
-	$(CC) $(CFLAGS) -c targets/$(TARGET).s -o bin-int/$(TARGET).o
-	mkdir -p bin
-	ar rcs bin/libruntime_$(TARGET).a bin-int/runtime.o bin-int/$(TARGET).o
+libruntime: build/runtime.o
+	$(CC) $(CFLAGS) -c targets/$(TARGET).s -o build/$(TARGET).o
 
-bin-int/runtime.o: runtime/runtime.c
-	mkdir -p bin-int
-	$(CC) $(CFLAGS) -c runtime/runtime.c -o bin-int/runtime.o
+build/runtime.o: runtime/runtime.c
+	mkdir -p build
+	$(CC) $(CFLAGS) -c runtime/runtime.c -o build/runtime.o
 
 clean:
-	rm -r bin bin-int
+	rm -r build