28c28
< __FBSDID("$FreeBSD: head/sys/amd64/amd64/db_disasm.c 144353 2005-03-30 22:52:27Z peter $");
---
> __FBSDID("$FreeBSD: head/sys/amd64/amd64/db_disasm.c 144354 2005-03-30 22:57:41Z peter $");
97c97
< #define El 35 /* address, long size */
---
> #define El 35 /* address, long/quad size */
99a100
> #define EL 38 /* address, explicitly long size */
224a226,245
> static const struct inst db_inst_0f4x[] = {
> /*40*/ { "cmovo", TRUE, NONE, op2(E, R), 0 },
> /*41*/ { "cmovno", TRUE, NONE, op2(E, R), 0 },
> /*42*/ { "cmovb", TRUE, NONE, op2(E, R), 0 },
> /*43*/ { "cmovnb", TRUE, NONE, op2(E, R), 0 },
> /*44*/ { "cmovz", TRUE, NONE, op2(E, R), 0 },
> /*45*/ { "cmovnz", TRUE, NONE, op2(E, R), 0 },
> /*46*/ { "cmovbe", TRUE, NONE, op2(E, R), 0 },
> /*47*/ { "cmovnbe",TRUE, NONE, op2(E, R), 0 },
>
> /*48*/ { "cmovs", TRUE, NONE, op2(E, R), 0 },
> /*49*/ { "cmovns", TRUE, NONE, op2(E, R), 0 },
> /*4a*/ { "cmovp", TRUE, NONE, op2(E, R), 0 },
> /*4b*/ { "cmovnp", TRUE, NONE, op2(E, R), 0 },
> /*4c*/ { "cmovl", TRUE, NONE, op2(E, R), 0 },
> /*4d*/ { "cmovnl", TRUE, NONE, op2(E, R), 0 },
> /*4e*/ { "cmovle", TRUE, NONE, op2(E, R), 0 },
> /*4f*/ { "cmovnle",TRUE, NONE, op2(E, R), 0 },
> };
>
328a350
> db_inst_0f4x,
636c658
< /*63*/ { "arpl", TRUE, NONE, op2(Rw,Ew), 0 },
---
> /*63*/ { "movslq", TRUE, NONE, op2(EL,R), 0 },
884d905
<
956c977
< addrp->index = db_reg[rex != 0 ? 1 : 0][(rex & REX_R) ? QUAD : LONG][index];
---
> addrp->index = db_reg[1][QUAD][index];
968c989
< addrp->base = db_reg[rex != 0 ? 1 : 0][(rex & REX_R) ? QUAD : LONG][rm];
---
> addrp->base = db_reg[1][QUAD][rm];
975c996
< addrp->base = db_reg[rex != 0 ? 1 : 0][(rex & REX_R) ? QUAD : LONG][rm];
---
> addrp->base = db_reg[1][QUAD][rm];
981c1002
< addrp->base = db_reg[rex != 0 ? 1 : 0][(rex & REX_R) ? QUAD : LONG][rm];
---
> addrp->base = db_reg[1][QUAD][rm];
996c1017
< db_printf("%s", db_reg[rex != 0 ? 1 : 0][size][addrp->disp]);
---
> db_printf("%s", db_reg[rex != 0 ? 1 : 0][(size == LONG && (rex & REX_W)) ? QUAD : size][addrp->disp]);
1250a1272,1275
> if ((inst >= 0x50 && inst <= 0x5f) || inst == 0x68 || inst == 0x6a) {
> i_size = NONE;
> db_printf("q");
> }
1292a1318,1321
> case EL:
> db_print_address(seg, LONG, 0, &address);
> break;
>
1302c1331
< db_printf("%s", db_reg[rex != 0 ? 1 : 0][size][f_reg(rex, regmodrm)]);
---
> db_printf("%s", db_reg[rex != 0 ? 1 : 0][(size == LONG && (rex & REX_W)) ? QUAD : size][f_reg(rex, regmodrm)]);
1310c1339
< db_printf("%s", db_reg[rex != 0 ? 1 : 0][size][f_rm(rex, inst)]);
---
> db_printf("%s", db_reg[0][QUAD][f_rm(rex, inst)]);
1366c1395
< len = db_lengths[(size == LONG && (rex & REX_W)) ? QUAD : size];
---
> len = db_lengths[size];