Date: Fri, 29 Aug 2014 17:53:50 GMT From: dpl@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r273339 - soc2014/dpl/netmap-ipfwjit/sys/netpfil/ipfw Message-ID: <201408291753.s7THroNu039808@socsvn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dpl Date: Fri Aug 29 17:53:50 2014 New Revision: 273339 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=273339 Log: Corrected small mistakes. Modified: soc2014/dpl/netmap-ipfwjit/sys/netpfil/ipfw/jit.cc Modified: soc2014/dpl/netmap-ipfwjit/sys/netpfil/ipfw/jit.cc ============================================================================== --- soc2014/dpl/netmap-ipfwjit/sys/netpfil/ipfw/jit.cc Fri Aug 29 17:33:08 2014 (r273338) +++ soc2014/dpl/netmap-ipfwjit/sys/netpfil/ipfw/jit.cc Fri Aug 29 17:53:50 2014 (r273339) @@ -425,11 +425,12 @@ void emit_pullup_failed() { - Value *is_verbose, *str, *Conp; - BasicBlock *print = BasicBlock::Create(Con, "print", Func); BasicBlock *ret = BasicBlock::Create(Con, "ret", Func); + Value *is_verbose, *str, *Comp; + + // VNET_DECLARE(int, fw_verbose); // #define V_fw_verbose VNET(fw_verbose) // We should be fine getting that from the Module. @@ -547,7 +548,7 @@ // f = chain->map[f_pos]; idxs: 5, f_pos Value *MapPtr = Irb.CreateStructGEP(Chain, 5); Value *Map = Irb.CreateLoad(MapPtr); - Value *MapFPos = Irb.CreateInBoundsGEP(Mal,F_pos); + Value *MapFPos = Irb.CreateInBoundsGEP(Map, F_pos); Irb.CreateStore(MapFPos, F); // if (V_set_disable & (1 << f->set) ) @@ -694,7 +695,7 @@ Irb.SetInsertPoint(matchnotzero); // if (cmd->len & F_OR) - AndOp = Irb.CreateAnd(Len, ConstantInt::get(Int8Ty, F_OR)) + AndOp = Irb.CreateAnd(Len, ConstantInt::get(Int8Ty, F_OR)); Comp = Irb.CreateICmpNE(AndOp, ConstantInt::get(Int32Ty, 0)); Irb.CreateCondBr(Comp, is_or, Outer_for_epilogue); @@ -719,7 +720,7 @@ Irb.SetInsertPoint(Outer_for_epilogue); // f_pos++, increment of the for loop. - Value AddOp = Irb.CreateAdd(F_pos, ConstantInt::get(Int32Ty, 1)); + Value *AddOp = Irb.CreateAdd(F_pos, ConstantInt::get(Int32Ty, 1)); Irb.CreateStore(AddOp, F_pos); // if (done) @@ -736,7 +737,7 @@ BasicBlock *jt = BasicBlock::Create(Con, "jt", Func); BasicBlock *jf = BasicBlock::Create(Con, "jf", Func); BasicBlock *ret = BasicBlock::Create(Con, "ret", Func); - Value *Comp, AddOp; + Value *Comp, *AddOp; // if (done) { // struct ip_fw *rule = chain->map[f_pos]; @@ -770,14 +771,14 @@ rule = Irb.CreateAlloca(Ip_fwPtrTy); Value *MapPtr = Irb.CreateStructGEP(Chain, 5); Value *Map = Irb.CreateLoad(MapPtr); - Value *MapFPos = Irb.CreateInBoundsGEP(Mal,F_pos); + Value *MapFPos = Irb.CreateInBoundsGEP(Map, F_pos); Irb.CreateStore(MapFPos, rule); // uint64_t pcnt; // (rule)->pcnt++; - Value RuleL = Irb.CreateLoad(rule); + Value *RuleL = Irb.CreateLoad(rule); Value *Pcnt = Irb.CreateStructGEP(RuleL, 8); - AddOp = Irb.CreateAdd(Pcnt, ConstantInt::get(pcnt->getType(), 1)); + AddOp = Irb.CreateAdd(Pcnt, ConstantInt::get(Pcnt->getType(), 1)); Irb.CreateStore(AddOp, Pcnt); // uint64_t bnct;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408291753.s7THroNu039808>