summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/cpu/hphybrid/hphybrid.cpp
diff options
context:
space:
mode:
author Firehawke <Firehawke@users.noreply.github.com>2017-12-13 21:01:10 -0700
committer Firehawke <Firehawke@users.noreply.github.com>2017-12-13 21:01:10 -0700
commit54155441e9ba9941e85d80c4834a66376a11e791 (patch)
treeaa44bdaf0035cbe188d64c447f225f10f7d76d8d /src/devices/cpu/hphybrid/hphybrid.cpp
parentf537428e5a40ba6dde8ca9bf0fe9ae6b1f189ac4 (diff)
Revert "Merge branch 'master' of https://github.com/mamedev/mame"
This reverts commit f537428e5a40ba6dde8ca9bf0fe9ae6b1f189ac4, reversing changes made to 0d70d798107d4e4e8fb9f230410aeb1e888d65c5.
Diffstat (limited to 'src/devices/cpu/hphybrid/hphybrid.cpp')
-rw-r--r--src/devices/cpu/hphybrid/hphybrid.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/devices/cpu/hphybrid/hphybrid.cpp b/src/devices/cpu/hphybrid/hphybrid.cpp
index f85fd4b9a06..9e8457b255d 100644
--- a/src/devices/cpu/hphybrid/hphybrid.cpp
+++ b/src/devices/cpu/hphybrid/hphybrid.cpp
@@ -761,7 +761,7 @@ uint16_t hp_hybrid_cpu_device::RM(uint32_t addr)
return read_non_common_reg(addr_wo_bsc);
}
} else {
- return m_direct->read_word(addr);
+ return m_direct->read_word(addr << 1);
}
}
@@ -1026,8 +1026,8 @@ void hp_hybrid_cpu_device::do_pw(uint16_t opcode)
WM(tmp_addr >> 1 , tmp);
} else {
// Extend address, form byte address
- uint16_t val = (tmp_addr & 1) ? uint8_t(tmp) : (tmp << 8);
- uint16_t mask = (tmp_addr & 1) ? 0x00ff : 0xff00;
+ uint16_t val = (tmp_addr & 1) ? uint8_t(tmp) << 8 : uint8_t(tmp);
+ uint16_t mask = (tmp_addr & 1) ? 0xff00 : 0x00ff;
tmp_addr = add_mae(AEC_CASE_C , tmp_addr >> 1);
m_program->write_word(tmp_addr , val, mask);
}
@@ -1125,12 +1125,12 @@ void hp_hybrid_cpu_device::handle_dma(void)
uint16_t hp_hybrid_cpu_device::RIO(uint8_t pa , uint8_t ic)
{
- return m_io->read_word(HP_MAKE_IOADDR(pa, ic));
+ return m_io->read_word(HP_MAKE_IOADDR(pa, ic) << 1);
}
void hp_hybrid_cpu_device::WIO(uint8_t pa , uint8_t ic , uint16_t v)
{
- m_io->write_word(HP_MAKE_IOADDR(pa, ic) , v);
+ m_io->write_word(HP_MAKE_IOADDR(pa, ic) << 1 , v);
}
hp_5061_3001_cpu_device::hp_5061_3001_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)