From e18c1fbfb9394e41507baea04e02b3209a9308c5 Mon Sep 17 00:00:00 2001 From: Stephen Crane Date: Sun, 3 Mar 2019 14:38:11 +0000 Subject: [PATCH] irq is uint8_t --- CPU.h | 2 +- i8080.cpp | 2 +- i8080.h | 4 ++-- r6502.cpp | 2 +- r6502.h | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CPU.h b/CPU.h index 9218f90..83e8f3b 100644 --- a/CPU.h +++ b/CPU.h @@ -12,7 +12,7 @@ class CPU: public Checkpointable { public: virtual void run(unsigned instructions) =0; virtual void reset() =0; - virtual void raise(int level) =0; + virtual void raise(uint8_t level) =0; virtual char *status(char *buf, size_t n, bool hdr) =0; virtual void checkpoint(Stream &s) = 0; diff --git a/i8080.cpp b/i8080.cpp index ceef41e..733e740 100644 --- a/i8080.cpp +++ b/i8080.cpp @@ -24,7 +24,7 @@ void i8080::reset() { _halted = false; } -void i8080::raise(int level) { +void i8080::raise(uint8_t level) { if (flags.I) { flags.I = 0; _irq_pending = 0; diff --git a/i8080.h b/i8080.h index b8ec31f..b2fdbf3 100644 --- a/i8080.h +++ b/i8080.h @@ -13,7 +13,7 @@ public: void run(unsigned); void reset(); - void raise(int); + void raise(uint8_t); char *status(char *buf, size_t n, bool hdr=false); void checkpoint(Stream &); @@ -59,7 +59,7 @@ private: } flags; uint8_t SR; }; - int _irq_pending; + uint8_t _irq_pending; PortDevice *_ports; void _op(uint8_t op); diff --git a/r6502.cpp b/r6502.cpp index e62dd6b..0baae81 100644 --- a/r6502.cpp +++ b/r6502.cpp @@ -76,7 +76,7 @@ void r6502::restore(Stream &s) #endif } -void r6502::raise(int level) { +void r6502::raise(uint8_t level) { if (level < 0) nmi(); else if (!P.bits.I) diff --git a/r6502.h b/r6502.h index 8d335cf..60e103b 100644 --- a/r6502.h +++ b/r6502.h @@ -8,7 +8,7 @@ class Stream; class r6502: public CPU { public: - void raise(int); + void raise(uint8_t); void reset(); void run(unsigned); char *status(char *buf, size_t n, bool hdr=false);