Merge pull request #1916 from TomHarte/LessGet
Switch wholesale from `get_xxx_line` to just `xxx`.
This commit is contained in:
15 files changed
+28
-28
No files matched your search
@@ -63,10 +63,10 @@ public:
|
||||
};
|
||||
|
||||
/// @returns The current value of the IRQ line output.
|
||||
inline bool get_interrupt_request_line() const { return status_.interrupt_request; }
|
||||
inline bool interrupt_request() const { return status_.interrupt_request; }
|
||||
|
||||
/// @returns The current value of the DRQ line output.
|
||||
inline bool get_data_request_line() const { return status_.data_request; }
|
||||
inline bool data_request() const { return status_.data_request; }
|
||||
|
||||
struct Delegate {
|
||||
virtual void wd1770_did_change_output(WD1770 &) = 0;
|
||||
|
||||
@@ -491,8 +491,8 @@ struct InputOutputController: public ClockingHint::Observer {
|
||||
};
|
||||
|
||||
set(irq_b_, IRQB::SoundBufferPointerUsed, sound_.interrupt());
|
||||
set(fiq_, FIQ::FloppyDiscInterrupt, floppy_.get_interrupt_request_line());
|
||||
set(fiq_, FIQ::FloppyDiscData, floppy_.get_data_request_line());
|
||||
set(fiq_, FIQ::FloppyDiscInterrupt, floppy_.interrupt_request());
|
||||
set(fiq_, FIQ::FloppyDiscData, floppy_.data_request());
|
||||
|
||||
if(video_.interrupt()) {
|
||||
irq_a_.set(IRQA::VerticalFlyback);
|
||||
|
||||
@@ -1286,7 +1286,7 @@ private:
|
||||
Acorn::Floppy::Floppy1770 wd1770_;
|
||||
void wd1770_did_change_output(WD::WD1770 &) override {
|
||||
m6502_.template set<CPU::MOS6502Mk2::Line::NMI>(
|
||||
wd1770_.get_interrupt_request_line() || wd1770_.get_data_request_line()
|
||||
wd1770_.interrupt_request() || wd1770_.data_request()
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@@ -54,7 +54,7 @@ uint16_t DMAController::read(int address) {
|
||||
// DMA status.
|
||||
case 3:
|
||||
// TODO: should DRQ come from the HDC if that mode is selected?
|
||||
return 0xfff8 | (error_ ? 0 : 1) | (byte_count_ ? 2 : 0) | (fdc_.get_data_request_line() ? 4 : 0);
|
||||
return 0xfff8 | (error_ ? 0 : 1) | (byte_count_ ? 2 : 0) | (fdc_.data_request() ? 4 : 0);
|
||||
|
||||
// DMA addressing.
|
||||
case 4: return uint16_t(0xff00 | ((address_ >> 16) & 0xff));
|
||||
@@ -138,13 +138,13 @@ void DMAController::run_for(HalfCycles duration) {
|
||||
void DMAController::wd1770_did_change_output(WD::WD1770 &) {
|
||||
// Check for a change in interrupt state.
|
||||
const bool old_interrupt_line = interrupt_line_;
|
||||
interrupt_line_ = fdc_.get_interrupt_request_line();
|
||||
interrupt_line_ = fdc_.interrupt_request();
|
||||
if(delegate_ && interrupt_line_ != old_interrupt_line) {
|
||||
delegate_->dma_controller_did_change_output(*this);
|
||||
}
|
||||
|
||||
// Check for a change in DRQ state, if it's the FDC that is currently being watched.
|
||||
if(byte_count_ && fdc_.get_data_request_line() && (control_ & Control::DRQSource)) {
|
||||
if(byte_count_ && fdc_.data_request() && (control_ & Control::DRQSource)) {
|
||||
--byte_count_;
|
||||
|
||||
if(control_ & Control::Direction) {
|
||||
|
||||
@@ -59,9 +59,9 @@ void EXDos::set_control_register(const uint8_t control) {
|
||||
|
||||
uint8_t EXDos::get_control_register() {
|
||||
const uint8_t status =
|
||||
(get_data_request_line() ? 0x80 : 0x00) |
|
||||
(data_request() ? 0x80 : 0x00) |
|
||||
(disk_did_change_ ? 0x40 : 0x00) |
|
||||
(get_interrupt_request_line() ? 0x02 : 0x00) |
|
||||
(interrupt_request() ? 0x02 : 0x00) |
|
||||
(get_drive().get_is_ready() ? 0x01 : 0x00);
|
||||
|
||||
return status;
|
||||
|
||||
@@ -44,7 +44,7 @@ uint8_t DiskROM::read(uint16_t address) {
|
||||
return WD::WD1770::read(address);
|
||||
}
|
||||
if(address == 0x7fff) {
|
||||
return (get_data_request_line() ? 0x00 : 0x80) | (get_interrupt_request_line() ? 0x00 : 0x40);
|
||||
return (data_request() ? 0x00 : 0x80) | (interrupt_request() ? 0x00 : 0x40);
|
||||
}
|
||||
return rom_[address & 0x3fff];
|
||||
}
|
||||
|
||||
@@ -57,7 +57,7 @@ uint8_t BD500::read(int address) {
|
||||
case 0x0320: case 0x0321: case 0x0322: case 0x0323:
|
||||
return WD::WD1770::read(address);
|
||||
|
||||
case 0x312: return (get_data_request_line() ? 0x80 : 0x00) | (get_interrupt_request_line() ? 0x40 : 0x00);
|
||||
case 0x312: return (data_request() ? 0x80 : 0x00) | (interrupt_request() ? 0x40 : 0x00);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -93,9 +93,9 @@ void Microdisc::set_control_register(const uint8_t control, const uint8_t change
|
||||
}
|
||||
|
||||
if(irq_enable(changes)) {
|
||||
const bool had_irq = interrupt_request_line();
|
||||
const bool had_irq = interrupt_request();
|
||||
irq_enable_ = irq_enable(control);
|
||||
const bool has_irq = interrupt_request_line();
|
||||
const bool has_irq = interrupt_request();
|
||||
if(has_irq != had_irq && delegate_) {
|
||||
delegate_->wd1770_did_change_output(*this);
|
||||
}
|
||||
@@ -106,16 +106,16 @@ void Microdisc::set_control_register(const uint8_t control, const uint8_t change
|
||||
}
|
||||
}
|
||||
|
||||
bool Microdisc::interrupt_request_line() const {
|
||||
return irq_enable_ && WD1770::get_interrupt_request_line();
|
||||
bool Microdisc::interrupt_request() const {
|
||||
return irq_enable_ && WD1770::interrupt_request();
|
||||
}
|
||||
|
||||
uint8_t Microdisc::interrupt_request_register() const {
|
||||
return 0x7f | (WD1770::get_interrupt_request_line() ? 0x00 : 0x80);
|
||||
return 0x7f | (WD1770::interrupt_request() ? 0x00 : 0x80);
|
||||
}
|
||||
|
||||
uint8_t Microdisc::data_request_register() const {
|
||||
return 0x7f | (get_data_request_line() ? 0x00 : 0x80);
|
||||
return 0x7f | (data_request() ? 0x00 : 0x80);
|
||||
}
|
||||
|
||||
void Microdisc::set_head_load_request(const bool head_load) {
|
||||
|
||||
@@ -22,7 +22,7 @@ public:
|
||||
|
||||
uint8_t interrupt_request_register() const;
|
||||
uint8_t data_request_register() const;
|
||||
bool interrupt_request_line() const;
|
||||
bool interrupt_request() const;
|
||||
|
||||
void run_for(const Cycles);
|
||||
|
||||
|
||||
@@ -781,12 +781,12 @@ private:
|
||||
|
||||
// The Microdisc directly provides an interrupt line.
|
||||
if constexpr (disk_interface == DiskInterface::Microdisc) {
|
||||
irq_line |= microdisc_.get_interrupt_request_line();
|
||||
irq_line |= microdisc_.interrupt_request();
|
||||
}
|
||||
|
||||
// The Jasmin reroutes its data request line to the processor's interrupt line.
|
||||
if constexpr (disk_interface == DiskInterface::Jasmin) {
|
||||
irq_line |= jasmin_.get_data_request_line();
|
||||
irq_line |= jasmin_.data_request();
|
||||
}
|
||||
|
||||
m6502_.set_irq_line(irq_line);
|
||||
|
||||
@@ -60,8 +60,8 @@ void DiskController::wd1770_did_change_output(WD::WD1770 &) {
|
||||
}
|
||||
|
||||
void DiskController::update_halt_nmi() {
|
||||
enable_halt_ &= !get_interrupt_request_line();
|
||||
enable_halt_ &= !interrupt_request();
|
||||
|
||||
nmi_ = get_interrupt_request_line() && double_density_;
|
||||
halt_ = !get_data_request_line() && enable_halt_;
|
||||
nmi_ = interrupt_request() && double_density_;
|
||||
halt_ = !data_request() && enable_halt_;
|
||||
}
|
||||
@@ -6072,7 +6072,7 @@
|
||||
attributes = {
|
||||
BuildIndependentTargetsInParallel = YES;
|
||||
LastSwiftUpdateCheck = 0700;
|
||||
LastUpgradeCheck = 2700;
|
||||
LastUpgradeCheck = 2710;
|
||||
ORGANIZATIONNAME = "Thomas Harte";
|
||||
TargetAttributes = {
|
||||
4B055A691FAE763F0060FFFF = {
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Scheme
|
||||
LastUpgradeVersion = "2700"
|
||||
LastUpgradeVersion = "2710"
|
||||
version = "1.3">
|
||||
<BuildAction
|
||||
parallelizeBuildables = "YES"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Scheme
|
||||
LastUpgradeVersion = "2700"
|
||||
LastUpgradeVersion = "2710"
|
||||
version = "1.8">
|
||||
<BuildAction
|
||||
parallelizeBuildables = "YES"
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Scheme
|
||||
LastUpgradeVersion = "2700"
|
||||
LastUpgradeVersion = "2710"
|
||||
version = "1.3">
|
||||
<BuildAction
|
||||
parallelizeBuildables = "YES"
|
||||
|
||||
Reference in new issue
Block a user