--- np2/i386c/ia32/interface.h 2004/03/10 23:01:08 1.10 +++ np2/i386c/ia32/interface.h 2004/03/27 16:14:31 1.15 @@ -1,4 +1,4 @@ -/* $Id: interface.h,v 1.10 2004/03/10 23:01:08 yui Exp $ */ +/* $Id: interface.h,v 1.15 2004/03/27 16:14:31 yui Exp $ */ /* * Copyright (c) 2002-2003 NONAKA Kimihiro @@ -30,13 +30,18 @@ #ifndef IA32_CPU_INTERFACE_H__ #define IA32_CPU_INTERFACE_H__ +#ifndef CPUCALL +#define CPUCALL +#endif + #if !defined(QWORD_CONST) #define QWORD_CONST(v) v ## ULL #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_A20EN(en) CPU_ADRSMASK = (en)?0xffffffff:0x000fffff; #define CPU_INITIALIZE() i386c_initialize() #define CPU_DEINITIALIZE() @@ -50,9 +55,11 @@ #define CPU_SETEMM(frame, addr) #define cpu_memorywrite(a,v) i286_memorywrite(a,v) +#define cpu_memorywrite_b(a,v) i286_memorywrite(a,v) #define cpu_memorywrite_w(a,v) i286_memorywrite_w(a,v) #define cpu_memorywrite_d(a,v) i286_memorywrite_d(a,v) #define cpu_memoryread(a) i286_memoryread(a) +#define cpu_memoryread_b(a) i286_memoryread(a) #define cpu_memoryread_w(a) i286_memoryread_w(a) #define cpu_memoryread_d(a) i286_memoryread_d(a)