ports/emulators/simh/files/patch-swtp6800_common_m6800.c
Matthew Seaman 7c084f620e Fixes to allow building on 12-CURRENT
- fix build failures in i386 and amd64 due to compiler changes
- fix numerous compilation warnings and logical errors that may trap
  in the future
- convert all distribution files from DOS format to ease future changes
- convert legacy patch file to new naming convention

PR:		214990
Submitted by:	bob@eager.cx (maintainer)
2017-01-03 14:00:47 +00:00

37 lines
1.2 KiB
C

--- swtp6800/common/m6800.c.orig 2016-12-01 22:43:43 UTC
+++ swtp6800/common/m6800.c
@@ -316,7 +316,7 @@ int32 sim_instr (void)
while (reason == 0) { /* loop until halted */
// dump_regs1();
if (sim_interval <= 0) /* check clock queue */
- if (reason = sim_process_event ())
+ if ((reason = sim_process_event ()))
break;
if (mem_fault) { /* memory fault? */
mem_fault = 0; /* reset fault flag */
@@ -1890,18 +1890,20 @@ int32 get_flag(int32 flg)
void condevalVa(int32 op1, int32 op2)
{
- if (get_flag(CF))
+ if (get_flag(CF)) {
COND_SET_FLAG_V(((op1 & 0x80) && (op2 & 0x80)) || (
- (op1 & 0x80 == 0) && (op2 & 0x80 == 0)));
+ ((op1 & 0x80) == 0) && ((op2 & 0x80) == 0)));
+ }
}
/* test and set V for subtraction */
void condevalVs(int32 op1, int32 op2)
{
- if (get_flag(CF))
- COND_SET_FLAG_V(((op1 & 0x80) && (op2 & 0x80 == 0)) ||
- ((op1 & 0x80 == 0) && (op2 & 0x80)));
+ if (get_flag(CF)) {
+ COND_SET_FLAG_V(((op1 & 0x80) && ((op2 & 0x80) == 0)) ||
+ ((((op1 & 0x80) == 0)) && (op2 & 0x80)));
+ }
}
/* calls from the simulator */