--- np2/i386c/ia32/debug.c 2004/02/19 03:04:01 1.7 +++ np2/i386c/ia32/debug.c 2011/01/15 18:36:12 1.16 @@ -1,5 +1,3 @@ -/* $Id: debug.c,v 1.7 2004/02/19 03:04:01 yui Exp $ */ - /* * Copyright (c) 2002-2003 NONAKA Kimihiro * All rights reserved. @@ -12,8 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -31,8 +27,8 @@ #include "cpu.h" #include "memory.h" -#ifdef USE_FPU -#include "instructions/fpu/fpu.h" +#if defined(USE_FPU) +#include "instructions/fpu/fp.h" #endif @@ -41,18 +37,18 @@ cpu_reg2str(void) { static char buf[512]; - sprintf(buf, - "eax=%08lx ebx=%08lx ecx=%08lx edx=%08lx\n" - "esp=%08lx ebp=%08lx esi=%08lx edi=%08lx\n" - "eip=%08lx prev_eip=%08lx\n" - "cs=%04x ss=%04x ds=%04x es=%04x fs=%04x gs=%04x\n" - "eflag=%08lx " + snprintf(buf, sizeof(buf), + "eax=%08x ecx=%08x edx=%08x ebx=%08x\n" + "esp=%08x ebp=%08x esi=%08x edi=%08x\n" + "eip=%08x prev_eip=%08x\n" + "es=%04x cs=%04x ss=%04x ds=%04x fs=%04x gs=%04x\n" + "eflag=%08x " /* ID VIP VIF AC VM RF NT IOPL OF DF IF TF SF ZF AF PF CF */ "[ ID=%d VIP=%d VIF=%d AC=%d VM=%d RF=%d NT=%d IOPL=%d %s %s %s TF=%d %s %s %s %s %s ]\n" - "gdtr=%08lx:%04x idtr=%08lx:%04x\n" - "ldtr=%04x(%08lx:%04lx) tr=%04x(%08lx:%04lx)\n" - "cr0=%08lx cr1=%08lx cr2=%08lx cr3=%08lx cr4=%08lx mxcsr=%08lx", - CPU_EAX, CPU_EBX, CPU_ECX, CPU_EDX, + "gdtr=%08x:%04x idtr=%08x:%04x\n" + "ldtr=%04x(%08x:%04x) tr=%04x(%08x:%04x)\n" + "cr0=%08x cr1=%08x cr2=%08x cr3=%08x cr4=%08x mxcsr=%08x", + CPU_EAX, CPU_ECX, CPU_EDX, CPU_EBX, CPU_ESP, CPU_EBP,CPU_ESI, CPU_EDI, CPU_EIP, CPU_PREV_EIP, CPU_CS, CPU_SS, CPU_DS, CPU_ES, CPU_FS, CPU_GS, @@ -82,45 +78,13 @@ cpu_reg2str(void) return buf; } -#ifdef USE_FPU -char * -fpu_reg2str(void) -{ - static char buf[512]; - char tmp[128]; - int i; - int no; - - strcpy(buf, "st=\n"); - for (no = 0; no < 8; no++) { - for (i = 9; i >= 0; i--) { - sprintf(tmp, "%02x", FPU_ST[no][i]); - strcat(buf, tmp); - } - strcat(buf, "\n"); - } - - sprintf(tmp, - "ctrl=%04x status=%04x tag=%04x\n" - "inst=%08x%04x data=%08x%04x op=%03x\n", - FPU_CTRLWORD, - FPU_STATUSWORD, - FPU_TAGWORD, - FPU_INSTPTR_OFFSET, FPU_INSTPTR_SEG, - FPU_DATAPTR_OFFSET, FPU_DATAPTR_SEG, - FPU_LASTINSTOP); - strcat(buf, tmp); - - return buf; -} -#endif - static char * a20str(void) { static char buf[32]; - sprintf(buf, "a20line=%s\n", CPU_STAT_ADRSMASK == 0xffffffff ? "enable" : "disable"); + snprintf(buf, sizeof(buf), "a20line=%s\n", + (CPU_STAT_ADRSMASK == 0xffffffff) ? "enable" : "disable"); return buf; } @@ -131,7 +95,7 @@ put_cpuinfo(void) strcpy(buf, cpu_reg2str()); strcat(buf, "\n"); -#ifdef USE_FPU +#if defined(USE_FPU) strcat(buf, fpu_reg2str()); strcat(buf, "\n"); #endif @@ -155,13 +119,13 @@ dbg_printf(const char *str, ...) } void -memory_dump(int idx, DWORD madr) +memory_dump(int idx, UINT32 madr) { - DWORD addr; + UINT32 addr; size_t size; - unsigned char buf[16]; size_t s, i; - BYTE p; + UINT8 buf[16]; + UINT8 c; if (madr < 0x80) { size = madr + 0x80; @@ -177,10 +141,10 @@ memory_dump(int idx, DWORD madr) memset(buf, '.', sizeof(buf)); } - p = cpu_vmemoryread(idx, addr + s); - VERBOSE(("%02x ", p)); - if (p >= 0x20 && p <= 0x7e) - buf[s % 16] = p; + c = cpu_vmemoryread(idx, addr + s); + VERBOSE(("%02x ", c)); + if (c >= 0x20 && c <= 0x7e) + buf[s % 16] = c; if ((s % 16) == 15) { VERBOSE(("| ")); @@ -192,12 +156,12 @@ memory_dump(int idx, DWORD madr) } void -gdtr_dump(DWORD base, DWORD limit) +gdtr_dump(UINT32 base, UINT limit) { - DWORD v[2]; - DWORD i; + UINT32 v[2]; + UINT i; - VERBOSE(("GDTR_DUMP: GDTR_BASE = 0x%08x, GDTR_LIMIT = 0x%04x",base,limit)); + VERBOSE(("GDTR_DUMP: GDTR_BASE = 0x%08x, GDTR_LIMIT = 0x%04x", base, limit)); for (i = 0; i < limit; i += 8) { v[0] = cpu_kmemoryread_d(base + i); @@ -207,12 +171,12 @@ gdtr_dump(DWORD base, DWORD limit) } void -ldtr_dump(DWORD base, DWORD limit) +ldtr_dump(UINT32 base, UINT limit) { - DWORD v[2]; - DWORD i; + UINT32 v[2]; + UINT i; - VERBOSE(("LDTR_DUMP: LDTR_BASE = 0x%08x, LDTR_LIMIT = 0x%04x",base,limit)); + VERBOSE(("LDTR_DUMP: LDTR_BASE = 0x%08x, LDTR_LIMIT = 0x%04x", base, limit)); for (i = 0; i < limit; i += 8) { v[0] = cpu_kmemoryread_d(base + i); @@ -222,12 +186,12 @@ ldtr_dump(DWORD base, DWORD limit) } void -idtr_dump(DWORD base, DWORD limit) +idtr_dump(UINT32 base, UINT limit) { - DWORD v[2]; - DWORD i; + UINT32 v[2]; + UINT i; - VERBOSE(("IDTR_DUMP: IDTR_BASE = 0x%08x, IDTR_LIMIT = 0x%04x",base,limit)); + VERBOSE(("IDTR_DUMP: IDTR_BASE = 0x%08x, IDTR_LIMIT = 0x%04x", base, limit)); for (i = 0; i < limit; i += 8) { v[0] = cpu_kmemoryread_d(base + i); @@ -237,10 +201,10 @@ idtr_dump(DWORD base, DWORD limit) } void -tr_dump(WORD selector, DWORD base, DWORD limit) +tr_dump(UINT16 selector, UINT32 base, UINT limit) { - DWORD v; - DWORD i; + UINT32 v; + UINT i; VERBOSE(("TR_DUMP: selector = %04x", selector)); @@ -250,11 +214,11 @@ tr_dump(WORD selector, DWORD base, DWORD } } -DWORD -pde_dump(DWORD base, int idx) +UINT32 +pde_dump(UINT32 base, int idx) { - DWORD paddr; - DWORD v; + UINT32 paddr; + UINT32 v; int i; if (idx < 0 && idx > -8192) { @@ -272,20 +236,117 @@ pde_dump(DWORD base, int idx) v = cpu_memoryread_d(paddr); VERBOSE(("PDE_DUMP: 0x%08x: %08x", paddr, v)); } else { + VERBOSE(("PDE_DUMP: invalid idx (%d)", idx)); paddr = 0; } return paddr; } -DWORD -convert_laddr_to_paddr(DWORD laddr) +void +segdesc_dump(descriptor_t *sdp) +{ +#if defined(DEBUG) + const char *s; + + __ASSERT(sdp != NULL); + + VERBOSE(("\ndump descriptor", sdp)); + + VERBOSE(("valid : %s", SEG_IS_VALID(sdp) ? "true" : "false")); + VERBOSE(("present : %s", SEG_IS_PRESENT(sdp) ? "true" : "false")); + VERBOSE(("DPL : %d", sdp->dpl)); + VERBOSE(("kind : %s", SEG_IS_SYSTEM(sdp) ? "system" : "code/data")); + if (!SEG_IS_SYSTEM(sdp)) { + if (SEG_IS_CODE(sdp)) { + VERBOSE(("type : %sconforming code", + SEG_IS_CONFORMING_CODE(sdp) ? "" : "non-")); + VERBOSE(("access : execute%s", + SEG_IS_READABLE_CODE(sdp) ? "/read" : "")); + } else { + VERBOSE(("type : expand-%s data", + SEG_IS_EXPANDDOWN_DATA(sdp) ? "down" : "up")); + VERBOSE(("access : read%s", + SEG_IS_WRITABLE_DATA(sdp) ? "/write" : "")); + } + VERBOSE(("4k scale : %s", sdp->u.seg.g ? "true" : "false")); + VERBOSE(("baseadr : 0x%08x", sdp->u.seg.segbase)); + VERBOSE(("limit : 0x%08x", sdp->u.seg.limit)); + } else { + switch (sdp->type) { + case CPU_SYSDESC_TYPE_LDT: /* LDT */ + VERBOSE(("type : LDT")); + VERBOSE(("4k scale : %s", sdp->u.seg.g ? "true" : "false")); + VERBOSE(("baseadr : 0x%08x", sdp->u.seg.segbase)); + VERBOSE(("limit : 0x%08x", sdp->u.seg.limit)); + break; + + case CPU_SYSDESC_TYPE_TASK: /* task gate */ + VERBOSE(("type : task gate")); + VERBOSE(("selector : 0x%04x", sdp->u.gate.selector)); + break; + + case CPU_SYSDESC_TYPE_TSS_16: /* 286 TSS */ + case CPU_SYSDESC_TYPE_TSS_BUSY_16: /* 286 Busy TSS */ + case CPU_SYSDESC_TYPE_TSS_32: /* 386 TSS */ + case CPU_SYSDESC_TYPE_TSS_BUSY_32: /* 386 Busy TSS */ + VERBOSE(("type : %dbit %sTSS", + (sdp->type & CPU_SYSDESC_TYPE_32BIT) ? 32 : 16, + (sdp->type & CPU_SYSDESC_TYPE_TSS_BUSY_IND) ? + "Busy " : "")); + VERBOSE(("4k scale : %s", sdp->u.seg.g ? "true" : "false")); + VERBOSE(("baseadr : 0x%08x", sdp->u.seg.segbase)); + VERBOSE(("limit : 0x%08x", sdp->u.seg.limit)); + break; + + case CPU_SYSDESC_TYPE_CALL_16: /* 286 call gate */ + case CPU_SYSDESC_TYPE_INTR_16: /* 286 interrupt gate */ + case CPU_SYSDESC_TYPE_TRAP_16: /* 286 trap gate */ + case CPU_SYSDESC_TYPE_CALL_32: /* 386 call gate */ + case CPU_SYSDESC_TYPE_INTR_32: /* 386 interrupt gate */ + case CPU_SYSDESC_TYPE_TRAP_32: /* 386 trap gate */ + switch (sdp->type & CPU_SYSDESC_TYPE_MASKBIT) { + case CPU_SYSDESC_TYPE_CALL: + s = "call"; + break; + + case CPU_SYSDESC_TYPE_INTR: + s = "interrupt"; + break; + + case CPU_SYSDESC_TYPE_TRAP: + s = "trap"; + break; + + default: + s = "unknown"; + break; + } + VERBOSE(("type : %c86 %s gate", + (sdp->type & CPU_SYSDESC_TYPE_32BIT) ? '3':'2', s)); + VERBOSE(("selector : 0x%04x", sdp->u.gate.selector)); + VERBOSE(("offset : 0x%08x", sdp->u.gate.offset)); + VERBOSE(("count : %d", sdp->u.gate.count)); + break; + + case 0: case 8: case 10: case 13: /* reserved */ + default: + VERBOSE(("type : unknown descriptor")); + break; + } + } + VERBOSE(("\n")); +#endif +} + +UINT32 +convert_laddr_to_paddr(UINT32 laddr) { - DWORD paddr; /* physical address */ - DWORD pde_addr; /* page directory entry address */ - DWORD pde; /* page directory entry */ - DWORD pte_addr; /* page table entry address */ - DWORD pte; /* page table entry */ + UINT32 paddr; /* physical address */ + UINT32 pde_addr; /* page directory entry address */ + UINT32 pde; /* page directory entry */ + UINT32 pte_addr; /* page table entry address */ + UINT32 pte; /* page table entry */ pde_addr = (CPU_CR3 & CPU_CR3_PD_MASK) | ((laddr >> 20) & 0xffc); pde = cpu_memoryread_d(pde_addr); @@ -302,15 +363,15 @@ convert_laddr_to_paddr(DWORD laddr) return paddr; } -DWORD -convert_vaddr_to_paddr(unsigned int idx, DWORD offset) +UINT32 +convert_vaddr_to_paddr(unsigned int idx, UINT32 offset) { descriptor_t *sdp; - DWORD laddr; + UINT32 laddr; if (idx < CPU_SEGREG_NUM) { sdp = &CPU_STAT_SREG(idx); - if (sdp->valid) { + if (SEG_IS_VALID(sdp)) { laddr = CPU_STAT_SREGBASE(idx) + offset; return convert_laddr_to_paddr(laddr); }