|
|
| version 1.25, 2004/04/05 12:02:30 | version 1.27, 2005/02/08 09:19:00 |
|---|---|
| Line 3 | Line 3 |
| #ifndef NP2_MEMORY_ASM | #ifndef NP2_MEMORY_ASM |
| #include "cpucore.h" | #include "cpucore.h" |
| #include "egcmem.h" | |
| #include "mem9821.h" | #include "mem9821.h" |
| #include "pccore.h" | #include "pccore.h" |
| #include "iocore.h" | #include "iocore.h" |
| #include "memegc.h" | |
| #include "vram.h" | #include "vram.h" |
| #include "font.h" | #include "font.h" |
| Line 178 static void MEMCALL grcg_tdw1(UINT32 add | Line 178 static void MEMCALL grcg_tdw1(UINT32 add |
| static void MEMCALL egc_wt(UINT32 address, REG8 value) { // VRAM | static void MEMCALL egc_wt(UINT32 address, REG8 value) { // VRAM |
| CPU_REMCLOCK -= MEMWAIT_GRCG; | CPU_REMCLOCK -= MEMWAIT_GRCG; |
| egc_write(address, value); | memegc_wr8(address, value); |
| } | } |
| static void MEMCALL emmc_wt(UINT32 address, REG8 value) { // EMS | static void MEMCALL emmc_wt(UINT32 address, REG8 value) { // EMS |
| Line 290 const BYTE *vram; | Line 290 const BYTE *vram; |
| static REG8 MEMCALL egc_rd(UINT32 address) { // VRAM | static REG8 MEMCALL egc_rd(UINT32 address) { // VRAM |
| CPU_REMCLOCK -= MEMWAIT_GRCG; | CPU_REMCLOCK -= MEMWAIT_GRCG; |
| return(egc_read(address)); | return(memegc_rd8(address)); |
| } | } |
| static REG8 MEMCALL emmc_rd(UINT32 address) { // EMS | static REG8 MEMCALL emmc_rd(UINT32 address) { // EMS |
| Line 353 static void MEMCALL tramw_wt(UINT32 addr | Line 353 static void MEMCALL tramw_wt(UINT32 addr |
| } | } |
| } | } |
| else if (address < 0xa5000) { | else if (address < 0xa5000) { |
| if (address & 1) { | if (!(address & 1)) { |
| value >>= 8; | value >>= 8; |
| } | } |
| if (cgwindow.writable & 1) { | if (cgwindow.writable & 1) { |
| Line 455 static void MEMCALL grcgw_tdw1(UINT32 ad | Line 455 static void MEMCALL grcgw_tdw1(UINT32 ad |
| static void MEMCALL egcw_wt(UINT32 address, REG16 value) { | static void MEMCALL egcw_wt(UINT32 address, REG16 value) { |
| CPU_REMCLOCK -= MEMWAIT_GRCG; | CPU_REMCLOCK -= MEMWAIT_GRCG; |
| egc_write_w(address, value); | memegc_wr16(address, value); |
| } | } |
| static void MEMCALL emmcw_wt(UINT32 address, REG16 value) { | static void MEMCALL emmcw_wt(UINT32 address, REG16 value) { |
| Line 609 static REG16 MEMCALL grcgw_tcr1(UINT32 a | Line 609 static REG16 MEMCALL grcgw_tcr1(UINT32 a |
| static REG16 MEMCALL egcw_rd(UINT32 address) { | static REG16 MEMCALL egcw_rd(UINT32 address) { |
| CPU_REMCLOCK -= MEMWAIT_GRCG; | CPU_REMCLOCK -= MEMWAIT_GRCG; |
| return(egc_read_w(address)); | return(memegc_rd16(address)); |
| } | } |
| static REG16 MEMCALL emmcw_rd(UINT32 address) { | static REG16 MEMCALL emmcw_rd(UINT32 address) { |