--- np2/win9xc/compiler.h 2004/01/23 17:17:55 1.11 +++ np2/win9xc/compiler.h 2004/04/08 13:08:23 1.27 @@ -18,6 +18,10 @@ typedef unsigned int UINT32; typedef signed __int64 SINT64; typedef unsigned __int64 UINT64; #define INLINE __inline +#define QWORD_CONST(v) ((DWORDLONG)(v)) +#define SQWORD_CONST(v) ((LONGLONG)(v)) +#define snprintf _snprintf +#define vsnprintf _vsnprintf #else #include typedef signed char SINT8; @@ -28,12 +32,20 @@ typedef int SINT32; typedef signed __int64 SINT64; #define INLINE inline #endif +#define FASTCALL __fastcall // for RISC test #define REG8 UINT #define REG16 UINT +// for x86 +#define LOADINTELDWORD(a) (*((UINT32 *)(a))) +#define LOADINTELWORD(a) (*((UINT16 *)(a))) +#define STOREINTELDWORD(a, b) *(UINT32 *)(a) = (b) +#define STOREINTELWORD(a, b) *(UINT16 *)(a) = (b) + + #include "common.h" #include "milstr.h" #include "_memory.h" @@ -41,12 +53,13 @@ typedef signed __int64 SINT64; #include "lstarray.h" #include "trace.h" -#define GETTICK() GetTickCount() -#define SPRINTF wsprintf + +#define GETTICK() GetTickCount() +#define SPRINTF wsprintf #define __ASSERT(s) -#define LABEL __declspec(naked) -#define RELEASE(x) if (x) {(x)->Release(); (x) = NULL;} +#define LABEL __declspec(naked) +#define RELEASE(x) if (x) {(x)->Release(); (x) = NULL;} #define VERMOUTH_LIB #define PARTSCALL __fastcall @@ -62,7 +75,7 @@ typedef signed __int64 SINT64; #define SUPPORT_SJIS // #define SUPPORT_8BPP -// #define SUPPORT_16BPP +#define SUPPORT_16BPP // #define SUPPORT_24BPP #define SUPPORT_32BPP #define SUPPORT_NORMALDISP @@ -70,17 +83,23 @@ typedef signed __int64 SINT64; #define SOUNDRESERVE 20 -#define SUPPORT_WAVEMIX - +#if defined(CPUCORE_IA32) +#define SUPPORT_CRT31KHZ +#define SUPPORT_PC9821 +#define SUPPORT_PC9801_119 +#define SUPPORT_SOFTKBD 0 +#define IA32_PAGING_EACHSIZE +#endif #define SUPPORT_HOSTDRV - -#define FASTCALL __fastcall +#define SUPPORT_SWSEEKSND #if defined(CPUCORE_IA32) #define sigjmp_buf jmp_buf #define sigsetjmp(env, mask) setjmp(env) #define siglongjmp(env, val) longjmp(env, val) -#define msgbox(title, msg) MessageBox(NULL, msg, title, MB_OK) +#define msgbox(title, msg) TRACEOUT(("%s", title)); \ + TRACEOUT(("%s", msg)); \ + MessageBox(NULL, msg, title, MB_OK) #endif