From ac0d80ee1666a9e822bfcf248fe357d6eed1465e Mon Sep 17 00:00:00 2001 From: arbee Date: Fri, 19 Apr 2019 19:38:24 -0400 Subject: [PATCH] m68kmmu: fix ATC entry calculation error that was crashing Domain/OS [Hans Ostermeyer] apollo: remove deprecated debug reference [Hans Ostermeyer] --- src/devices/cpu/m68000/m68kmmu.h | 2 +- src/mame/includes/apollo.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/devices/cpu/m68000/m68kmmu.h b/src/devices/cpu/m68000/m68kmmu.h index 99481039b0f..e07ff8883fb 100644 --- a/src/devices/cpu/m68000/m68kmmu.h +++ b/src/devices/cpu/m68000/m68kmmu.h @@ -126,7 +126,7 @@ void pmmu_atc_add(uint32_t logical, uint32_t physical, int fc, const int rw) { // get page size (i.e. # of bits to ignore); is 10 for Apollo int ps = (m_mmu_tc >> 20) & 0xf; - const uint32_t atc_tag = M68K_MMU_ATC_VALID | ((fc & 7) << 24) | ((logical >> ps) << (ps - 8)); + const uint32_t atc_tag = M68K_MMU_ATC_VALID | ((fc &7) << 24)| logical >> ps; uint32_t atc_data = (physical >> ps) << (ps - 8); diff --git a/src/mame/includes/apollo.h b/src/mame/includes/apollo.h index 269cf13219c..fc352344f2e 100644 --- a/src/mame/includes/apollo.h +++ b/src/mame/includes/apollo.h @@ -14,7 +14,6 @@ #pragma once -#include "machine/apollo_dbg.h" #include "machine/apollo_kbd.h" #include "cpu/m68000/m68000.h"