zoriya/dasm
1
0
Fork 0
mirror of https://github.com/zoriya/dasm.git synced 2026-08-15 18:44:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add extended support (wip)

Browse Source
This commit is contained in:
zoriya
2023-06-01 15:37:09 +09:00
parent 8e442c0c58
commit 9d4b5ae654
3 changed files with 64 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/dasm.c
+7 -5
View File
@@ -97,15 +97,17 @@ unsigned read_size(u_int8_t *binary, unsigned size)
return ret;
}
instruction_t parse_inst(u_int8_t *binary)
instruction_t parse_inst(u_int8_t *binary, unsigned long size)
{
for (int i = 0; instructions[i].name; i++) {
if (instructions[i].opcode == *binary)
if (instructions[i].opcode != *binary)
continue;
if (instructions[i].extended == -1)
return instructions[i];
unsigned mod = binary[1] & 0b111000 >> 3;
return extended[instructions[i].extended][mod];
}
return (const instruction_t){
.opcode = 0xFF, .name = "unknown", .mode = {END}, .size = 1
};
return invalid_instruction;
}
int dasm(u_int8_t *binary, unsigned long size)
src/dasm.h
+3 -1
View File
@@ -40,7 +40,9 @@ typedef struct instruction {
const char *name;
unsigned size;
addressing_mode_t mode[5];
unsigned extended;
} instruction_t;
extern const instruction_t instructions[];
extern const instruction_t extended[][8];
extern const instruction_t invalid_instruction;
src/instructions.c
+54 -2
View File
@@ -114,7 +114,21 @@ const instruction_t instructions[] = {
{.opcode = 0x7D, .name = "jnl", .mode = {REL8, END}, .size = 2},
{.opcode = 0x7E, .name = "jng", .mode = {REL8, END}, .size = 2},
{.opcode = 0x7F, .name = "jg", .mode = {REL8, END}, .size = 2},
{.opcode = 0x80, .extended = 0, .name = "EXTENDED", .mode = {END}, .size = 1},
{.opcode = 0x81, .extended = 1, .name = "EXTENDED", .mode = {END}, .size = 1},
{.opcode = 0x83, .extended = 2, .name = "EXTENDED", .mode = {END}, .size = 1},
{.opcode = 0x84, .name = "test", .mode = {R_M8, REG8, END}, .size = 2},
{.opcode = 0x85, .name = "test", .mode = {R_M16, REG16, END}, .size = 3},
{.opcode = 0x86, .name = "xchg", .mode = {R_M8, REG8, END}, .size = 2},
{.opcode = 0x87, .name = "xchg", .mode = {R_M16, REG16, END}, .size = 3},
{.opcode = 0x88, .name = "mov", .mode = {R_M8, REG8, END}, .size = 2},
{.opcode = 0x89, .name = "mov", .mode = {R_M16, REG16, END}, .size = 3},
{.opcode = 0x8A, .name = "mov", .mode = {REG8, R_M8, END}, .size = 2},
{.opcode = 0x8B, .name = "mov", .mode = {REG16, R_M16, END}, .size = 3},
// {.opcode = 0x8C, .name = "mov", .mode = {R_M16, sreg, END}, .size = 3},
{.opcode = 0x8D, .name = "lea", .mode = {REG16, R_M16, END}, .size = 3},
// {.opcode = 0x8E, .name = "mov", .mode = {sreg, R_M16, END}, .size = 3},
{.opcode = 0x8F, .name = "pop", .mode = {R_M16, END}, .size = 3},
{.opcode = 0x90, .name = "xchg ax,ax", .mode = {END}, .size = 1},
{.opcode = 0x91, .name = "xchg cx,ax", .mode = {END}, .size = 1},
{.opcode = 0x92, .name = "xchg dx,ax", .mode = {END}, .size = 1},
@@ -147,7 +161,6 @@ const instruction_t instructions[] = {
{.opcode = 0xAD, .name = "lodsw", .mode = {END}, .size = 1},
{.opcode = 0xAE, .name = "scasb", .mode = {END}, .size = 1},
{.opcode = 0xAF, .name = "scasw", .mode = {END}, .size = 1},
{.opcode = 0xB0, .name = "mov al", .mode = {IMM8, END}, .size = 2},
{.opcode = 0xB1, .name = "mov cl", .mode = {IMM8, END}, .size = 2},
{.opcode = 0xB2, .name = "mov dl", .mode = {IMM8, END}, .size = 2},
@@ -213,3 +226,42 @@ const instruction_t instructions[] = {
{.name = NULL}
};
const instruction_t extended[][8] = {
// 0x80 extended
{
{.opcode = 0x00, .name = "add", .mode = {R_M8, IMM8, END}, .size = 2},
{.opcode = 0x01, .name = "or", .mode = {R_M8, IMM8, END}, .size = 2},
{.opcode = 0x02, .name = "adc", .mode = {R_M8, IMM8, END}, .size = 2},
{.opcode = 0x03, .name = "sbb", .mode = {R_M8, IMM8, END}, .size = 2},
{.opcode = 0x04, .name = "and", .mode = {R_M8, IMM8, END}, .size = 2},
{.opcode = 0x05, .name = "sub", .mode = {R_M8, IMM8, END}, .size = 2},
{.opcode = 0x06, .name = "xor", .mode = {R_M8, IMM8, END}, .size = 2},
{.opcode = 0x07, .name = "cmp", .mode = {R_M8, IMM8, END}, .size = 2},
},
// 0x81 extended
{
{.opcode = 0x00, .name = "add", .mode = {R_M16, IMM16, END}, .size = 3},
{.opcode = 0x01, .name = "or", .mode = {R_M16, IMM16, END}, .size = 3},
{.opcode = 0x02, .name = "adc", .mode = {R_M16, IMM16, END}, .size = 3},
{.opcode = 0x03, .name = "sbb", .mode = {R_M16, IMM16, END}, .size = 3},
{.opcode = 0x04, .name = "and", .mode = {R_M16, IMM16, END}, .size = 3},
{.opcode = 0x05, .name = "sub", .mode = {R_M16, IMM16, END}, .size = 3},
{.opcode = 0x06, .name = "xor", .mode = {R_M16, IMM16, END}, .size = 3},
{.opcode = 0x07, .name = "cmp", .mode = {R_M16, IMM16, END}, .size = 3},
},
// 0x83 extended
{
{.opcode = 0x00, .name = "add", .mode = {R_M16, IMM8, END}, .size = 3},
{.opcode = 0x01, .name = "invalid", .mode = {END}, .size = 1},
{.opcode = 0x02, .name = "adc", .mode = {R_M16, IMM8, END}, .size = 3},
{.opcode = 0x03, .name = "sbb", .mode = {R_M16, IMM8, END}, .size = 3},
{.opcode = 0x04, .name = "invalid", .mode = {END}, .size = 1},
{.opcode = 0x05, .name = "sub", .mode = {R_M16, IMM8, END}, .size = 3},
{.opcode = 0x06, .name = "invalid", .mode = {END}, .size = 1},
{.opcode = 0x07, .name = "cmp", .mode = {R_M16, IMM8, END}, .size = 3},
},
};
const instruction_t invalid_instruction = { .opcode = 0xFF, .name = "unknown", .mode = {END}, .size = 1 };