From 4d9a788f7f524ea054ce9163890186ac241ed33d Mon Sep 17 00:00:00 2001 From: DavidBuchanan314 Date: Sat, 7 Jan 2017 21:25:34 +0000 Subject: [PATCH] Make status bits bools --- 6502.h | 17 +++++++++-------- 6850.h | 18 ++++++++++-------- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/6502.h b/6502.h index 524a20a..37041e2 100644 --- a/6502.h +++ b/6502.h @@ -1,4 +1,5 @@ #include +#include #define CPU_FREQ 4000000 #define STEP_DURATION 10000000 // 10ms @@ -20,14 +21,14 @@ void * read_addr; void * write_addr; struct StatusBits{ - unsigned char carry:1; // bit 0 - unsigned char zero:1; - unsigned char interrupt:1; - unsigned char decimal:1; - unsigned char brk:1; // "break" is a reserved word :( - unsigned char unused:1; - unsigned char overflow:1; - unsigned char sign:1; // bit 7 + bool carry:1; // bit 0 + bool zero:1; + bool interrupt:1; + bool decimal:1; + bool brk:1; // "break" is a reserved word :( + bool unused:1; + bool overflow:1; + bool sign:1; // bit 7 }; union StatusReg { // this means we can access the status register as a byte, or as individual bits. diff --git a/6850.h b/6850.h index 9a699fc..44f26c5 100644 --- a/6850.h +++ b/6850.h @@ -1,15 +1,17 @@ +#include + #define CTRL_ADDR 0xA000 #define DATA_ADDR 0xA001 struct UartStatusBits{ - unsigned char RDRF:1; // bit 0 - unsigned char TDRE:1; - unsigned char DCD:1; - unsigned char CTS:1; - unsigned char FE:1; - unsigned char OVRN:1; - unsigned char PE:1; - unsigned char IRQ:1; // bit 7 + bool RDRF:1; // bit 0 + bool TDRE:1; + bool DCD:1; + bool CTS:1; + bool FE:1; + bool OVRN:1; + bool PE:1; + bool IRQ:1; // bit 7 }; union UartStatusReg {