From 650f169f3ae62db7389e6e47ae99937cce86c0f2 Mon Sep 17 00:00:00 2001 From: tudnai Date: Fri, 1 May 2020 19:24:09 -0700 Subject: [PATCH] Getting rid of Page Table --- src/dev/mem/mmio.h | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/dev/mem/mmio.h b/src/dev/mem/mmio.h index 1b2bc28..4de6379 100644 --- a/src/dev/mem/mmio.h +++ b/src/dev/mem/mmio.h @@ -934,9 +934,19 @@ INLINE uint8_t memread8( uint16_t addr ) { /** Naive implementation of RAM read from address **/ +INLINE uint16_t memread16_low( uint16_t addr ) { + return * (uint16_t*) ( RDLOMEM + addr ); +} +INLINE uint16_t memread16_high( uint16_t addr ) { + return * (uint16_t*) ( RDHIMEM + addr ); +} INLINE uint16_t memread16( uint16_t addr ) { - return * (uint16_t*) ( RAM_PG_RD_TBL[addr >> 8] + (addr & 0xFF) ); -// return * (uint16_t*) (RAM + addr); + + if (addr >= 0xC000) { + return memread16_high(addr); + } + + return memread16_low(addr); } INLINE uint8_t memread( uint16_t addr ) {