folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SAGE: Fix flag setting with 33bit mask

Browse source
This commit is contained in:
Holger Veit 2017-03-28 13:32:22 -07:00 • committed by Mark Pizzolato
parent d98564544e
commit 3e54264253
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
SAGE/m68k_cpu.c
View file

@ -64,7 +64,7 @@
#define BIT15 0x8000 #define BIT15 0x8000
#define BIT16 0x10000 #define BIT16 0x10000
#define BIT31 0x80000000 #define BIT31 0x80000000
#define BIT32 0x100000000L #define BIT32 0x100000000LL
#define MASK_0(x) ((x) & 1) #define MASK_0(x) ((x) & 1)
#define MASK_8U(x) ((x) & 0xffffff00) #define MASK_8U(x) ((x) & 0xffffff00)
@ -78,7 +78,7 @@
#define MASK_32U(x) (0) #define MASK_32U(x) (0)
#define MASK_32L(x) ((x) & 0xffffffff) #define MASK_32L(x) ((x) & 0xffffffff)
#define MASK_32SGN(x) ((x) & BIT31) #define MASK_32SGN(x) ((x) & BIT31)
#define MASK_33(x) ((x) & BIT32) #define MASK_33(x64) ((x64) & BIT32)
#define COMBINE8(tgt,src) (MASK_8U(tgt) | MASK_8L(src)) #define COMBINE8(tgt,src) (MASK_8U(tgt) | MASK_8L(src))
#define COMBINE16(tgt,src) (MASK_16U(tgt) | MASK_16L(src)) #define COMBINE16(tgt,src) (MASK_16U(tgt) | MASK_16L(src))
@ -3052,7 +3052,7 @@ do_roxr32: reg = DR+IR_REGY;
if (CCR_X) resx |= BIT32; if (CCR_X) resx |= BIT32;
resx = (resx>>cnt) | (resx<<(33-cnt)); resx = (resx>>cnt) | (resx<<(33-cnt));
*reg = MASK_32L(resx); *reg = MASK_32L(resx);
SETF(MASK_33(res),FLAG_X|FLAG_C); SETF(MASK_33(resx),FLAG_X|FLAG_C);
} else SETF(CCR_X,FLAG_C); } else SETF(CCR_X,FLAG_C);
SETNZ32(resx); SETNZ32(resx);
CLRF(FLAG_V); CLRF(FLAG_V);