--- trunk/src/memory_fast_v2h.c 2007/10/08 16:18:31 11 +++ trunk/src/memory_fast_v2h.c 2007/10/08 16:18:38 12 @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * - * $Id: memory_fast_v2h.c,v 1.13 2005/04/09 21:13:58 debug Exp $ + * $Id: memory_fast_v2h.c,v 1.15 2005/07/19 10:48:05 debug Exp $ * * Fast virtual memory to host address, used by binary translated code. */ @@ -143,7 +143,7 @@ if (paddr >= (cpu->mem->dev_baseaddr[i] & ~0xfff) && paddr <= ((cpu->mem->dev_baseaddr[i] + cpu->mem->dev_length[i] - 1) | 0xfff)) { - if (cpu->mem->dev_flags[i] & MEM_BINTRANS_OK) { + if (cpu->mem->dev_flags[i] & MEM_DYNTRANS_OK) { paddr -= cpu->mem->dev_baseaddr[i]; /* Within a device _page_ but not within the @@ -156,18 +156,18 @@ uint64_t low_paddr = paddr & ~0xfff; uint64_t high_paddr = paddr | 0xfff; if (!(cpu->mem->dev_flags[i] & - MEM_BINTRANS_WRITE_OK)) + MEM_DYNTRANS_WRITE_OK)) return NULL; if (low_paddr < cpu->mem-> - dev_bintrans_write_low[i]) + dev_dyntrans_write_low[i]) cpu->mem-> - dev_bintrans_write_low[i] = + dev_dyntrans_write_low[i] = low_paddr; if (high_paddr > cpu->mem-> - dev_bintrans_write_high[i]) + dev_dyntrans_write_high[i]) cpu->mem-> - dev_bintrans_write_high[i] + dev_dyntrans_write_high[i] = high_paddr; } @@ -177,12 +177,12 @@ MAX - 1; cpu->cd.mips.bintrans_data_hostpage[cpu-> cd.mips.bintrans_next_index] = cpu->mem-> - dev_bintrans_data[i] + (paddr & ~0xfff); + dev_dyntrans_data[i] + (paddr & ~0xfff); cpu->cd.mips.bintrans_data_vaddr[cpu-> cd.mips.bintrans_next_index] = vaddr_page; cpu->cd.mips.bintrans_data_writable[cpu-> cd.mips.bintrans_next_index] = writeflag; - return cpu->mem->dev_bintrans_data[i] + paddr; + return cpu->mem->dev_dyntrans_data[i] + paddr; } else return NULL; }