fix compiling crash

ancientproject · May 22, 2020 · 5933541 · 5933541
1 parent 80b94b7
commit 5933541
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 9 deletions.
diff --git a/acc/Host.cs b/acc/Host.cs
@@ -153,7 +153,11 @@ public static (byte[] data, byte[] map) Compile(string source, Args args)
             {
                 void CompileToken(Instruction token)
                 {
-                    map.symbols.Add(((short)offset, source.Split('\n')[offset]));
+                    try
+                    {
+                        map.symbols.Add(((short)offset, source.Split('\n')[offset]));
+                    }
+                    catch{}
                     offset++;
                     gen.Emit(token);
                     var value = token.Assembly();

diff --git a/acc/acc.csproj b/acc/acc.csproj
@@ -5,7 +5,7 @@
     <TargetFramework>net5.0</TargetFramework>
     <PackageId>flame.compiler</PackageId>
     <RuntimeIdentifiers>win10-x64;osx.10.14-x64;linux-x64</RuntimeIdentifiers>
-    <Version>0.70.500-beta</Version>
+    <Version>0.70.504-beta</Version>
     <Authors>Yuuki Wesp</Authors>
     <Product>flame.compiler</Product>
     <Copyright>Yuuki Wesp (C) 2020</Copyright>

diff --git a/libs/Ancient.Compiler.Service/Ancient.Compiler.Service.csproj b/libs/Ancient.Compiler.Service/Ancient.Compiler.Service.csproj
@@ -13,7 +13,7 @@
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <Authors>Yuuki Wesp</Authors>
     <Company>Ancient Project</Company>
-    <Version>0.70.694.120</Version>
+    <Version>0.70.699.120</Version>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Sprache" Version="2.3.0" />

diff --git a/libs/Ancient.Runtime.Context/Ancient.Runtime.Context.csproj b/libs/Ancient.Runtime.Context/Ancient.Runtime.Context.csproj
@@ -4,7 +4,7 @@
   <PropertyGroup>
     <OutputType>Library</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <Version>0.70.672.37</Version>
+    <Version>0.70.673.37</Version>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageIconUrl>https://raw.githubusercontent.com/ancientproject/cli/master/resource/icon.png</PackageIconUrl>
     <PackageProjectUrl>https://github.com/0xF6/ancient_cpu</PackageProjectUrl>

diff --git a/libs/Ancient.Runtime.Context/DeviceLoader.cs b/libs/Ancient.Runtime.Context/DeviceLoader.cs
@@ -19,10 +19,11 @@ static DeviceLoader()
             if(AppFlag.GetVariable("VM_TRACE"))
                 OnTrace += Console.WriteLine;
 
-            //AssemblyLoadContext.Default.Resolving += (context, name) => {
-            //    var assemblyPath = $"./{name.Name}.dll";
-            //    return context.LoadFromAssemblyPath(assemblyPath);
-            //};
+            AssemblyLoadContext.Default.Resolving += (context, name) =>
+            {
+                var assemblyPath = $"./{name.Name}.dll";
+                return context.LoadFromAssemblyPath(assemblyPath);
+            };
         }
 
         public static void Boot(Action<IDevice> hook)

diff --git a/vm/csharp/vm.csproj b/vm/csharp/vm.csproj
@@ -11,7 +11,7 @@
       win10-arm64;
       win10-arm;
     </RuntimeIdentifiers>
-    <Version>0.70.753-beta</Version>
+    <Version>0.70.754-beta</Version>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Copyright>Yuuki Wesp (C) 2020</Copyright>
   </PropertyGroup>