bump

ancientproject · May 21, 2020 · 835fe6d · 835fe6d
1 parent 00415ea
commit 835fe6d
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 10 deletions.
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.496-beta</Version>
+    <Version>0.70.497-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.642.120</Version>
+    <Version>0.70.643.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.622.37</Version>
+    <Version>0.70.623.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.Hardware/Ancient.Runtime.Hardware.csproj b/libs/Ancient.Runtime.Hardware/Ancient.Runtime.Hardware.csproj
@@ -10,7 +10,7 @@
     <PackageIconUrl>https://raw.githubusercontent.com/ancientproject/cli/master/resource/icon.png</PackageIconUrl>
     <RepositoryUrl>https://github.com/0xF6/ancient_cpu</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
-    <Version>0.70.622.339</Version>
+    <Version>0.70.623.340</Version>
   </PropertyGroup>
   <PropertyGroup Condition="$(Configuration) == 'Debug'">
     <BumpRevision>true</BumpRevision>

diff --git a/test/vm_test/FunctionsTest.cs b/test/vm_test/FunctionsTest.cs
@@ -72,8 +72,7 @@ .sig test() -> void
                 new ldi(0x0, 0x5), 
                 new ret(),
                 new ldi(0x1, 0x6), 
-                new lpstr("test").Preload(out var hash), 
-                new call_i(hash), 
+                new call_i("test()"), 
                 //new __static_extern_call("sys->DumpStackTrace()"), 
             };
             load(mem);

diff --git a/vm/csharp/Program.cs b/vm/csharp/Program.cs
@@ -1,4 +1,4 @@
-namespace vm
+namespace vm
 {
     using System;
     using System.Collections.Generic;
@@ -39,7 +39,7 @@ public static void InitializeProcess()
         public static void InitializeFlags(Bus bus)
         {
             /* @0x11 */
-            bus.State.tc = AppFlag.GetVariable("VM_TRACE");
+            bus.State.tc = AppFlag.GetVariable("VM_TRACE", true);
             /* @0x12 */
             bus.State.ec = AppFlag.GetVariable("VM_ERROR", false);
             /* @0x13 */
@@ -61,7 +61,37 @@ public static void InitializeMemory(Bus bus, params string[] args)
             if (bus.State.halt != 0)
                 return;
             if (!args.Any())
-                bus.State.Load("<chip>", 0xB00B50000);
+            {
+                //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);
+            }
             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.704-beta</Version>
+    <Version>0.70.705-beta</Version>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Copyright>Yuuki Wesp (C) 2020</Copyright>
   </PropertyGroup>