pike.git/ src/ code/ amd64.c

2017-01-24

2017-01-24 10:56:48 by Henrik Grubbström (Grubba) <grubba@grubba.org>

• ad2b61cce344dbb6ed316a1a62fe4819c4d40a7c (81 lines) (+35/-46) ^{[ Show | Annotate ]}
  Branch: 8.1

Compiler [amd64]: Use gdb-style disassembly syntax.

Fixes multiple disassembly syntax and argument ordering issues.

4982:   {    unsigned INT32 val = ((unsigned INT32 *)pc)[0];    buf += strlen(buf); -  sprintf(buf, "+0x%08x", val); +  sprintf(buf, "0x%08x", val);    return 4;   }   
5084:    }    switch(modrm & 0xc0) {    case 0x00: -  sprintf(buf, "%s", reg_buf); +  sprintf(buf, "(%s)", reg_buf);    break;    case 0x40:    sprintf(buf, "%d(%s)", ((signed char *)pc)[bytes], reg_buf);
5122:    struct amd64_opcode *op;    char buffers[4][256];    - #if 0 -  fprintf(stderr, "%p:\t", pc + pos); - #endif -  +     // Handle prefixes.    while(1) {    byte = pc[pos++];
5145:    }       while (op->flags & OP_MULTIBYTE) { -  table = amd64_opcodes[1 + op->flags & 0xff]; +  table = amd64_opcodes[1 + (op->flags & 0xff)];    byte = pc[pos++];    op = table + byte;    }
5154:       if (op->flags & OP_RM) {    modrm = pc[pos++]; -  params[0] = amd64_describe_reg(rex & 1, modrm & 0x07); -  if (op->flags & OP_OPS) { -  opcode = modrm_ops[op->flags & 0x0f][(modrm >> 3) & 0x07]; -  } else { +     params[0] = amd64_describe_reg(rex & 4, (modrm>>3) & 0x07);    params[1] = buffers[1];    pos += amd64_disassemble_modrm(pc + pos, buffers[1],    legacy_prefix, modrm, rex); -  +  if (op->flags & OP_OPS) { +  params[0] = NULL; +  opcode = modrm_ops[op->flags & 0x0f][(modrm >> 3) & 0x07];    }    }       if (op->flags & OP_REG) {    int reg = byte & 0x07; -  params[0] = amd64_describe_reg(rex & 1, byte & 0x07); +  params[1] = amd64_describe_reg(rex & 1, byte & 0x07);    }       if (op->flags & OP_IMM) { -  if (!params[1]) { -  params[1] = buffers[1]; -  buffers[1][0] = 0; +  if (!params[0]) { +  params[0] = buffers[0]; +  buffers[0][0] = 0;    }    if (op->flags & (OP_8|OP_S8)) { -  sprintf(buffers[1] + strlen(buffers[1]), "$%+d", ((signed char *)pc)[pos++]); +  sprintf(buffers[0] + strlen(buffers[0]), "$%d", ((signed char *)pc)[pos++]);    } else { -  sprintf(buffers[1] + strlen(buffers[1]), "$"); -  pos += amd64_readint32(pc + pos, buffers[1] + strlen(buffers[1])); +  sprintf(buffers[0] + strlen(buffers[0]), "$"); +  pos += amd64_readint32(pc + pos, buffers[0] + strlen(buffers[0]));    }    } else if (op->flags & OP_PCREL) {    INT32 val;
5203:    params[1] = tmp;    }    - #if 1 -  string_builder_append_disassembly(&buf, pc + op_start, pc + pos, -  opcode, params, NULL); - #else -  if (opcode) { -  fprintf(stderr, "%s", opcode); +  if (!params[0]) { +  params[0] = params[1]; +  params[1] = NULL; +  }    -  +  if (!opcode) { +  opcode = ".byte"; +  } +     if (params[0]) { -  fprintf(stderr, " %s", params[0]); -  if (params[1]) { -  fprintf(stderr, ","); +  if ((params[0][0] == '%') && +  (!strcmp(opcode, "call") || !strcmp(opcode, "jmp"))) { +  /* NB: We know that these opcodes only have one parameter. */ +  /* Add the star prefix. */ +  sprintf(buffers[0], "*%s", params[0]); +  params[0] = buffers[0];    }    }    -  if (params[1]) { -  fprintf(stderr, " %s", params[1]); +  string_builder_append_disassembly(&buf, pc + op_start, pc + pos, +  opcode, params, NULL);    } -  } else { -  fprintf(stderr, ".byte 0x%02x", byte); -  } -  for(i = 0; (op_start + i) < pos; i++) { -  if (!(i & 7)) { -  fprintf(stderr, "\n\t#"); -  } -  fprintf(stderr, " %02x", pc[op_start + i]); -  } -  fprintf(stderr, "\n"); - #endif -  } - #if 1 +  +  /* NUL-terminate. */    string_builder_putchar(&buf, 0);    fprintf(stderr, "%s", buf.s->str);    free_string_builder(&buf); - #endif +    }