Skip to content

Commit 57ff4fd

Browse files
authored
Add Cargo.lock to gitignore (ruby#125)
1 parent b596c8e commit 57ff4fd

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

yjit/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
# Build output
22
/target/
3+
4+
Cargo.lock

yjit/src/core.rs

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1016,21 +1016,28 @@ fn gen_block_version(blockid: BlockId, ctx: &Context, ec: EcPtr) -> Block
10161016
}
10171017

10181018
/// Generate a block version that is an entry point inserted into an iseq
1019-
fn gen_entry_point(iseq: IseqPtr, insn_idx: u32, ec: EcPtr) -> CodePtr
1019+
fn gen_entry_point(iseq: IseqPtr, insn_idx: usize, ec: EcPtr) -> CodePtr
10201020
{
1021-
todo!();
10221021

10231022
/*
10241023
// If we aren't at PC 0, don't generate code
10251024
// See yjit_pc_guard
10261025
if (iseq->body->iseq_encoded != ec->cfp->pc) {
10271026
return NULL;
10281027
}
1028+
*/
10291029

10301030
// The entry context makes no assumptions about types
1031-
blockid_t blockid = { iseq, insn_idx };
1031+
let blockid = BlockId { iseq: iseq, idx: insn_idx };
1032+
1033+
1034+
todo!();
1035+
10321036

1037+
/*
1038+
// TODO: why do we need rb_vm_barrier() here? this should be commented.
10331039
rb_vm_barrier();
1040+
10341041
// Write the interpreter entry prologue. Might be NULL when out of memory.
10351042
uint8_t *code_ptr = yjit_entry_prologue(cb, iseq);
10361043

0 commit comments

Comments
 (0)