dan/Cosmos
1
0
Fork 0
mirror of https://github.com/danbulant/Cosmos synced 2026-05-24 12:35:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed Stind_I1 and Stind_I2.

Browse source
This commit is contained in:
José Pedro 2017-02-19 01:55:02 +00:00
parent 6da5a0060a
commit e6dedfbba9
6 changed files with 40 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Tests/Cosmos.TestRunner.Core/Engine.Helpers.cs
View file

@ -249,6 +249,10 @@ namespace Cosmos.TestRunner.Core
} }
else else
{ {
File.Copy(@"..\..\source\IL2CPU\bin\Debug\netcoreapp1.0\IL2CPU.deps.json", @"bin\Debug\netcoreapp1.0\IL2CPU.deps.json", true);
File.Copy(@"..\..\source\IL2CPU\bin\Debug\netcoreapp1.0\IL2CPU.runtimeconfig.json", @"bin\Debug\netcoreapp1.0\IL2CPU.runtimeconfig.json", true);
File.Copy(@"..\..\source\IL2CPU\bin\Debug\netcoreapp1.0\IL2CPU.runtimeconfig.dev.json", @"bin\Debug\netcoreapp1.0\IL2CPU.runtimeconfig.dev.json", true);
xArguments.Insert(0, typeof(Program).GetTypeInfo().Assembly.Location); xArguments.Insert(0, typeof(Program).GetTypeInfo().Assembly.Location);
RunIL2CPUProcess("dotnet", RunIL2CPUProcess("dotnet",
mBaseWorkingDirectory, mBaseWorkingDirectory,

13
Tests/Cosmos.TestRunner.UnitTest/project.json
View file

@ -2,22 +2,21 @@
"version": "1.0.0-*", "version": "1.0.0-*",
"testRunner": "nunit", "testRunner": "nunit",
"dependencies": { "dependencies": {
"NETStandard.Library": "1.6.1", "Microsoft.DotNet.InternalAbstractions": "1.0.1-beta-003206",
"Microsoft.DotNet.InternalAbstractions": "1.0.500-preview2-1-003177",
"NUnit": "3.6.0", "NUnit": "3.6.0",
"dotnet-test-nunit": "3.4.0-beta-3" "dotnet-test-nunit": "3.4.0-beta-3"
}, },
"frameworks": { "frameworks": {
"netstandard1.6": { "netcoreapp1.0": {
"imports": "netcoreapp1.0",
"dependencies": { "dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.1.0"
},
"Cosmos.TestRunner.Core": { "Cosmos.TestRunner.Core": {
"target": "project" "target": "project"
} }
} }
} }
},
"runtimes": {
"win7-x64": {}
} }
} }

8
Tests/Cosmos.TestRunner/project.json
View file

@ -7,7 +7,10 @@
"debugType": "portable" "debugType": "portable"
}, },
"dependencies": { "dependencies": {
"Microsoft.NETCore.App": "1.1.0" "Microsoft.NETCore.App": {
"type": "platform",
"version": "1.1.0"
}
}, },
"frameworks": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {
@ -17,8 +20,5 @@
} }
} }
} }
},
"runtimes": {
"win7-x64": {}
} }
} }

8
source/Cosmos.Core.Plugs/System/StringImpl.cs
View file

@ -775,10 +775,10 @@ namespace Cosmos.Core.Plugs.System
return true; return true;
} }
public static string Remove(string aThis, int aStart, int aCount) //public static string Remove(string aThis, int aStart, int aCount)
{ //{
return aThis.Substring(0, aStart) + aThis.Substring(aStart + aCount, aThis.Length - (aStart + aCount)); // return aThis.Substring(0, aStart) + aThis.Substring(aStart + aCount, aThis.Length - (aStart + aCount));
} //}
public static string Replace(string aThis, string oldValue, string newValue) public static string Replace(string aThis, string oldValue, string newValue)
{ {

10
source/Cosmos.IL2CPU/IL/Stind_I1.cs
View file

@ -1,4 +1,5 @@
using System; using XSharp.Compiler;
using static XSharp.Compiler.XSRegisters;
namespace Cosmos.IL2CPU.X86.IL namespace Cosmos.IL2CPU.X86.IL
{ {
@ -12,7 +13,12 @@ namespace Cosmos.IL2CPU.X86.IL
public override void Execute(_MethodInfo aMethod, ILOpCode aOpCode ) public override void Execute(_MethodInfo aMethod, ILOpCode aOpCode )
{ {
Stind_I.Assemble(Assembler, 1, DebugEnabled); XS.Pop(EAX);
XS.Pop(EBX);
XS.Set(EBX, AL, destinationIsIndirect: true);
//Stind_I.Assemble(Assembler, 1, DebugEnabled);
} }

10
source/Cosmos.IL2CPU/IL/Stind_I2.cs
View file

@ -1,4 +1,5 @@
using System; using XSharp.Compiler;
using static XSharp.Compiler.XSRegisters;
namespace Cosmos.IL2CPU.X86.IL namespace Cosmos.IL2CPU.X86.IL
{ {
@ -12,7 +13,12 @@ namespace Cosmos.IL2CPU.X86.IL
public override void Execute(_MethodInfo aMethod, ILOpCode aOpCode ) public override void Execute(_MethodInfo aMethod, ILOpCode aOpCode )
{ {
Stind_I.Assemble(Assembler, 2, DebugEnabled); XS.Pop(EAX);
XS.Pop(EBX);
XS.Set(EBX, AX, destinationIsIndirect: true);
//Stind_I.Assemble(Assembler, 2, DebugEnabled);
} }