socsvn commit: r274310 - soc2014/dpl/netmap-ipfwjit/sys/netpfil/ipfw

[dpl at FreeBSD.org]

Author: dpl
Date: Thu Sep 18 14:32:05 2014
New Revision: 274310
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=274310

Log:
  Corrected some wrong rules actions.

Modified:
  soc2014/dpl/netmap-ipfwjit/sys/netpfil/ipfw/ip_fw_rules.c
  soc2014/dpl/netmap-ipfwjit/sys/netpfil/ipfw/jit.cc

Modified: soc2014/dpl/netmap-ipfwjit/sys/netpfil/ipfw/ip_fw_rules.c
==============================================================================
--- soc2014/dpl/netmap-ipfwjit/sys/netpfil/ipfw/ip_fw_rules.c	Thu Sep 18 14:30:27 2014	(r274309)
+++ soc2014/dpl/netmap-ipfwjit/sys/netpfil/ipfw/ip_fw_rules.c	Thu Sep 18 14:32:05 2014	(r274310)
@@ -3,7 +3,7 @@
  #include <netinet/in.h>
 
  // #define IPFW_RULES_INLINE __unused
- #define IPFW_RULES_INLINE __attribute__((used))
+ #define IPFW_RULES_INLINE __attribute__((used)) __always_inline
  #include "ip_fw_rules.h"
 
 // The real function will be compiled and inserted by the JIT.

Modified: soc2014/dpl/netmap-ipfwjit/sys/netpfil/ipfw/jit.cc
==============================================================================
--- soc2014/dpl/netmap-ipfwjit/sys/netpfil/ipfw/jit.cc	Thu Sep 18 14:30:27 2014	(r274309)
+++ soc2014/dpl/netmap-ipfwjit/sys/netpfil/ipfw/jit.cc	Thu Sep 18 14:32:05 2014	(r274310)
@@ -1341,6 +1341,7 @@
 		Value *OpcodeL = Irb.CreateLoad(Opcode);
 		// Opcode is u_int8
 		Value *OpcodeL32 = Irb.CreateZExt(OpcodeL, Int32Ty);
+		RuleForwardMac->dump();
 		Irb.CreateCall(RuleForwardMac, {OpcodeL32});
 	}