From 835fe6d05a9de1e1454cab7665ea2a486afb009a Mon Sep 17 00:00:00 2001 From: Yuuki Wesp Date: Thu, 21 May 2020 21:04:39 +0300 Subject: [PATCH] bump --- acc/acc.csproj | 2 +- .../Ancient.Compiler.Service.csproj | 2 +- .../Ancient.Runtime.Context.csproj | 2 +- .../Ancient.Runtime.Hardware.csproj | 2 +- test/vm_test/FunctionsTest.cs | 3 +- vm/csharp/Program.cs | 36 +++++++++++++++++-- vm/csharp/vm.csproj | 2 +- 7 files changed, 39 insertions(+), 10 deletions(-) diff --git a/acc/acc.csproj b/acc/acc.csproj index 3980dfb..200046e 100644 --- a/acc/acc.csproj +++ b/acc/acc.csproj @@ -5,7 +5,7 @@ net5.0 flame.compiler win10-x64;osx.10.14-x64;linux-x64 - 0.70.496-beta + 0.70.497-beta Yuuki Wesp flame.compiler Yuuki Wesp (C) 2020 diff --git a/libs/Ancient.Compiler.Service/Ancient.Compiler.Service.csproj b/libs/Ancient.Compiler.Service/Ancient.Compiler.Service.csproj index a28c438..0ea705f 100644 --- a/libs/Ancient.Compiler.Service/Ancient.Compiler.Service.csproj +++ b/libs/Ancient.Compiler.Service/Ancient.Compiler.Service.csproj @@ -13,7 +13,7 @@ MIT Yuuki Wesp Ancient Project - 0.70.642.120 + 0.70.643.120 diff --git a/libs/Ancient.Runtime.Context/Ancient.Runtime.Context.csproj b/libs/Ancient.Runtime.Context/Ancient.Runtime.Context.csproj index b12bb2a..8b4ce1e 100644 --- a/libs/Ancient.Runtime.Context/Ancient.Runtime.Context.csproj +++ b/libs/Ancient.Runtime.Context/Ancient.Runtime.Context.csproj @@ -4,7 +4,7 @@ Library netcoreapp3.1 - 0.70.622.37 + 0.70.623.37 true https://raw.githubusercontent.com/ancientproject/cli/master/resource/icon.png https://github.com/0xF6/ancient_cpu diff --git a/libs/Ancient.Runtime.Hardware/Ancient.Runtime.Hardware.csproj b/libs/Ancient.Runtime.Hardware/Ancient.Runtime.Hardware.csproj index 80ed715..201e456 100644 --- a/libs/Ancient.Runtime.Hardware/Ancient.Runtime.Hardware.csproj +++ b/libs/Ancient.Runtime.Hardware/Ancient.Runtime.Hardware.csproj @@ -10,7 +10,7 @@ https://raw.githubusercontent.com/ancientproject/cli/master/resource/icon.png https://github.com/0xF6/ancient_cpu git - 0.70.622.339 + 0.70.623.340 true diff --git a/test/vm_test/FunctionsTest.cs b/test/vm_test/FunctionsTest.cs index d91d285..8273eea 100644 --- 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 index 25cab71..4b66c41 100644 --- 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("", 0xB00B50000); + { + //var ev = new SignatureEvolve(new List {"u32", "f32"}, "FuckingXuy"); + + //(ev as IEvolveEvent).OnBuild(); + + //bus.State.Load("", 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("", mem.Select(x => (ulong)x).ToArray()); + bus.State.LoadMeta(mem.SelectMany(x => x.GetMetaDataILBytes()).ToArray()); + //bus.State.Load("", 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 index 740a6bb..4789e6e 100644 --- a/vm/csharp/vm.csproj +++ b/vm/csharp/vm.csproj @@ -11,7 +11,7 @@ win10-arm64; win10-arm; - 0.70.704-beta + 0.70.705-beta true Yuuki Wesp (C) 2020