Skip to content

Fix LZCNT returning the BSR result #216

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
egorich239 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix LZCNT returning the BSR result #216

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
42 changes: 21 additions & 21 deletions blink/machine.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1046,40 +1046,40 @@ static u64 AluPopcnt(u64 x, struct Machine *m) {
return popcount(x);
}

static u64 AluLzcnt(u64 x, struct Machine *m, int bits) {
static u64 AluTzcnt(u64 x, struct Machine *m, int bits) {
u64 r = x ? bsf(x) : bits;
m->flags = SetFlag(m->flags, FLAGS_CF, !x);
m->flags = SetFlag(m->flags, FLAGS_ZF, !r);
return r;
}
static u64 AluLzcnt64(u64 x, struct Machine *m) {
return AluLzcnt(x, m, 64);
static u64 AluTzcnt64(u64 x, struct Machine *m) {
return AluTzcnt(x, m, 64);
}
static u64 AluLzcnt32(u64 x, struct Machine *m) {
return AluLzcnt(x, m, 32);
static u64 AluTzcnt32(u64 x, struct Machine *m) {
return AluTzcnt(x, m, 32);
}
static u64 AluLzcnt16(u64 x, struct Machine *m) {
return AluLzcnt(x, m, 16);
static u64 AluTzcnt16(u64 x, struct Machine *m) {
return AluTzcnt(x, m, 16);
}
static u64 AluBsf(u64 x, struct Machine *m) {
m->flags = SetFlag(m->flags, FLAGS_ZF, !x);
return x ? bsf(x) : 0;
}

static u64 AluTzcnt(u64 x, struct Machine *m, int bits) {
u64 r = x ? bsr(x) : bits;
static u64 AluLzcnt(u64 x, struct Machine *m, int bits) {
u64 r = x ? bits - 1 - bsr(x) : bits;
m->flags = SetFlag(m->flags, FLAGS_CF, !x);
m->flags = SetFlag(m->flags, FLAGS_ZF, !r);
return r;
}
static u64 AluTzcnt64(u64 x, struct Machine *m) {
return AluTzcnt(x, m, 64);
static u64 AluLzcnt64(u64 x, struct Machine *m) {
return AluLzcnt(x, m, 64);
}
static u64 AluTzcnt32(u64 x, struct Machine *m) {
return AluTzcnt(x, m, 32);
static u64 AluLzcnt32(u64 x, struct Machine *m) {
return AluLzcnt(x, m, 32);
}
static u64 AluTzcnt16(u64 x, struct Machine *m) {
return AluTzcnt(x, m, 16);
static u64 AluLzcnt16(u64 x, struct Machine *m) {
return AluLzcnt(x, m, 16);
}
static u64 AluBsr(u64 x, struct Machine *m) {
m->flags = SetFlag(m->flags, FLAGS_ZF, !x);
Expand All @@ -1105,11 +1105,11 @@ static void OpBsf(P) {
u64 (*op)(u64, struct Machine *);
if (Rep(rde) == 3) {
if (Rexw(rde)) {
op = AluLzcnt64;
op = AluTzcnt64;
} else if (!Osz(rde)) {
op = AluLzcnt32;
op = AluTzcnt32;
} else {
op = AluLzcnt16;
op = AluTzcnt16;
}
} else {
op = AluBsf;
Expand All @@ -1121,11 +1121,11 @@ static void OpBsr(P) {
u64 (*op)(u64, struct Machine *);
if (Rep(rde) == 3) {
if (Rexw(rde)) {
op = AluTzcnt64;
op = AluLzcnt64;
} else if (!Osz(rde)) {
op = AluTzcnt32;
op = AluLzcnt32;
} else {
op = AluTzcnt16;
op = AluLzcnt16;
}
} else {
op = AluBsr;
Expand Down