From abfd55e6825529a4968cdfba5b3bc7562377cbe6 Mon Sep 17 00:00:00 2001 From: folkert van heusden Date: Sat, 2 Sep 2023 10:10:14 +0200 Subject: [PATCH] shift fix / setmo+setmoc --- XT.cs | 40 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 36 insertions(+), 4 deletions(-) diff --git a/XT.cs b/XT.cs index 608ce92..1ed8b0d 100644 --- a/XT.cs +++ b/XT.cs @@ -3573,10 +3573,6 @@ public bool Tick() //bool count_1_of = opcode is (0xd0 or 0xd1); bool count_1_of = count == 1; - count &= 31; // masked to 5 bits - // only since 286? - // count %= (word ? 17 : 9); // from documentation ( https://www.felixcloutier.com/x86/rcl:rcr:rol:ror ) - bool oldSign = (word ? v1 & 0x8000 : v1 & 0x80) != 0; bool set_flags = false; @@ -3745,6 +3741,42 @@ public bool Tick() Log.DoLog($"{prefixStr} SHR {vName},{countName}"); #endif } + else if (mode == 6) + { + if (opcode >= 0xd2) + { + if (_cl != 0) + { + SetFlagC(false); + SetFlagA(false); + SetFlagZ(false); + SetFlagO(false); + SetFlagP(0xff); + SetFlagS(true); + + v1 = (ushort)(word ? 0xffff : 0xff); + } + +#if DEBUG + Log.DoLog($"{prefixStr} SETMOC"); +#endif + } + else + { + SetFlagC(false); + SetFlagA(false); + SetFlagZ(false); + SetFlagO(false); + SetFlagP(0xff); + SetFlagS(true); + + v1 = (ushort)(word ? 0xffff : 0xff); + +#if DEBUG + Log.DoLog($"{prefixStr} SETMO"); +#endif + } + } else if (mode == 7) { // SAR