From owner-svn-soc-all@FreeBSD.ORG  Thu Sep 18 14:32:06 2014
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id F1CDAC7A
 for <svn-soc-all@FreeBSD.org>; Thu, 18 Sep 2014 14:32:06 +0000 (UTC)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id DD376D8C
 for <svn-soc-all@FreeBSD.org>; Thu, 18 Sep 2014 14:32:06 +0000 (UTC)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8IEW6ve097101
 for <svn-soc-all@FreeBSD.org>; Thu, 18 Sep 2014 14:32:06 GMT
 (envelope-from dpl@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id s8IEW6hh096916
 for svn-soc-all@FreeBSD.org; Thu, 18 Sep 2014 14:32:06 GMT
 (envelope-from dpl@FreeBSD.org)
Date: Thu, 18 Sep 2014 14:32:06 GMT
Message-Id: <201409181432.s8IEW6hh096916@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to
 dpl@FreeBSD.org using -f
From: dpl@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r274310 - soc2014/dpl/netmap-ipfwjit/sys/netpfil/ipfw
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all/>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 18 Sep 2014 14:32:07 -0000

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});
 	}