WIP

kekyo · Feb 12, 2024 · 5221b7f · 5221b7f
1 parent d2de95d
commit 5221b7f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 12 deletions.
diff --git a/chibias.core.Tests/Runner.cs b/chibias.core.Tests/Runner.cs
@@ -67,13 +67,11 @@ private string Run(
                         coreLibPath, tmp2Path,
                     }.
                     Concat(additionalReferencePaths ?? Array.Empty<string>()).
-                    Select(Path.GetFileName).
+                    Select(Path.GetFileNameWithoutExtension).
                     Distinct().
                     ToArray();
 
-                var assember = new Assembler(
-                    logger,
-                    referenceAssemblyBasePaths);
+                var assember = new Assembler(logger);
 
                 var outputAssemblyPath =
                     Path.Combine(basePath, "output.dll");

diff --git a/chibias.core/Assembler.cs b/chibias.core/Assembler.cs
@@ -52,12 +52,8 @@ public sealed class Assembler
     //private readonly DefaultAssemblyResolver assemblyResolver;
     //private readonly ReaderParameters readerParameters;
 
-    public Assembler(
-        ILogger logger,
-        params string[] referenceAssemblyBasePaths)
-    {
+    public Assembler(ILogger logger) =>
         this.logger = logger;
-    }
 
     private TypeDefinitionCache LoadPublicTypesFrom(
         string[] referenceAssemblyBasePaths,
@@ -71,7 +67,8 @@ private TypeDefinitionCache LoadPublicTypesFrom(
                 try
                 {
                     if (referenceAssemblyBasePaths.
-                        Select(basePath => Path.Combine(basePath, name)).
+                        SelectMany(basePath => new[] { $"{name}.dll", $"lib{name}.dll" }.
+                            Select(n => Path.Combine(basePath, n))).
                         Where(File.Exists).
                         FirstOrDefault() is not { } path)
                     {

diff --git a/chibias/Options.cs b/chibias/Options.cs
@@ -295,7 +295,6 @@ public static Options Parse(string[] args)
             ToArray();
         options.AssemblerOptions.ReferenceAssemblyNames = referenceAssemblyNames.
             Distinct().
-            Select(name => $"lib{name}.dll").
             ToArray();
 
         return options;

diff --git a/chibias/Properties/launchSettings.json b/chibias/Properties/launchSettings.json
@@ -2,7 +2,7 @@
   "profiles": {
     "chibias": {
       "commandName": "Project",
-      "commandLineArgs": "--log trace -f net6.0 -a /home/kouji/.dotnet/sdk/6.0.418/AppHostTemplate/apphost -r /home/kouji/.dotnet/shared/Microsoft.NETCore.App/6.0.26/System.Private.CoreLib.dll -r stage2/libc-bootstrap.dll -o stage2/chibicc stage2/./codegen.o stage2/./main.o stage2/./parse.o stage2/./strings.o stage2/./tokenize.o stage2/./type.o stage2/./utils.o",
+      "commandLineArgs": "--log trace -f net6.0 -a /home/kouji/.dotnet/sdk/6.0.418/AppHostTemplate/apphost -L/home/kouji/.dotnet/shared/Microsoft.NETCore.App/6.0.26 -lSystem.Private.CoreLib -L. -lc-bootstrap -o test/alignof test/alignof.o test/common.o",
       "workingDirectory": "/home/kouji/Projects/chibicc-cil"
     }
   }