dan/Cosmos
1
0
Fork 0
mirror of https://github.com/danbulant/Cosmos synced 2026-06-11 10:41:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix newobj for char[]

Browse source
This commit is contained in:
Charles Betros 2016-08-10 19:27:52 -05:00
parent 98528fabc2
commit 00ae14ab24
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
source/Cosmos.IL2CPU/IL/Newobj.cs
View file

@ -9,6 +9,7 @@ using Cosmos.IL2CPU.Plugs.System;
using XSharp.Compiler;
using static XSharp.Compiler.XSRegisters;
using SysReflection = System.Reflection;
using ObjectInfo = Cosmos.IL2CPU.Plugs.System.ObjectImpl;
namespace Cosmos.IL2CPU.X86.IL
{
@ -128,15 +129,15 @@ namespace Cosmos.IL2CPU.X86.IL
// try calculating size:
if (constructor.DeclaringType == typeof(string))
{
if (xParams.Length == 1
&& xParams[0].ParameterType == typeof(char[]))
if (xParams.Length == 1 && xParams[0].ParameterType == typeof(char[]))
{
xHasCalcSize = true;
XS.Set(EAX, ESP, sourceIsIndirect: true);
// EAX contains a memory handle now, lets dereference it to a pointer
XS.Set(EAX, EAX, sourceIsIndirect: true);
XS.Set(XSRegisters.EAX, XSRegisters.EAX, sourceDisplacement: 8);
XS.Exchange(XSRegisters.BX, XSRegisters.BX);
XS.Set(EAX, ESP, sourceDisplacement: 4);
XS.Push(XSRegisters.EAX);
new CPUx86.Add { DestinationReg = CPUx86.RegistersEnum.ESP, DestinationIsIndirect = true, SourceValue = ObjectInfo.FieldDataOffset, Size = 32 }; // pointer is at the element size
XS.Pop(XSRegisters.EAX);
XS.Set(XSRegisters.EAX, XSRegisters.EAX, sourceIsIndirect: true); // element size
XS.Set(XSRegisters.EDX, 2);
XS.Multiply(XSRegisters.EDX);
XS.Push(XSRegisters.EAX);