Skip to content

[INTERP] Added unaligned handling for more opcodes #4013

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ksco wants to merge 1 commit into
base: main
Choose a base branch
from
+37 −20
Open

[INTERP] Added unaligned handling for more opcodes #4013

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 37 additions & 20 deletions src/emu/x64run66f0.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,16 +64,31 @@ uintptr_t Run66F0(x64emu_t *emu, rex_t rex, uintptr_t addr)
GETEW(0);
GETGW;
#if defined(DYNAREC) && !defined(TEST_INTERPRETER)
do {
tmp16u = native_lock_read_h(EW);
cmp16(emu, R_AX, tmp16u);
if(ACCESS_FLAG(F_ZF)) {
tmp32s = native_lock_write_h(EW, GW->word[0]);
{
int aligned = (((uintptr_t)EW) & 1) == 0;
if (!aligned) pthread_mutex_lock(&my_context->mutex_lock);
if (aligned) {
do {
tmp16u = native_lock_read_h(EW);
cmp16(emu, R_AX, tmp16u);
if(ACCESS_FLAG(F_ZF)) {
tmp32s = native_lock_write_h(EW, GW->word[0]);
} else {
R_AX = tmp16u;
tmp32s = 0;
}
} while(tmp32s);
} else {
R_AX = tmp16u;
tmp32s = 0;
tmp16u = EW->word[0];
cmp16(emu, R_AX, tmp16u);
if(ACCESS_FLAG(F_ZF)) {
EW->word[0] = GW->word[0];
} else {
R_AX = tmp16u;
}
}
} while(tmp32s);
if (!aligned) pthread_mutex_unlock(&my_context->mutex_lock);
}
#else
pthread_mutex_lock(&my_context->mutex_lock);
cmp16(emu, R_AX, EW->word[0]);
Expand Down Expand Up @@ -252,20 +267,22 @@ uintptr_t Run66F0(x64emu_t *emu, rex_t rex, uintptr_t addr)
GETEW(0);
GETGW;
#if defined(DYNAREC) && !defined(TEST_INTERPRETER)
if(((uintptr_t)ED)&1) {

@ptitSeb ptitSeb Jul 3, 2026

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you sure this is an improvement? Using a lock instead of the partial atomic move seems a regression to me.

@ksco ksco Jul 3, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Old code is not really unaligned. I guess I could fix it but I decided to align with other similar opcode (to simply use a lock).

@ptitSeb ptitSeb Jul 3, 2026

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, well, old code is buggy, as it was supposed to use _b instead if _h...

do {
tmp16u = ED->word[0] & ~0xff;
tmp16u |= native_lock_read_h(ED);
tmp16u2 = add16(emu, tmp16u, GD->word[0]);
} while(native_lock_write_h(ED, tmp16u2&0xff));
ED->word[0] = tmp16u2;
} else {
do {
tmp16u = native_lock_read_h(ED);
{
int aligned = (((uintptr_t)ED) & 1) == 0;
if (!aligned) pthread_mutex_lock(&my_context->mutex_lock);
if (aligned) {
do {
tmp16u = native_lock_read_h(ED);
tmp16u2 = add16(emu, tmp16u, GD->word[0]);
} while(native_lock_write_h(ED, tmp16u2));
} else {
tmp16u = ED->word[0];
tmp16u2 = add16(emu, tmp16u, GD->word[0]);
} while(native_lock_write_h(ED, tmp16u2));
ED->word[0] = tmp16u2;
}
GD->word[0] = tmp16u;
if (!aligned) pthread_mutex_unlock(&my_context->mutex_lock);
}
GD->word[0] = tmp16u;
#else
pthread_mutex_lock(&my_context->mutex_lock);
tmp16u = add16(emu, ED->word[0], GD->word[0]);
Expand Down
Loading