--- np2/debugsub386.c 2004/03/07 01:23:14 1.1 +++ np2/debugsub386.c 2004/03/09 16:31:17 1.3 @@ -107,24 +107,29 @@ static char work[256]; return(work); } -static void writeseg(const char *fname, UINT32 addr, UINT limit) { +void debugwriteseg(const char *fname, const descriptor_t *sd, + UINT32 addr, UINT32 size) { FILEH fh; - UINT size; BYTE buf[0x1000]; + UINT32 limit; + limit = sd->u.seg.limit; + if (limit <= addr) { + return; + } + size = min(limit - addr, size - 1) + 1; fh = file_create_c(fname); if (fh == FILEH_INVALID) { return; } - limit = min(limit, 0xffff); - limit++; - while(limit) { - size = min(limit, sizeof(buf)); - MEML_READ(addr, buf, size); - file_write(fh, buf, size); - addr += size; - limit -= size; + addr += sd->u.seg.segbase; + while(size) { + limit = min(size, sizeof(buf)); + MEML_READ(addr, buf, limit); + file_write(fh, buf, limit); + addr += limit; + size -= limit; } file_close(fh); } @@ -135,7 +140,6 @@ static int filenum = 0; FILEH fh; char work[512]; const char *p; - descriptor_t *sd; SPRINTF(work, file_i386reg, filenum); fh = file_create_c(work); @@ -151,17 +155,13 @@ const char *p; } SPRINTF(work, file_i386cs, filenum); - sd = &CPU_STAT_SREG(CPU_CS_INDEX); - writeseg(work, sd->u.seg.segbase, sd->u.seg.limit); + debugwriteseg(work, &CPU_STAT_SREG(CPU_CS_INDEX), 0, 0x10000); SPRINTF(work, file_i386ds, filenum); - sd = &CPU_STAT_SREG(CPU_DS_INDEX); - writeseg(work, sd->u.seg.segbase, sd->u.seg.limit); + debugwriteseg(work, &CPU_STAT_SREG(CPU_DS_INDEX), 0, 0x10000); SPRINTF(work, file_i386es, filenum); - sd = &CPU_STAT_SREG(CPU_ES_INDEX); - writeseg(work, sd->u.seg.segbase, sd->u.seg.limit); + debugwriteseg(work, &CPU_STAT_SREG(CPU_ES_INDEX), 0, 0x10000); SPRINTF(work, file_i386ss, filenum); - sd = &CPU_STAT_SREG(CPU_SS_INDEX); - writeseg(work, sd->u.seg.segbase, sd->u.seg.limit); + debugwriteseg(work, &CPU_STAT_SREG(CPU_SS_INDEX), 0, 0x10000); filenum++; } @@ -181,3 +181,36 @@ void debugsub_memorydump(void) { } } + +#if 1 // ²¶ÍѥǥХ° + +void debugpageptr(UINT32 addr) { + + FILEH fh; + char buf[256]; + UINT32 pde; + UINT32 pte; + UINT i; + UINT32 a; + + fh = file_create("page.txt"); + SPRINTF(buf, "CR3=%.8x\r\n", CPU_CR3); + file_write(fh, buf, strlen(buf)); + for (i=0; i<1024; i++) { + a = CPU_STAT_PDE_BASE + (i * 4); + pde = cpu_memoryread_d(a); + SPRINTF(buf, "%.8x=>%.8x [%.8x]\r\n", (i << 22), pde, a); + file_write(fh, buf, strlen(buf)); + } + addr >>= 22; + pde = cpu_memoryread_d(CPU_STAT_PDE_BASE + (addr * 4)); + for (i=0; i<1024; i++) { + a = (pde & CPU_PDE_BASEADDR_MASK) + (i * 4); + pte = cpu_memoryread_d(a); + SPRINTF(buf, "%.8x=>%.8x [%.8x]\r\n", (addr << 22) + (i << 12), pte, a); + file_write(fh, buf, strlen(buf)); + } + file_close(fh); +} + +#endif