zoriya/dasm
1
0
Fork 0
mirror of https://github.com/zoriya/dasm.git synced 2025-12-06 06:36:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make a5 and a6 work

Browse Source
This commit is contained in:
Zoe Roux
2023-07-11 15:57:12 +09:00
parent 639b1bc6b5
commit af8475caf7
3 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/instructions.c
View File

@@ -343,7 +343,7 @@ const instruction_t extended[][8] = {
{.opcode = 0x04, .extended = -2, .name = "shl %s, 1", .mode = {R_M8, END}, .exec = &shl},
{.opcode = 0x05, .extended = -2, .name = "shr %s, 1", .mode = {R_M8, END}, .exec = NULL},
/**/{.opcode = 0x06, .extended = -2, .name = "invalid", .mode = {END}, .exec = NULL},
{.opcode = 0x07, .extended = -2, .name = "sar %s, 1", .mode = {R_M8, END}, .exec = NULL},
{.opcode = 0x07, .extended = -2, .name = "sar %s, 1", .mode = {R_M8, END}, .exec = &sar},
},
// 0xd1 extended
{
@@ -354,7 +354,7 @@ const instruction_t extended[][8] = {
{.opcode = 0x04, .extended = -2, .name = "shl %s, 1", .mode = {R_M16, END}, .exec = &shl},
{.opcode = 0x05, .extended = -2, .name = "shr %s, 1", .mode = {R_M16, END}, .exec = NULL},
/**/{.opcode = 0x06, .extended = -2, .name = "invalid", .mode = {END}, .exec = NULL},
{.opcode = 0x07, .extended = -2, .name = "sar %s, 1", .mode = {R_M16, END}, .exec = NULL},
{.opcode = 0x07, .extended = -2, .name = "sar %s, 1", .mode = {R_M16, END}, .exec = &sar},
},
// 0xd2 extended
{
@@ -365,7 +365,7 @@ const instruction_t extended[][8] = {
{.opcode = 0x04, .extended = -2, .name = "shl %s, cl", .mode = {R_M8, END}, .exec = &shl},
{.opcode = 0x05, .extended = -2, .name = "shr %s, cl", .mode = {R_M8, END}, .exec = NULL},
/**/{.opcode = 0x06, .extended = -2, .name = "invalid", .mode = {END}, .exec = NULL},
{.opcode = 0x07, .extended = -2, .name = "sar %s, cl", .mode = {R_M8, END}, .exec = NULL},
{.opcode = 0x07, .extended = -2, .name = "sar %s, cl", .mode = {R_M8, END}, .exec = &sar},
},
// 0xd3 extended
{
@@ -376,7 +376,7 @@ const instruction_t extended[][8] = {
{.opcode = 0x04, .extended = -2, .name = "shl %s, cl", .mode = {R_M16, END}, .exec = &shl},
{.opcode = 0x05, .extended = -2, .name = "shr %s, cl", .mode = {R_M16, END}, .exec = NULL},
/**/{.opcode = 0x06, .extended = -2, .name = "invalid", .mode = {END}, .exec = NULL},
{.opcode = 0x07, .extended = -2, .name = "sar %s, cl", .mode = {R_M16, END}, .exec = NULL},
{.opcode = 0x07, .extended = -2, .name = "sar %s, cl", .mode = {R_M16, END}, .exec = &sar},
},
};

1
src/instructions.h
View File

@@ -44,4 +44,5 @@ void cbw(const instruction_t *self, state_t *state);
void cwd(const instruction_t *self, state_t *state);
void neg(const instruction_t *self, state_t *state);
void shl(const instruction_t *self, state_t *state);
void sar(const instruction_t *self, state_t *state);
void xchg(const instruction_t *self, state_t *state);

25
src/instructions/arithmetics.c
View File

@@ -201,11 +201,34 @@ void shl(const instruction_t *self, state_t *state)
write_op(to, new);
state->cf = value >> (8 - shft);
state->of = new != read_op(to);
state->cf = value >> (8 - shft) & 1;
state->sf = new & (is_operand_wide(self, 0) ? 0x8000 : 0x80);
state->zf = new == 0;
}
void sar(const instruction_t *self, state_t *state)
{
operand_t to = get_operand(self, 0, state);
unsigned value = read_op(to);
uint8_t opgrp =state->binary[state->pc];
unsigned shft = (opgrp == 0xd0 || opgrp == 0xd1) ? 1 : state->cl;
unsigned signMask = (is_operand_wide(self, 0) ? 0x8000 : 0x80);
unsigned new = value >> shft;
if (value & signMask)
new |= signMask;
else
new &= ~signMask;
write_op(to, new);
state->cf = (value >> (shft - 1)) & 1;
state->sf = value & signMask;
state->zf = new == 0;
}
void xchg(const instruction_t *self, state_t *state)
{
operand_t from = get_operand(self, 0, state);