--- np2/i386c/ia32/disasm.c 2004/02/13 14:52:35 1.4 +++ np2/i386c/ia32/disasm.c 2012/01/08 11:32:16 1.12 @@ -1,5 +1,3 @@ -/* $Id: disasm.c,v 1.4 2004/02/13 14:52:35 monaka Exp $ */ - /* * Copyright (c) 2004 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 @@ -82,7 +78,7 @@ static const char *opcode_1byte[2][256] /*b0*/ "movb", "movb", "movb", "movb", "movb", "movb", "movb", "movb", "movw", "movw", "movw", "movw", "movw", "movw", "movw", "movw", /*c0*/ NULL, NULL, "ret", "ret", "les", "lds", "movb", "movw", - "enter", "leave", "ret", "ret", "int3", "int", "into", "iret", + "enter", "leave", "retf", "retf", "int3", "int", "into", "iret", /*d0*/ NULL, NULL, NULL, NULL, "aam", "aad", "salc", "xlat", "esc0", "esc1", "esc2", "esc3", "esc4", "esc5", "esc6", "esc7", /*e0*/ "loopne","loope", "loop", "jcxz", "inb", "inw", "outb", "outw", @@ -117,7 +113,7 @@ static const char *opcode_1byte[2][256] /*b0*/ "movb", "movb", "movb", "movb", "movb", "movb", "movb", "movb", "movl", "movl", "movl", "movl", "movl", "movl", "movl", "movl", /*c0*/ NULL, NULL, "ret", "ret", "les", "lds", "movb", "movl", - "enter", "leave", "ret", "ret", "int3", "int", "into", "iretd", + "enter", "leave", "retf", "retf", "int3", "int", "into", "iretd", /*d0*/ NULL, NULL, NULL, NULL, "aam", "aad", "salc", "xlat", "esc0", "esc1", "esc2", "esc3", "esc4", "esc5", "esc6", "esc7", /*e0*/ "loopne","loope", "loop", "jecxz", "inb", "inl", "outb", "outl", @@ -332,41 +328,9 @@ static const char *opcode2_g9[8] = { NULL, "cmpxchg8b", NULL, NULL, NULL, NULL, NULL, NULL }; +#if 0 static const char *sep[2] = { " ", ", " }; - - -/* - * context - */ -typedef struct { - DWORD val; - - DWORD eip; - BOOL op32; - BOOL as32; - - DWORD baseaddr; - DWORD opcode[3]; - DWORD modrm; - DWORD sib; - - BOOL useseg; - int seg; - - BYTE opbyte[32]; - int nopbyte; - - char str[256]; - size_t remain; - - char *next; - char *prefix; - char *op; - char *arg[3]; - int narg; - - char pad; -} disasm_context_t; +#endif /* @@ -375,19 +339,21 @@ typedef struct { static int convert_address(disasm_context_t *ctx) { - DWORD pde_addr; /* page directory entry address */ - DWORD pde; /* page directory entry */ - DWORD pte_addr; /* page table entry address */ - DWORD pte; /* page table entry */ - DWORD addr; + UINT32 pde_addr; /* page directory entry address */ + UINT32 pde; /* page directory entry */ + UINT32 pte_addr; /* page table entry address */ + UINT32 pte; /* page table entry */ + UINT32 addr; if (CPU_STAT_SREG(CPU_CS_INDEX).valid) { addr = CPU_STAT_SREGBASE(CPU_CS_INDEX) + ctx->eip; if (CPU_STAT_PAGING) { pde_addr = CPU_STAT_PDE_BASE + ((addr >> 20) & 0xffc); pde = cpu_memoryread_d(pde_addr); + /* XXX: check */ pte_addr = (pde & CPU_PDE_BASEADDR_MASK) + ((addr >> 10) & 0xffc); pte = cpu_memoryread_d(pte_addr); + /* XXX: check */ addr = (pte & CPU_PTE_BASEADDR_MASK) + (addr & 0x00000fff); } ctx->val = addr; @@ -399,7 +365,7 @@ convert_address(disasm_context_t *ctx) static int disasm_codefetch_1(disasm_context_t *ctx) { - BYTE val; + UINT8 val; int rv; rv = convert_address(ctx); @@ -409,26 +375,27 @@ disasm_codefetch_1(disasm_context_t *ctx val = cpu_memoryread(ctx->val); ctx->val = val; - ctx->opbyte[ctx->nopbyte++] = ctx->val; + ctx->opbyte[ctx->nopbytes++] = (UINT8)ctx->val; ctx->eip++; return 0; } +#if 0 static int disasm_codefetch_2(disasm_context_t *ctx) { - WORD val; + UINT16 val; int rv; rv = disasm_codefetch_1(ctx); if (rv) return rv; - val = ctx->val & 0xff; + val = (UINT16)(ctx->val & 0xff); rv = disasm_codefetch_1(ctx); if (rv) return rv; - val |= (WORD)(ctx->val & 0xff) << 8; + val |= (UINT16)(ctx->val & 0xff) << 8; ctx->val = val; return 0; @@ -437,7 +404,7 @@ disasm_codefetch_2(disasm_context_t *ctx static int disasm_codefetch_4(disasm_context_t *ctx) { - DWORD val; + UINT32 val; int rv; rv = disasm_codefetch_1(ctx); @@ -447,15 +414,15 @@ disasm_codefetch_4(disasm_context_t *ctx rv = disasm_codefetch_1(ctx); if (rv) return rv; - val |= (DWORD)(ctx->val & 0xff) << 8; + val |= (UINT32)(ctx->val & 0xff) << 8; rv = disasm_codefetch_1(ctx); if (rv) return rv; - val |= (DWORD)(ctx->val & 0xff) << 16; + val |= (UINT32)(ctx->val & 0xff) << 16; rv = disasm_codefetch_1(ctx); if (rv) return rv; - val |= (DWORD)(ctx->val & 0xff) << 24; + val |= (UINT32)(ctx->val & 0xff) << 24; ctx->val = val; return 0; @@ -464,6 +431,7 @@ disasm_codefetch_4(disasm_context_t *ctx /* * get effective address. */ + static int ea16(disasm_context_t *ctx, char *buf, size_t size) { @@ -471,9 +439,8 @@ ea16(disasm_context_t *ctx, char *buf, s "bx + si", "bx + di", "bp + si", "bp + di", "si", "di", "bp", "bx" }; - char tmp[32]; - DWORD mod, rm; - DWORD val; + UINT32 val; + UINT mod, rm; int rv; mod = (ctx->modrm >> 6) & 3; @@ -519,13 +486,13 @@ static int ea32(disasm_context_t *ctx, char *buf, size_t size) { char tmp[32]; - DWORD count[9]; - DWORD mod, rm; - DWORD sib; - DWORD scale; - DWORD idx; - DWORD base; - DWORD val; + UINT count[9]; + UINT32 val; + UINT mod, rm; + UINT sib; + UINT scale; + UINT idx; + UINT base; int rv; int i, n; @@ -646,7 +613,7 @@ ea(disasm_context_t *ctx) } else { milstr_ncat(ctx->next, sep[1], ctx->remain); } - len += strlen(ctx->next); + len = strlen(ctx->next); len = (len < ctx->remain) ? len : ctx->remain; ctx->next += len; ctx->remain -= len; @@ -664,18 +631,18 @@ ea(disasm_context_t *ctx) return 0; } +#endif /* * get opcode */ static int -op(disasm_context_t *ctx) +get_opcode(disasm_context_t *ctx) { const char *opcode; - DWORD type; - BYTE op[3]; + UINT8 op[3]; int prefix; - int len; + size_t len; int rv; int i; @@ -684,37 +651,36 @@ op(disasm_context_t *ctx) if (rv) return rv; - op[0] = ctx->val & 0xff; - if (insttable_info[op[0]] & INST_PREFIX) { - if (ctx->prefix == 0) - ctx->prefix = ctx->next; - - switch (op[0]) { - case 0x26: /* ES: */ - case 0x2e: /* CS: */ - case 0x36: /* SS: */ - case 0x3e: /* DS: */ - ctx->useseg = TRUE; - ctx->seg = (op[0] >> 3) & 3; - break; - - case 0x64: /* FS: */ - case 0x65: /* GS: */ - ctx->useseg = TRUE; - ctx->seg = (op[0] - 0x64) + 4; - break; - - case 0x66: /* OPSize: */ - ctx->op32 = !CPU_INST_OP32; - break; - - case 0x67: /* AddrSize: */ - ctx->as32 = !CPU_INST_AS32; - break; - } - continue; + op[0] = (UINT8)(ctx->val & 0xff); + if (!(insttable_info[op[0]] & INST_PREFIX)) + break; + + if (ctx->prefix == 0) + ctx->prefix = ctx->next; + + switch (op[0]) { + case 0x26: /* ES: */ + case 0x2e: /* CS: */ + case 0x36: /* SS: */ + case 0x3e: /* DS: */ + ctx->useseg = TRUE; + ctx->seg = (op[0] >> 3) & 3; + break; + + case 0x64: /* FS: */ + case 0x65: /* GS: */ + ctx->useseg = TRUE; + ctx->seg = (op[0] - 0x64) + 4; + break; + + case 0x66: /* OPSize: */ + ctx->op32 = !CPU_STATSAVE.cpu_inst_default.op_32; + break; + + case 0x67: /* AddrSize: */ + ctx->as32 = !CPU_STATSAVE.cpu_inst_default.as_32; + break; } - break; } if (prefix == MAX_PREFIX) return 1; @@ -740,7 +706,7 @@ op(disasm_context_t *ctx) if (rv) return rv; - op[1] = ctx->val & 0xff; + op[1] = (UINT8)(ctx->val & 0xff); ctx->opcode[1] = op[1]; switch (op[0]) { @@ -751,7 +717,7 @@ op(disasm_context_t *ctx) if (rv) return rv; - op[2] = ctx->val & 0xff; + op[2] = (UINT8)(ctx->val & 0xff); ctx->opcode[2] = op[2]; switch (op[1]) { @@ -812,35 +778,84 @@ op(disasm_context_t *ctx) * interface */ int -disasm(DWORD *eip, char *buf, size_t size) +disasm(UINT32 *eip, disasm_context_t *ctx) { - disasm_context_t ctx; int rv; - memset(&ctx, 0, sizeof(ctx)); - ctx.remain = sizeof(ctx.str) - 1; - ctx.next = ctx.str; - ctx.prefix = 0; - ctx.op = 0; - ctx.arg[0] = 0; - ctx.arg[1] = 0; - ctx.arg[2] = 0; - - ctx.eip = *eip; - ctx.op32 = CPU_INST_OP32; - ctx.as32 = CPU_INST_AS32; - ctx.seg = -1; + memset(ctx, 0, sizeof(disasm_context_t)); + ctx->remain = sizeof(ctx->str) - 1; + ctx->next = ctx->str; + ctx->prefix = 0; + ctx->op = 0; + ctx->arg[0] = 0; + ctx->arg[1] = 0; + ctx->arg[2] = 0; + + ctx->eip = *eip; + ctx->op32 = CPU_STATSAVE.cpu_inst_default.op_32; + ctx->as32 = CPU_STATSAVE.cpu_inst_default.as_32; + ctx->seg = -1; - ctx.baseaddr = ctx.eip; - ctx.pad = ' '; + ctx->baseaddr = ctx->eip; + ctx->pad = ' '; - rv = op(&ctx); + rv = get_opcode(ctx); if (rv) { - memset(&ctx, 0, sizeof(ctx)); + memset(ctx, 0, sizeof(disasm_context_t)); return rv; } + *eip = ctx->eip; - *eip = ctx.eip; - milstr_ncpy(buf, ctx.str, size); return 0; } + +char * +cpu_disasm2str(UINT32 eip) +{ + static char output[2048]; + disasm_context_t d; + UINT32 eip2 = eip; + int rv; + + output[0] = '\0'; + rv = disasm(&eip2, &d); + if (rv == 0) { + char buf[256]; + char tmp[32]; + int len = d.nopbytes > 8 ? 8 : d.nopbytes; + int i; + + buf[0] = '\0'; + for (i = 0; i < len; i++) { + snprintf(tmp, sizeof(tmp), "%02x ", d.opbyte[i]); + milstr_ncat(buf, tmp, sizeof(buf)); + } + for (; i < 8; i++) { + milstr_ncat(buf, " ", sizeof(buf)); + } + snprintf(output, sizeof(output), "%04x:%08x: %s%s", + CPU_CS, eip, buf, d.str); + + if (i < d.nopbytes) { + char t[256]; + buf[0] = '\0'; + for (; i < d.nopbytes; i++) { + snprintf(tmp, sizeof(tmp), "%02x ", + d.opbyte[i]); + milstr_ncat(buf, tmp, sizeof(buf)); + if ((i % 8) == 7) { + snprintf(t, sizeof(t), + "\n : %s", buf); + milstr_ncat(output, t, sizeof(output)); + buf[0] = '\0'; + } + } + if ((i % 8) != 0) { + snprintf(t, sizeof(t), + "\n : %s", buf); + milstr_ncat(output, t, sizeof(output)); + } + } + } + return output; +}