--- np2/i386c/ia32/interface.h 2004/02/20 16:09:04 1.8 +++ np2/i386c/ia32/interface.h 2004/03/12 13:34:08 1.11 @@ -1,4 +1,4 @@ -/* $Id: interface.h,v 1.8 2004/02/20 16:09:04 monaka Exp $ */ +/* $Id: interface.h,v 1.11 2004/03/12 13:34:08 monaka Exp $ */ /* * Copyright (c) 2002-2003 NONAKA Kimihiro @@ -35,18 +35,18 @@ #define SQWORD_CONST(v) v ## LL #endif -#define CPU_isDI (!(CPU_FLAG & I_FLAG)) #define CPU_isEI (CPU_FLAG & I_FLAG) +#define CPU_isDI (!CPU_isEI) -#define CPU_INITIALIZE() i386c_initialize() +#define CPU_INITIALIZE() i386c_initialize() #define CPU_DEINITIALIZE() -#define CPU_RESET() ia32reset() -#define CPU_CLEARPREFETCH() -#define CPU_INTERRUPT(vect) ia32_interrupt(vect) -#define CPU_EXEC() ia32() -#define CPU_EXECV30() ia32() -#define CPU_SHUT() ia32shut() -#define CPU_SETEXTSIZE(size) ia32_setextsize((UINT32)size << 20) +#define CPU_RESET() ia32reset() +#define CPU_CLEARPREFETCH() CPU_PREFETCH_CLEAR() +#define CPU_INTERRUPT(vect, soft) ia32_interrupt(vect, soft) +#define CPU_EXEC() ia32() +#define CPU_EXECV30() ia32() +#define CPU_SHUT() ia32shut() +#define CPU_SETEXTSIZE(size) ia32_setextsize((UINT32)(size) << 20) #define CPU_SETEMM(frame, addr) #define cpu_memorywrite(a,v) i286_memorywrite(a,v) @@ -56,6 +56,9 @@ #define cpu_memoryread_w(a) i286_memoryread_w(a) #define cpu_memoryread_d(a) i286_memoryread_d(a) +#define cpu_memoryread_region(a,p,l) memp_read(a,p,l) +#define cpu_memorywrite_region(a,p,l) memp_write(a,p,l) + void i386c_initialize(void); #endif /* IA32_CPU_INTERFACE_H__ */