Skip to content

Undo 32-bit idempotent return type hack. #105

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

Merged
ltratt merged 1 commit into from
Mar 19, 2025
Merged

Undo 32-bit idempotent return type hack. #105

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
7 changes: 2 additions & 5 deletions src/lvm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1171,11 +1171,8 @@ void luaV_finishOp (lua_State *L) {
#ifdef USE_YK
#define NOOPT_VAL(X) asm volatile("" : "+r,m"(X) : : "memory");
// Elide instruction lookup.
//
// FIXME: return type should be `Instruction` not `uint64_t`. We only do this
// because idempotent support isn't yet implemented for 32-bit return values.
__attribute__((yk_idempotent))
uint64_t load_inst(uint64_t pv, const Instruction *pc) {
Instruction load_inst(uint64_t pv, const Instruction *pc) {
NOOPT_VAL(pv);
return *pc;
}
Expand All @@ -1187,7 +1184,7 @@ uint64_t load_inst(uint64_t pv, const Instruction *pc) {
} \
pc = (Instruction *) yk_promote((void *) pc); \
uint64_t pv = yk_promote(cl->p->proto_version); \
i = (Instruction) load_inst(pv, pc); \
i = load_inst(pv, pc); \
pc++; \
}
#else
Expand Down