--- np2/win9x/debuguty/viewreg.cpp 2003/10/17 07:17:20 1.2 +++ np2/win9x/debuguty/viewreg.cpp 2005/05/12 17:26:11 1.10 @@ -1,39 +1,40 @@ #include "compiler.h" #include "resource.h" #include "np2.h" -#include "i286.h" #include "debugsub.h" #include "viewer.h" #include "viewcmn.h" #include "viewmenu.h" #include "viewmem.h" #include "viewreg.h" +#include "cpucore.h" +#if defined(CPUCORE_IA32) static void viewreg_paint(NP2VIEW_T *view, RECT *rc, HDC hdc) { LONG y; DWORD pos; - char str[128]; + TCHAR str[128]; HFONT hfont; - I286REG *r; + I386STAT *r; hfont = CreateFont(16, 0, 0, 0, 0, 0, 0, 0, SHIFTJIS_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, - DEFAULT_QUALITY, FIXED_PITCH, "£Í£Ó ¥´¥·¥Ã¥¯"); + DEFAULT_QUALITY, FIXED_PITCH, np2viewfont); SetTextColor(hdc, 0xffffff); SetBkColor(hdc, 0x400000); hfont = (HFONT)SelectObject(hdc, hfont); if (view->lock) { if (view->buf1.type != ALLOCTYPE_REG) { - if (viewcmn_alloc(&view->buf1, sizeof(i286reg))) { + if (viewcmn_alloc(&view->buf1, sizeof(i386core.s))) { view->lock = FALSE; viewmenu_lock(view); } else { view->buf1.type = ALLOCTYPE_REG; - CopyMemory(view->buf1.ptr, &i286reg, sizeof(i286reg)); + CopyMemory(view->buf1.ptr, &i386core.s, sizeof(i386core.s)); } viewcmn_putcaption(view); } @@ -41,39 +42,179 @@ static void viewreg_paint(NP2VIEW_T *vie pos = view->pos; if (view->lock) { - r = (I286REG *)view->buf1.ptr; + r = (I386STAT *)view->buf1.ptr; } else { - r = &i286reg; + r = &i386core.s; } for (y=0; ybottom && pos<4; y+=16, pos++) { switch(pos) { case 0: - wsprintf(str, "AX=%04x BX=%04x CX=%04x DX=%04x", + wsprintf(str, _T("EAX=%.8x EBX=%.8x ECX=%.8x EDX=%.8x"), + r->cpu_regs.reg[CPU_EAX_INDEX].d, + r->cpu_regs.reg[CPU_EBX_INDEX].d, + r->cpu_regs.reg[CPU_ECX_INDEX].d, + r->cpu_regs.reg[CPU_EDX_INDEX].d); + break; + + case 1: + wsprintf(str, _T("ESP=%.8x EBP=%.8x ESI=%.8x EDI=%.8x"), + r->cpu_regs.reg[CPU_ESP_INDEX].d, + r->cpu_regs.reg[CPU_EBP_INDEX].d, + r->cpu_regs.reg[CPU_ESI_INDEX].d, + r->cpu_regs.reg[CPU_EDI_INDEX].d); + break; + + case 2: + wsprintf(str, _T("CS=%.4x DS=%.4x ES=%.4x FS=%.4x GS=%.4x SS=%.4x"), + r->cpu_regs.sreg[CPU_CS_INDEX], + r->cpu_regs.sreg[CPU_DS_INDEX], + r->cpu_regs.sreg[CPU_ES_INDEX], + r->cpu_regs.sreg[CPU_FS_INDEX], + r->cpu_regs.sreg[CPU_GS_INDEX], + r->cpu_regs.sreg[CPU_SS_INDEX]); + break; + + case 3: + wsprintf(str, _T("EIP=%.8x %s"), + r->cpu_regs.eip.d, + debugsub_flags(r->cpu_regs.eflags.d)); + break; + } + TextOut(hdc, 0, y, str, lstrlen(str)); + } + DeleteObject(SelectObject(hdc, hfont)); +} +#elif defined(CPUCORE_V30) +static void viewreg_paint(NP2VIEW_T *view, RECT *rc, HDC hdc) { + + LONG y; + DWORD pos; + TCHAR str[128]; + HFONT hfont; + V30STAT *r; + + hfont = CreateFont(16, 0, 0, 0, 0, 0, 0, 0, + SHIFTJIS_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, + DEFAULT_QUALITY, FIXED_PITCH, np2viewfont); + SetTextColor(hdc, 0xffffff); + SetBkColor(hdc, 0x400000); + hfont = (HFONT)SelectObject(hdc, hfont); + + if (view->lock) { + if (view->buf1.type != ALLOCTYPE_REG) { + if (viewcmn_alloc(&view->buf1, sizeof(v30core.s))) { + view->lock = FALSE; + viewmenu_lock(view); + } + else { + view->buf1.type = ALLOCTYPE_REG; + CopyMemory(view->buf1.ptr, &v30core.s, sizeof(v30core.s)); + } + viewcmn_putcaption(view); + } + } + + pos = view->pos; + if (view->lock) { + r = (V30STAT *)view->buf1.ptr; + } + else { + r = &v30core.s; + } + + for (y=0; ybottom && pos<4; y+=16, pos++) { + switch(pos) { + case 0: + wsprintf(str, _T("AW=%.4x BW=%.4x CW=%.4x DW=%.4x"), + r->r.w.aw, r->r.w.bw, r->r.w.cw, r->r.w.dw); + break; + + case 1: + wsprintf(str, _T("SP=%.4x BP=%.4x IX=%.4x IY=%.4x"), + r->r.w.sp, r->r.w.bp, r->r.w.ix, r->r.w.iy); + break; + + case 2: + wsprintf(str, _T("PS=%.4x DS0=%.4x ES1=%.4x SS=%.4x"), + r->r.w.ps, r->r.w.ds0, r->r.w.ds1, r->r.w.ss); + break; + + case 3: + wsprintf(str, _T("PC=%.4x %s"), + r->r.w.pc, debugsub_flags(r->r.w.psw)); + break; + } + TextOut(hdc, 0, y, str, lstrlen(str)); + } + DeleteObject(SelectObject(hdc, hfont)); +} +#else +static void viewreg_paint(NP2VIEW_T *view, RECT *rc, HDC hdc) { + + LONG y; + DWORD pos; + TCHAR str[128]; + HFONT hfont; + I286STAT *r; + + hfont = CreateFont(16, 0, 0, 0, 0, 0, 0, 0, + SHIFTJIS_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, + DEFAULT_QUALITY, FIXED_PITCH, np2viewfont); + SetTextColor(hdc, 0xffffff); + SetBkColor(hdc, 0x400000); + hfont = (HFONT)SelectObject(hdc, hfont); + + if (view->lock) { + if (view->buf1.type != ALLOCTYPE_REG) { + if (viewcmn_alloc(&view->buf1, sizeof(i286core.s))) { + view->lock = FALSE; + viewmenu_lock(view); + } + else { + view->buf1.type = ALLOCTYPE_REG; + CopyMemory(view->buf1.ptr, &i286core.s, sizeof(i286core.s)); + } + viewcmn_putcaption(view); + } + } + + pos = view->pos; + if (view->lock) { + r = (I286STAT *)view->buf1.ptr; + } + else { + r = &i286core.s; + } + + for (y=0; ybottom && pos<4; y+=16, pos++) { + switch(pos) { + case 0: + wsprintf(str, _T("AX=%.4x BX=%.4x CX=%.4x DX=%.4x"), r->r.w.ax, r->r.w.bx, r->r.w.cx, r->r.w.dx); break; case 1: - wsprintf(str, "SP=%04x BP=%04x SI=%04x DI=%04x", + wsprintf(str, _T("SP=%.4x BP=%.4x SI=%.4x DI=%.4x"), r->r.w.sp, r->r.w.bp, r->r.w.si, r->r.w.di); break; case 2: - wsprintf(str, "DS=%04x ES=%04x SS=%04x CS=%04x", - r->r.w.ds, r->r.w.es, r->r.w.ss, r->r.w.cs); + wsprintf(str, _T("CS=%.4x DS=%.4x ES=%.4x SS=%.4x"), + r->r.w.cs, r->r.w.ds, r->r.w.es, r->r.w.ss); break; case 3: - wsprintf(str, "IP=%04x %s", + wsprintf(str, _T("IP=%.4x %s"), r->r.w.ip, debugsub_flags(r->r.w.flag)); break; } - TextOut(hdc, 0, y, str, strlen(str)); + TextOut(hdc, 0, y, str, lstrlen(str)); } DeleteObject(SelectObject(hdc, hfont)); } - +#endif LRESULT CALLBACK viewreg_proc(NP2VIEW_T *view, HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) {