N-archive/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix PPTC on Windows 7. (#1369)

Browse source 
* Fix PPTC on Windows 7.

* Address gdkchan comment.
This commit is contained in:
LDj3SNuD 2020-07-09 02:45:24 +02:00 committed by GitHub
parent 484eb645ae
commit c050994995
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ARMeilleure/CodeGen/Optimizations/ConstantFolding.cs
View file

@ -218,7 +218,7 @@ namespace ARMeilleure.CodeGen.Optimizations
{
Operand srcOp = operation.GetSource(index);
if (srcOp.Kind != OperandKind.Constant || srcOp.DisableCF)
if (srcOp.Kind != OperandKind.Constant || srcOp.Relocatable)
{
return false;
}

2
ARMeilleure/CodeGen/X86/Assembler.cs
View file

@ -914,7 +914,7 @@ namespace ARMeilleure.CodeGen.X86
WriteByte((byte)imm);
}
else if (IsImm32(imm, type) && info.OpRMImm32 != BadOp)
else if (!source.Relocatable && IsImm32(imm, type) && info.OpRMImm32 != BadOp)
{
WriteOpCode(dest, null, null, type, info.Flags, info.OpRMImm32);

4
ARMeilleure/CodeGen/X86/X86Optimizer.cs
View file

@ -31,7 +31,7 @@ namespace ARMeilleure.CodeGen.X86
Operand src1 = operation.GetSource(0);
Operand src2 = operation.GetSource(1);
if (src1.Kind == OperandKind.Constant && CodeGenCommon.IsLongConst(src1))
if (src1.Kind == OperandKind.Constant && (src1.Relocatable || CodeGenCommon.IsLongConst(src1)))
{
Operand temp = Local(src1.Type);
@ -42,7 +42,7 @@ namespace ARMeilleure.CodeGen.X86
operation.SetSource(0, temp);
}
if (src2.Kind == OperandKind.Constant && CodeGenCommon.IsLongConst(src2))
if (src2.Kind == OperandKind.Constant && (src2.Relocatable || CodeGenCommon.IsLongConst(src2)))
{
Operand temp = Local(src2.Type);

15
ARMeilleure/IntermediateRepresentation/Operand.cs
View file

@ -10,7 +10,7 @@ namespace ARMeilleure.IntermediateRepresentation
public ulong Value { get; private set; }
public bool DisableCF { get; private set; }
public bool Relocatable { get; private set; }
public int? PtcIndex { get; private set; }
public List<Node> Assignments { get; }
@ -28,14 +28,19 @@ namespace ARMeilleure.IntermediateRepresentation
Type = type;
}
public Operand With(OperandKind kind, OperandType type = OperandType.None, ulong value = 0, bool disableCF = false, int? index = null)
public Operand With(
OperandKind kind,
OperandType type = OperandType.None,
ulong value = 0,
bool relocatable = false,
int? index = null)
{
Kind = kind;
Type = type;
Value = value;
DisableCF = disableCF;
Relocatable = relocatable;
PtcIndex = index;
Assignments.Clear();
@ -54,9 +59,9 @@ namespace ARMeilleure.IntermediateRepresentation
return With(OperandKind.Constant, OperandType.I32, value);
}
public Operand With(long value, bool disableCF = false, int? index = null)
public Operand With(long value, bool relocatable = false, int? index = null)
{
return With(OperandKind.Constant, OperandType.I64, (ulong)value, disableCF, index);
return With(OperandKind.Constant, OperandType.I64, (ulong)value, relocatable, index);
}
public Operand With(ulong value)

4
ARMeilleure/IntermediateRepresentation/OperandHelper.cs
View file

@ -34,9 +34,9 @@ namespace ARMeilleure.IntermediateRepresentation
return Operand().With(value);
}
public static Operand Const(long value, bool disableCF = false, int? index = null)
public static Operand Const(long value, bool relocatable = false, int? index = null)
{
return Operand().With(value, disableCF, index);
return Operand().With(value, relocatable, index);
}
public static Operand Const(ulong value)

2
ARMeilleure/Translation/PTC/Ptc.cs
View file

@ -20,7 +20,7 @@ namespace ARMeilleure.Translation.PTC
{
private const string HeaderMagic = "PTChd";
private const int InternalVersion = 2; //! To be incremented manually for each change to the ARMeilleure project.
private const int InternalVersion = 3; //! To be incremented manually for each change to the ARMeilleure project.
private const string BaseDir = "Ryujinx";