From 991bdf14be74ac69f9012534613433e317f95917 Mon Sep 17 00:00:00 2001 From: hap Date: Wed, 4 Dec 2024 23:52:08 +0100 Subject: t6a84: no need for PAGE_SIZE, it's a given that a 16-bit address space has a length of 0x10000 --- hash/videopac.xml | 1 + src/devices/cpu/z80/t6a84.cpp | 6 +++--- src/devices/cpu/z80/t6a84.h | 2 -- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/hash/videopac.xml b/hash/videopac.xml index 73e9fe4def9..95dccb9a9b6 100644 --- a/hash/videopac.xml +++ b/hash/videopac.xml @@ -1604,6 +1604,7 @@ distinguished by the changed copyright from Magnavox to N.A.P. (North American P + The Great Wall Street Fortune Hunt (Europe, USA) 1983 Philips diff --git a/src/devices/cpu/z80/t6a84.cpp b/src/devices/cpu/z80/t6a84.cpp index 07dedcf4193..3e0dca08688 100644 --- a/src/devices/cpu/z80/t6a84.cpp +++ b/src/devices/cpu/z80/t6a84.cpp @@ -139,7 +139,7 @@ bool t6a84_device::memory_translate(int spacenum, int intention, offs_t &address uint32_t t6a84_device::code_address(uint16_t address) { - const uint32_t page_address = PAGE_SIZE * m_code_page + address; + const uint32_t page_address = m_code_page << 16 | address; LOGMASKED(LOG_MEM, "CODE @ %06x => %06x\n", address, page_address); return page_address; @@ -147,7 +147,7 @@ uint32_t t6a84_device::code_address(uint16_t address) uint32_t t6a84_device::data_address(uint16_t address) { - const uint32_t page_address = PAGE_SIZE * m_data_page + address; + const uint32_t page_address = m_data_page << 16 | address; LOGMASKED(LOG_MEM, "DATA @ %06x => %06x\n", address, page_address); return page_address; @@ -155,7 +155,7 @@ uint32_t t6a84_device::data_address(uint16_t address) uint32_t t6a84_device::stack_address(uint16_t address) { - const uint32_t page_address = PAGE_SIZE * m_stack_page + address; + const uint32_t page_address = m_stack_page << 16 | address; LOGMASKED(LOG_MEM, "STACK @ %06x => %06x\n", address, page_address); return page_address; diff --git a/src/devices/cpu/z80/t6a84.h b/src/devices/cpu/z80/t6a84.h index 433cbb40e68..6dfc4285087 100644 --- a/src/devices/cpu/z80/t6a84.h +++ b/src/devices/cpu/z80/t6a84.h @@ -41,8 +41,6 @@ public: uint32_t stack_address(uint16_t address); protected: - static inline constexpr uint32_t PAGE_SIZE = 0x10000; - t6a84_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, address_map_constructor io_map); // device-level overrides -- cgit v1.2.3