--- np2/i386c/ia32/cpu.h 2004/02/09 16:12:07 1.15 +++ np2/i386c/ia32/cpu.h 2004/02/19 03:04:01 1.18 @@ -1,4 +1,4 @@ -/* $Id: cpu.h,v 1.15 2004/02/09 16:12:07 monaka Exp $ */ +/* $Id: cpu.h,v 1.18 2004/02/19 03:04:01 yui Exp $ */ /* * Copyright (c) 2002-2003 NONAKA Kimihiro @@ -447,7 +447,7 @@ void set_eflags(DWORD new_flags, DWORD m #define CPU_MODE_USER 1 #define CPU_SET_CPL(cpl) \ do { \ - BYTE __t = (cpl) & 3; \ + BYTE __t = (BYTE)((cpl) & 3); \ CPU_STAT_CPL = __t; \ CPU_STAT_USER_MODE = (__t == 3) ? CPU_MODE_USER : CPU_MODE_SUPERVISER; \ } while (/*CONSTCOND*/ 0) @@ -525,7 +525,7 @@ void ia32withtrap(void); void ia32withdma(void); void ia32_step(void); -void CPUCALL ia32_interrupt(BYTE vect); +void CPUCALL ia32_interrupt(REG8 vect); void CPUCALL ia32_exception(DWORD vect, DWORD p1, DWORD p2); void exec_1step(void); @@ -533,6 +533,8 @@ void exec_1step(void); #define INST_STRING (1 << 1) #define REP_CHECKZF (1 << 7) +int disasm(DWORD *eip, char *buf, size_t size); + void ia32_printf(const char *buf, ...); void ia32_warning(const char *buf, ...); void ia32_panic(const char *buf, ...);