Parcourir la source

src: remove commented instructions that were used for debug

Quentin Monnet il y a 8 ans
Parent
commit
c510e3cd92
2 fichiers modifiés avec 2 ajouts et 10 suppressions
  1. 2 4
      src/jit.rs
  2. 0 6
      src/lib.rs

+ 2 - 4
src/jit.rs

@@ -805,14 +805,12 @@ impl<'a> Index<usize> for JitMemory<'a> {
     type Output = u8;
 
     fn index(&self, _index: usize) -> &u8 {
-        //unsafe {&*self.contents.offset(_index as isize) }
         &self.contents[_index]
     }
 }
 
 impl<'a> IndexMut<usize> for JitMemory<'a> {
     fn index_mut(&mut self, _index: usize) -> &mut u8 {
-        //unsafe {&mut *self.contents.offset(_index as isize) }
         &mut self.contents[_index]
     }
 }
@@ -820,10 +818,8 @@ impl<'a> IndexMut<usize> for JitMemory<'a> {
 impl<'a> std::fmt::Debug for JitMemory<'a> {
     fn fmt(&self, fmt: &mut Formatter) -> Result<(), Error> {
         fmt.write_str("JIT contents: [")?;
-        let mut j = 0;// XXX XXX
         for i in self.contents as &[u8] {
             fmt.write_fmt(format_args!(" {:#04x},", i))?;
-            j += 1; if j > 100 { break; }
         };
         fmt.write_str(" ] | ")?;
         fmt.debug_struct("JIT state")
@@ -841,6 +837,8 @@ pub fn compile(prog: &std::vec::Vec<u8>,
                use_mbuff: bool, update_data_ptr: bool)
     -> (fn(*mut u8, usize, *mut u8, usize, usize, usize) -> u64) {
 
+    // TODO: check how long the page must be to be sure to support an eBPF program of maximum
+    // possible length
     let mut jit = JitMemory::new(1);
     jit.jit_compile(prog, use_mbuff, update_data_ptr, helpers);
     jit.resolve_jumps();

+ 0 - 6
src/lib.rs

@@ -90,9 +90,6 @@ impl<'a> EbpfVmMbuff<'a> {
         while insn_ptr * ebpf::INSN_SIZE < self.prog.len() {
             let insn = ebpf::get_insn(self.prog, insn_ptr);
             insn_ptr += 1;
-            // println!("R0: {:#x} R1: {:#x} R2: {:#x} R3: {:#x} R4: {:#x} R5: {:#x} R6: {:#x} R7: {:#x} R8: {:#x} R9: {:#x} R10: {:#x}",
-            //          reg[0], reg[1], reg[2], reg[3], reg[4], reg[5], reg[6], reg[7], reg[8], reg[9], reg[10]);
-            // println!("{:02x} {:x} {:x} {:04x} {:08x}", insn.opc, insn.dst, insn.src, insn.off, insn.imm);
             let _dst    = insn.dst as usize;
             let _src    = insn.src as usize;
 
@@ -450,9 +447,6 @@ impl<'a> EbpfVmRaw<'a> {
 
     pub fn prog_exec_jit(&self, mem: &'a mut std::vec::Vec<u8>) -> u64 {
         let mut mbuff = vec![];
-        //println!("{:?}", &mbuff.buffer);
-        //println!("{:?}", &mem);
-        //println!("{:?}", mem.as_ptr() as *const u64);
         self.parent.prog_exec_jit(mem, &mut mbuff)
     }
 }