ryujinx-backup/ChocolArm64
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Implement SvcGetThreadContext3

Browse source
This commit is contained in:
gdkchan 2018-06-26 01:09:32 -03:00
parent 31871077e2
commit a12f31867c
3 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Events/AInstExceptionEventArgs.cs
View file

@ -4,11 +4,13 @@ namespace ChocolArm64.Events
{ {
public class AInstExceptionEventArgs : EventArgs public class AInstExceptionEventArgs : EventArgs
{ {
public int Id { get; private set; } public long Position { get; private set; }
public int Id { get; private set; }
public AInstExceptionEventArgs(int Id) public AInstExceptionEventArgs(long Position, int Id)
{ {
this.Id = Id; this.Position = Position;
this.Id = Id;
} }
} }
} }

1
Instruction/AInstEmitException.cs
View file

@ -25,6 +25,7 @@ namespace ChocolArm64.Instruction
Context.EmitLdarg(ATranslatedSub.StateArgIdx); Context.EmitLdarg(ATranslatedSub.StateArgIdx);
Context.EmitLdc_I8(Op.Position);
Context.EmitLdc_I4(Op.Id); Context.EmitLdc_I4(Op.Id);
Context.EmitPrivateCall(typeof(AThreadState), MthdName); Context.EmitPrivateCall(typeof(AThreadState), MthdName);

19
State/AThreadState.cs
View file

@ -51,6 +51,17 @@ namespace ChocolArm64.State
public int Fpcr { get; set; } public int Fpcr { get; set; }
public int Fpsr { get; set; } public int Fpsr { get; set; }
public int Psr
{
get
{
return (Negative ? (int)APState.N : 0) |
(Zero ? (int)APState.Z : 0) |
(Carry ? (int)APState.C : 0) |
(Overflow ? (int)APState.V : 0);
}
}
public uint CtrEl0 => 0x8444c004; public uint CtrEl0 => 0x8444c004;
public uint DczidEl0 => 0x00000004; public uint DczidEl0 => 0x00000004;
@ -89,14 +100,14 @@ namespace ChocolArm64.State
TickCounter.Start(); TickCounter.Start();
} }
internal void OnBreak(int Imm) internal void OnBreak(long Position, int Imm)
{ {
Break?.Invoke(this, new AInstExceptionEventArgs(Imm)); Break?.Invoke(this, new AInstExceptionEventArgs(Position, Imm));
} }
internal void OnSvcCall(int Imm) internal void OnSvcCall(long Position, int Imm)
{ {
SvcCall?.Invoke(this, new AInstExceptionEventArgs(Imm)); SvcCall?.Invoke(this, new AInstExceptionEventArgs(Position, Imm));
} }
internal void OnUndefined(long Position, int RawOpCode) internal void OnUndefined(long Position, int RawOpCode)