deadcade/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add host CPU memory barriers for DMB/DSB and ordered load/store (#3015)

Browse source 
* Add host CPU memory barriers for DMB/DSB and ordered load/store

* PPTC version bump

* Revert to old barrier order
This commit is contained in:
gdkchan 2022-01-21 12:47:34 -03:00 committed by GitHub
parent 7e967d796c
commit f0824fde9f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -358,6 +358,12 @@ namespace ARMeilleure.CodeGen.X86
WriteInstruction(dest, source, type, X86Instruction.Lea); WriteInstruction(dest, source, type, X86Instruction.Lea);
} }
public void LockOr(Operand dest, Operand source, OperandType type)
{
WriteByte(LockPrefix);
WriteInstruction(dest, source, type, X86Instruction.Or);
}
public void Mov(Operand dest, Operand source, OperandType type) public void Mov(Operand dest, Operand source, OperandType type)
{ {
WriteInstruction(dest, source, type, X86Instruction.Mov); WriteInstruction(dest, source, type, X86Instruction.Mov);

8
ARMeilleure/CodeGen/X86/CodeGenerator.cs
View file

@ -49,6 +49,7 @@ namespace ARMeilleure.CodeGen.X86
Add(Instruction.Load, GenerateLoad); Add(Instruction.Load, GenerateLoad);
Add(Instruction.Load16, GenerateLoad16); Add(Instruction.Load16, GenerateLoad16);
Add(Instruction.Load8, GenerateLoad8); Add(Instruction.Load8, GenerateLoad8);
Add(Instruction.MemoryBarrier, GenerateMemoryBarrier);
Add(Instruction.Multiply, GenerateMultiply); Add(Instruction.Multiply, GenerateMultiply);
Add(Instruction.Multiply64HighSI, GenerateMultiply64HighSI); Add(Instruction.Multiply64HighSI, GenerateMultiply64HighSI);
Add(Instruction.Multiply64HighUI, GenerateMultiply64HighUI); Add(Instruction.Multiply64HighUI, GenerateMultiply64HighUI);
@ -538,7 +539,7 @@ namespace ARMeilleure.CodeGen.X86
context.Assembler.Lea(dest, memOp, dest.Type); context.Assembler.Lea(dest, memOp, dest.Type);
} }
} }
else else
{ {
ValidateBinOp(dest, src1, src2); ValidateBinOp(dest, src1, src2);
@ -976,6 +977,11 @@ namespace ARMeilleure.CodeGen.X86
context.Assembler.Movzx8(value, address, value.Type); context.Assembler.Movzx8(value, address, value.Type);
} }
private static void GenerateMemoryBarrier(CodeGenContext context, Operation operation)
{
context.Assembler.LockOr(MemoryOp(OperandType.I64, Register(X86Register.Rsp)), Const(0), OperandType.I32);
}
private static void GenerateMultiply(CodeGenContext context, Operation operation) private static void GenerateMultiply(CodeGenContext context, Operation operation)
{ {
Operand dest = operation.Destination; Operand dest = operation.Destination;

4
ARMeilleure/Instructions/InstEmitMemoryEx.cs
View file

@ -167,9 +167,7 @@ namespace ARMeilleure.Instructions
private static void EmitBarrier(ArmEmitterContext context) private static void EmitBarrier(ArmEmitterContext context)
{ {
// Note: This barrier is most likely not necessary, and probably context.MemoryBarrier();
// doesn't make any difference since we need to do a ton of stuff
// (software MMU emulation) to read or write anything anyway.
} }
} }
} }

1
ARMeilleure/IntermediateRepresentation/Instruction.cs
View file

@ -26,6 +26,7 @@ namespace ARMeilleure.IntermediateRepresentation
Load16, Load16,
Load8, Load8,
LoadArgument, LoadArgument,
MemoryBarrier,
Multiply, Multiply,
Multiply64HighSI, Multiply64HighSI,
Multiply64HighUI, Multiply64HighUI,

5
ARMeilleure/Translation/EmitterContext.cs
View file

@ -325,6 +325,11 @@ namespace ARMeilleure.Translation
Add(Instruction.LoadFromContext); Add(Instruction.LoadFromContext);
} }
public void MemoryBarrier()
{
Add(Instruction.MemoryBarrier);
}
public Operand Multiply(Operand op1, Operand op2) public Operand Multiply(Operand op1, Operand op2)
{ {
return Add(Instruction.Multiply, Local(op1.Type), op1, op2); return Add(Instruction.Multiply, Local(op1.Type), op1, op2);

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

@ -27,7 +27,7 @@ namespace ARMeilleure.Translation.PTC
private const string OuterHeaderMagicString = "PTCohd\0\0"; private const string OuterHeaderMagicString = "PTCohd\0\0";
private const string InnerHeaderMagicString = "PTCihd\0\0"; private const string InnerHeaderMagicString = "PTCihd\0\0";
private const uint InternalVersion = 2953; //! To be incremented manually for each change to the ARMeilleure project. private const uint InternalVersion = 3015; //! To be incremented manually for each change to the ARMeilleure project.
private const string ActualDir = "0"; private const string ActualDir = "0";
private const string BackupDir = "1"; private const string BackupDir = "1";