Diff for /np2/i386c/ia32/cpu_mem.h between versions 1.6 and 1.9

version 1.6, 2004/03/23 15:29:34 version 1.9, 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 50  void cpu_stack_pop_check(UINT16 s, descr Line 48  void cpu_stack_pop_check(UINT16 s, descr
 /*  /*
  * virtual address function   * virtual address function
  */   */
 void MEMCALL cpu_vmemorywrite_b(int idx, UINT32 offset, UINT8 value);  void MEMCALL cpu_vmemorywrite_b(int idx, UINT32 offset, UINT8 value) GCC_ATTR_REGPARM;
 void MEMCALL cpu_vmemorywrite_w(int idx, UINT32 offset, UINT16 value);  void MEMCALL cpu_vmemorywrite_w(int idx, UINT32 offset, UINT16 value) GCC_ATTR_REGPARM;
 void MEMCALL cpu_vmemorywrite_d(int idx, UINT32 offset, UINT32 value);  void MEMCALL cpu_vmemorywrite_d(int idx, UINT32 offset, UINT32 value) GCC_ATTR_REGPARM;
 UINT8 MEMCALL cpu_vmemoryread_b(int idx, UINT32 offset);  void MEMCALL cpu_vmemorywrite_q(int idx, UINT32 offset, UINT64 value) GCC_ATTR_REGPARM;
 UINT16 MEMCALL cpu_vmemoryread_w(int idx, UINT32 offset);  void MEMCALL cpu_vmemorywrite_f(int idx, UINT32 offset, const REG80 *value) GCC_ATTR_REGPARM;
 UINT32 MEMCALL cpu_vmemoryread_d(int idx, UINT32 offset);  UINT8 MEMCALL cpu_vmemoryread_b(int idx, UINT32 offset) GCC_ATTR_REGPARM;
 UINT32 MEMCALL cpu_memory_access_va_RMW_b(int idx, UINT32 offset, UINT32 (*func)(UINT32, void *), void *arg);  UINT16 MEMCALL cpu_vmemoryread_w(int idx, UINT32 offset) GCC_ATTR_REGPARM;
 UINT32 MEMCALL cpu_memory_access_va_RMW_w(int idx, UINT32 offset, UINT32 (*func)(UINT32, void *), void *arg);  UINT32 MEMCALL cpu_vmemoryread_d(int idx, UINT32 offset) GCC_ATTR_REGPARM;
 UINT32 MEMCALL cpu_memory_access_va_RMW_d(int idx, UINT32 offset, UINT32 (*func)(UINT32, void *), void *arg);  UINT64 MEMCALL cpu_vmemoryread_q(int idx, UINT32 offset) GCC_ATTR_REGPARM;
   REG80 MEMCALL cpu_vmemoryread_f(int idx, UINT32 offset) GCC_ATTR_REGPARM;
   UINT32 MEMCALL cpu_memory_access_va_RMW_b(int idx, UINT32 offset, UINT32 (*func)(UINT32, void *), void *arg) GCC_ATTR_REGPARM;
   UINT32 MEMCALL cpu_memory_access_va_RMW_w(int idx, UINT32 offset, UINT32 (*func)(UINT32, void *), void *arg) GCC_ATTR_REGPARM;
   UINT32 MEMCALL cpu_memory_access_va_RMW_d(int idx, UINT32 offset, UINT32 (*func)(UINT32, void *), void *arg) GCC_ATTR_REGPARM;
 #define cpu_vmemorywrite(i,o,v)                 cpu_vmemorywrite_b(i,o,v)  #define cpu_vmemorywrite(i,o,v)                 cpu_vmemorywrite_b(i,o,v)
 #define cpu_vmemoryread(i,o)                    cpu_vmemoryread_b(i,o)  #define cpu_vmemoryread(i,o)                    cpu_vmemoryread_b(i,o)
 #define cpu_memory_access_va_RMW(i,o,f,a)       cpu_memory_access_va_RMW_b(i,o,f,a)  #define cpu_memory_access_va_RMW(i,o,f,a)       cpu_memory_access_va_RMW_b(i,o,f,a)
Line 66  UINT32 MEMCALL cpu_memory_access_va_RMW_ Line 68  UINT32 MEMCALL cpu_memory_access_va_RMW_
 /*  /*
  * code fetch   * code fetch
  */   */
 UINT8 MEMCALL cpu_codefetch(UINT32 madr);  UINT8 MEMCALL cpu_codefetch(UINT32 madr) GCC_ATTR_REGPARM;
 UINT16 MEMCALL cpu_codefetch_w(UINT32 madr);  UINT16 MEMCALL cpu_codefetch_w(UINT32 madr) GCC_ATTR_REGPARM;
 UINT32 MEMCALL cpu_codefetch_d(UINT32 madr);  UINT32 MEMCALL cpu_codefetch_d(UINT32 madr) GCC_ATTR_REGPARM;
   
   /*
    * additional physical address function
    */
   UINT64 MEMCALL cpu_memoryread_q(UINT32 address) GCC_ATTR_REGPARM;
   REG80 MEMCALL cpu_memoryread_f(UINT32 address) GCC_ATTR_REGPARM;
   void MEMCALL cpu_memorywrite_q(UINT32 address, UINT64 value) GCC_ATTR_REGPARM;
   void MEMCALL cpu_memorywrite_f(UINT32 address, const REG80 *value) GCC_ATTR_REGPARM;
   
 #ifdef __cplusplus  #ifdef __cplusplus
 }  }

Removed from v.1.6  
changed lines
  Added in v.1.9


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