final fixes for module system

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

Hide file tree

Showing 5 changed files with 6 additions and 36 deletions.
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.699.120</Version>
+    <Version>0.70.701.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.673.37</Version>
+    <Version>0.70.675.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/submodules/runtime b/submodules/runtime
diff --git a/vm/csharp/Program.cs b/vm/csharp/Program.cs
@@ -39,7 +39,7 @@ public static void InitializeProcess()
         public static void InitializeFlags(Bus bus)
         {
             /* @0x11 */
-            bus.State.tc = AppFlag.GetVariable("VM_TRACE", true);
+            bus.State.tc = AppFlag.GetVariable("VM_TRACE", false);
             /* @0x12 */
             bus.State.ec = AppFlag.GetVariable("VM_ERROR", false);
             /* @0x13 */
@@ -61,37 +61,7 @@ public static void InitializeMemory(Bus bus, params string[] args)
             if (bus.State.halt != 0)
                 return;
             if (!args.Any())
-            {
-                //var ev = new SignatureEvolve(new List<string> {"u32", "f32"}, "FuckingXuy");
-
-                //(ev as IEvolveEvent).OnBuild();
-
-                //bus.State.Load("<exec>", ev
-                //    .GetInstructions().Select(x =>(ulong)x).ToArray());
-                var mem = new Instruction[]
-                {
-                    new ldx(0x11, 0x1), 
-                    new sig("test1", 0, "void"), new lpstr("test1"),
-                    new ldi(0x0, 0x5), 
-                    new __static_extern_call("sys->DumpCallStack()"), 
-                    new ret(),
-                    new nop(),
-                    new sig("test2", 0, "void"), new lpstr("test2"),
-                    new ldi(0x1, 0x6), 
-                    new call_i("test1()"), 
-                    new ret(),
-                    new nop(),
-                    new sig("test3", 0, "void"), new lpstr("test3"),
-                    new call_i("test2()"), 
-                    new mul(0x3, 0x0, 0x1), 
-                    new ret(),
-                    new nop(),
-                    new call_i("test3()")
-                };
-                bus.State.Load("<exec>", mem.Select(x => (ulong)x).ToArray());
-                bus.State.LoadMeta(mem.SelectMany(x => x.GetMetaDataILBytes()).ToArray());
-                //bus.State.Load("<chip>", 0xB00B50000);
-            }
+                bus.State.Load("<chip>", 0xB00B50000);
             else
             {
                 var nameFile = Path.Combine(Path.GetDirectoryName(args.First()), Path.GetFileNameWithoutExtension(args.First()));

diff --git a/vm/csharp/vm.csproj b/vm/csharp/vm.csproj
@@ -11,7 +11,7 @@
       win10-arm64;
       win10-arm;
     </RuntimeIdentifiers>
-    <Version>0.70.754-beta</Version>
+    <Version>0.70.756-beta</Version>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Copyright>Yuuki Wesp (C) 2020</Copyright>
   </PropertyGroup>
+1 −1		src/Ancient.Runtime.csproj
+4 −1		src/emit/sys/Module.cs