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

Merge Fixes from Bob Supnik's updates

Browse source
This commit is contained in:
Mark Pizzolato 2013-08-22 16:46:57 -07:00
parent 938b75fc44
commit 6cc9d569bf
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
NOVA/eclipse_cpu.c
View file

@ -3625,7 +3625,7 @@ if ((IR & 0100017) == 0100010) { /* This pattern for all
PC = (PC + 1) & AMASK; PC = (PC + 1) & AMASK;
continue; continue;
} }
if ((IR & 0103777) == 0100650) { /* FDD Div double by AC */ if ((IR & 0103777) == 0100750) { /* FDD Div double by AC */
if (!(fpu_unit.flags & UNIT_UP)) if (!(fpu_unit.flags & UNIT_UP))
continue; continue;
if (Debug_Flags == 1) { if (Debug_Flags == 1) {
@ -3680,7 +3680,7 @@ if ((IR & 0100017) == 0100010) { /* This pattern for all
FPSR |= ((PC - 1) & AMASK); FPSR |= ((PC - 1) & AMASK);
continue; continue;
} }
if ((IR & 0103777) == 0101650) { /* FDMD Div double by memory */ if ((IR & 0103777) == 0101750) { /* FDMD Div double by memory */
if (!(fpu_unit.flags & UNIT_UP)) if (!(fpu_unit.flags & UNIT_UP))
continue; continue;
if (Debug_Flags == 1) { if (Debug_Flags == 1) {

8
swtp6800/common/m6800.c
View file

@ -88,10 +88,10 @@
/* Macros to handle the flags in the CCR */ /* Macros to handle the flags in the CCR */
#define CCR_ALWAYS_ON (0xC0) /* for 6800 */ #define CCR_ALWAYS_ON (0xC0) /* for 6800 */
#define CCR_MSK (HF|IF|NF|ZF|VF|CF) #define CCR_MSK (HF|IF|NF|ZF|VF|CF)
#define TOGGLE_FLAG(FLAG) ((CCR) ^= FLAG) #define TOGGLE_FLAG(FLAG) (CCR ^= (FLAG))
#define SET_FLAG(FLAG) ((CCR) |= FLAG) #define SET_FLAG(FLAG) (CCR |= (FLAG))
#define CLR_FLAG(FLAG) ((CCR) &= ~FLAG) #define CLR_FLAG(FLAG) (CCR &= ~(FLAG))
#define GET_FLAG(FLAG) ((CCR) & FLAG) #define GET_FLAG(FLAG) (CCR & (FLAG))
#define COND_SET_FLAG(COND,FLAG) \ #define COND_SET_FLAG(COND,FLAG) \
if (COND) SET_FLAG(FLAG); else CLR_FLAG(FLAG) if (COND) SET_FLAG(FLAG); else CLR_FLAG(FLAG)
#define COND_SET_FLAG_N(VAR) \ #define COND_SET_FLAG_N(VAR) \