From 1095e4823bf0468bad754bb67dc295a964c1582a Mon Sep 17 00:00:00 2001
From: folkert van heusden <mail@vanheusden.com>
Date: Thu, 24 Mar 2022 18:54:24 +0100
Subject: [PATCH] another ASH/ASHC fix

---
 cpu.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/cpu.cpp b/cpu.cpp
index 55cdfd1..5e65150 100644
--- a/cpu.cpp
+++ b/cpu.cpp
@@ -521,9 +521,9 @@ bool cpu::additional_double_operand_instructions(const uint16_t instr)
 				else {
 					// extend sign-bit
 					if (R & 0x8000)  // convert to unsigned 32b int & extend sign
-						R = (uint32_t(R) | 0xffff0000) >> (64 - shift - 1);
+						R = (uint32_t(R) | 0xffff0000) >> (64 - (shift - 1));
 					else
-						R >>= 64 - shift - 1;
+						R >>= 64 - (shift - 1);
 
 					setPSW_c(R & 1);
 					R >>= 1;
@@ -556,10 +556,9 @@ bool cpu::additional_double_operand_instructions(const uint16_t instr)
 				else {
 					// extend sign-bit
 					if (R0R1 & 0x80000000)  // convert to unsigned 64b int & extend sign
-						R0R1 = (uint64_t(R0R1) | 0xffffffff0000) >> (64 - shift - 1);
+						R0R1 = (uint64_t(R0R1) | 0xffffffff00000000ll) >> (64 - (shift - 1));
 					else
-						R0R1 >>= 64 - shift - 1;
-
+						R0R1 >>= 64 - (shift - 1);
 
 					setPSW_c(R0R1 & 1);