Diff for /np2/i386c/ia32/cpu_mem.mcr between versions 1.1 and 1.4

version 1.1, 2004/03/23 15:29:34 version 1.4, 2005/03/12 12:32:54
Line 12 Line 12
  * 2. Redistributions in binary form must reproduce the above copyright   * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the   *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.   *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products  
  *    derived from this software without specific prior written permission.  
  *   *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR   * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES   * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
Line 63  cpu_vmemoryread_##width(int idx, UINT32  Line 61  cpu_vmemoryread_##width(int idx, UINT32 
         check_memory_break_point(addr, (length), CPU_DR7_RW_RO); \          check_memory_break_point(addr, (length), CPU_DR7_RW_RO); \
         if (!CPU_STAT_PAGING) \          if (!CPU_STAT_PAGING) \
                 return cpu_memoryread_##width(addr); \                  return cpu_memoryread_##width(addr); \
         return cpu_lmemoryread_##width(addr, CPU_STAT_USER_MODE); \          return cpu_linear_memory_read_##width(addr, CPU_PAGE_READ_DATA | CPU_STAT_USER_MODE); \
 \  \
 range_failure: \  range_failure: \
         if (idx == CPU_SS_INDEX) { \          if (idx == CPU_SS_INDEX) { \
Line 113  cpu_vmemorywrite_##width(int idx, UINT32 Line 111  cpu_vmemorywrite_##width(int idx, UINT32
         if (!CPU_STAT_PAGING) { \          if (!CPU_STAT_PAGING) { \
                 cpu_memorywrite_##width(addr, value); \                  cpu_memorywrite_##width(addr, value); \
         } else { \          } else { \
                 cpu_lmemorywrite_##width(addr, value, CPU_STAT_USER_MODE); \                  cpu_linear_memory_write_##width(addr, value, CPU_PAGE_WRITE_DATA | CPU_STAT_USER_MODE); \
         } \          } \
         return; \          return; \
 \  \
Line 167  cpu_memory_access_va_RMW_##width(int idx Line 165  cpu_memory_access_va_RMW_##width(int idx
                 res = (*func)(dst, arg); \                  res = (*func)(dst, arg); \
                 cpu_memorywrite_##width(addr, res); \                  cpu_memorywrite_##width(addr, res); \
         } else { \          } else { \
                 dst = cpu_memory_access_la_RMW(addr, length, CPU_STAT_USER_MODE, func, arg); \                  dst = cpu_memory_access_la_RMW_##width(addr, func, arg); \
         } \          } \
         return dst; \          return dst; \
 \  \

Removed from v.1.1  
changed lines
  Added in v.1.4


RetroPC.NET-CVS <cvs@retropc.net>