refactoring and bump version

ancientproject · May 22, 2020 · d778a6e · d778a6e
1 parent 326422d
commit d778a6e
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 16 deletions.
diff --git a/VirtualMachine.sln b/VirtualMachine.sln
@@ -23,8 +23,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libs", "libs", "{3E153A17-E
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ancient.Runtime.Context", "libs\Ancient.Runtime.Context\Ancient.Runtime.Context.csproj", "{00506E30-C4CB-4734-BA64-920CEE5CE926}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ancient.Runtime.Hardware", "libs\Ancient.Runtime.Hardware\Ancient.Runtime.Hardware.csproj", "{512BCC36-966F-4761-900F-BFB608582282}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "submodules", "submodules", "{B29BF648-1A51-4597-BE5E-E96D2C9EDD34}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ancient.Runtime", "submodules\runtime\src\Ancient.Runtime.csproj", "{267CF9D7-0E11-45D6-82E0-72B0B2B66673}"
@@ -63,10 +61,6 @@ Global
 		{00506E30-C4CB-4734-BA64-920CEE5CE926}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{00506E30-C4CB-4734-BA64-920CEE5CE926}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{00506E30-C4CB-4734-BA64-920CEE5CE926}.Release|Any CPU.Build.0 = Release|Any CPU
-		{512BCC36-966F-4761-900F-BFB608582282}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{512BCC36-966F-4761-900F-BFB608582282}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{512BCC36-966F-4761-900F-BFB608582282}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{512BCC36-966F-4761-900F-BFB608582282}.Release|Any CPU.Build.0 = Release|Any CPU
 		{267CF9D7-0E11-45D6-82E0-72B0B2B66673}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{267CF9D7-0E11-45D6-82E0-72B0B2B66673}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{267CF9D7-0E11-45D6-82E0-72B0B2B66673}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -83,7 +77,6 @@ Global
 		{A1538F63-D4D4-45E8-8A97-8EA7E6073EB8} = {24CBAF1C-EBD3-47DB-89BC-AD7F407DE760}
 		{E2D48827-C38C-4689-B0A1-9FD395904FB3} = {3E153A17-EBC1-4471-BD65-0C306499D3F2}
 		{00506E30-C4CB-4734-BA64-920CEE5CE926} = {3E153A17-EBC1-4471-BD65-0C306499D3F2}
-		{512BCC36-966F-4761-900F-BFB608582282} = {3E153A17-EBC1-4471-BD65-0C306499D3F2}
 		{267CF9D7-0E11-45D6-82E0-72B0B2B66673} = {B29BF648-1A51-4597-BE5E-E96D2C9EDD34}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution

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.646.120</Version>
+    <Version>0.70.668.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.624.37</Version>
+    <Version>0.70.646.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>
@@ -17,14 +17,16 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Ancient.ProjectSystem" Version="0.60.358.20" />
-    <ProjectReference Include="..\Ancient.Runtime.Hardware\Ancient.Runtime.Hardware.csproj" />
   </ItemGroup>
   <ItemGroup Condition="$(Configuration) == 'Debug'">
     <PackageReference Include="Ivy.Versioning" Version="3.1.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\submodules\runtime\src\Ancient.Runtime.csproj" />
+  </ItemGroup>
   <PropertyGroup Condition="$(Configuration) == 'Debug'">
     <BumpPatch>true</BumpPatch>
   </PropertyGroup>

diff --git a/vm/csharp/component/State.eval.cs b/vm/csharp/component/State.eval.cs
@@ -23,7 +23,7 @@ public void Eval()
             MemoryManagement.FastWrite = fw;
             if (bf)
             {
-                bus.debugger.handleBreak(u16 & pc, bus.cpu);
+                bus.debugger.handleBreak(u16 & pc, this);
                 mem[0x17] = 0x0;
             }
 
@@ -265,7 +265,7 @@ public void Eval()
                         u8 & r3, u8 & u1
                     );
                     trace($"call :: static_call 0x{sign.Value:X}");
-                    var find = Module.Global.Find(sign, out var @extern);
+                    var find = Module.Context.Find(sign, out var @extern);
                     if (find != ExternStatus.Found)
                     {
                         bus.cpu.halt(0xA16 + (int)find, $"0x{sign.Value:X}");
@@ -416,7 +416,7 @@ string toString(ushort memAddr)
 
                 case 0xC1 when x2 == 0x1: /* @break :: now */
                     trace($"[0x{iid:X}] @break :: now");
-                    bus.debugger.handleBreak(u16 & pc, bus.cpu);
+                    bus.debugger.handleBreak(u16 & pc, this);
                     mem[0x17] = 0x0;
                     break;
 
@@ -552,7 +552,7 @@ string toString(ushort memAddr)
             if (mem[0x17] == 0x3) mem[0x17] = 0x2;
             if (mem[0x17] == 0x2)
             {
-                bus.debugger.handleBreak(u16 & pc, bus.cpu);
+                bus.debugger.handleBreak(u16 & pc, this);
                 mem[0x17] = 0x0;
             }
             /* @break :: end */

diff --git a/vm/csharp/vm.csproj b/vm/csharp/vm.csproj
@@ -11,7 +11,7 @@
       win10-arm64;
       win10-arm;
     </RuntimeIdentifiers>
-    <Version>0.70.706-beta</Version>
+    <Version>0.70.727-beta</Version>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Copyright>Yuuki Wesp (C) 2020</Copyright>
   </PropertyGroup>
@@ -33,7 +33,6 @@
   <ItemGroup>
     <ProjectReference Include="..\..\libs\Ancient.Compiler.Service\Ancient.Compiler.Service.csproj" />
     <ProjectReference Include="..\..\libs\Ancient.Runtime.Context\Ancient.Runtime.Context.csproj" />
-    <ProjectReference Include="..\..\libs\Ancient.Runtime.Hardware\Ancient.Runtime.Hardware.csproj" />
     <ProjectReference Include="..\..\submodules\runtime\src\Ancient.Runtime.csproj" />
   </ItemGroup>