Skip to content
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

Jump to bottom

Add a PUSHENVACCMANY opcode. #18964

Merged
merged 1 commit into from
May 24, 2024
Merged

Add a PUSHENVACCMANY opcode. #18964

Show file tree
Hide file tree
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
14 changes: 14 additions & 0 deletions kernel/byterun/coq_interp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,6 +480,20 @@ value coq_interprete
accu = Field(coq_env, 2 + *pc++);
Next;
}

Instruct(PUSHENVACCMANY) {
int first = *pc++;
int size = *pc++;
int i;
print_instr("PUSHENVACCMANY");
first += 2;
sp -= size;
for (i = 1; i < size; ++i) sp[i - 1] = Field(coq_env, first + i);
sp[size - 1] = accu;
accu = Field(coq_env, first);
Next;
}

/* Function application */

Instruct(PUSH_RETADDR) {
Expand Down
1 change: 1 addition & 0 deletions kernel/genOpcodeFiles.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ let opcodes =
"PUSHENVACC2", 0;
"PUSHENVACC3", 0;
"PUSHENVACC", 1;
"PUSHENVACCMANY", 2;
"PUSH_RETADDR", 1;
"APPLY", 1;
"APPLY1", 0;
Expand Down
18 changes: 14 additions & 4 deletions kernel/vmemitcodes.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,10 +495,20 @@ let rec emit env insns remaining = match insns with
else (out env opPUSHACC; out_int env n);
emit env c remaining
| Kpush :: Kenvacc n :: c ->
if n >= 0 && n <= 3
then out env(opPUSHENVACC0 + n)
else (out env opPUSHENVACC; out_int env n);
emit env c remaining
let rec aux n c nb =
match c with
| Kpush :: Kenvacc j :: c when j = n - nb -> aux n c (nb + 1)
| _ -> (nb, c) in
let (nb, c') = aux n c 1 in
if nb >= 3 || (nb >= 2 && n > 3)
then (
out env opPUSHENVACCMANY; out_int env (n - nb + 1); out_int env nb;
emit env c' remaining)
else (
if n >= 0 && n <= 3
then out env (opPUSHENVACC0 + n)
else (out env opPUSHENVACC; out_int env n);
emit env c remaining)
| Kpush :: Koffsetclosure ofs :: c ->
if Int.equal ofs 0 || Int.equal ofs 1
then out env(opPUSHOFFSETCLOSURE0 + ofs)
Expand Down
Loading