misc: move to new pool_foreach macros

[vpp.git] / src / vnet / l2 / l2_rw.c

diff --git a/src/vnet/l2/l2_rw.c b/src/vnet/l2/l2_rw.c
index ac83483..59b7de9 100644 (file)
--- a/src/vnet/l2/l2_rw.c
+++ b/src/vnet/l2/l2_rw.c
@@ -16,6 +16,7 @@
 #include <vlib/vlib.h>
 #include <vnet/l2/feat_bitmap.h>
 #include <vnet/l2/l2_rw.h>
+#include <vnet/classify/vnet_classify.h>
 
 /**
  * @file
@@ -26,9 +27,9 @@
  */
 
 
+#ifndef CLIB_MARCH_VARIANT
 l2_rw_main_t l2_rw_main;
-
-vlib_node_registration_t l2_rw_node;
+#endif /* CLIB_MARCH_VARIANT */
 
 typedef struct
 {
@@ -91,74 +92,31 @@ l2_rw_get_config (u32 sw_if_index)
 static_always_inline void
 l2_rw_rewrite (l2_rw_entry_t * rwe, u8 * h)
 {
-  if (U32X4_ALIGNED (h))
-    {
-      u32x4 *d = ((u32x4 *) h) + rwe->skip_n_vectors;
-      switch (rwe->rewrite_n_vectors)
-       {
-       case 5:
-         d[4] = (d[4] & ~rwe->mask[4]) | rwe->value[4];
-         /* FALLTHROUGH */
-       case 4:
-         d[3] = (d[3] & ~rwe->mask[3]) | rwe->value[3];
-         /* FALLTHROUGH */
-       case 3:
-         d[2] = (d[2] & ~rwe->mask[2]) | rwe->value[2];
-         /* FALLTHROUGH */
-       case 2:
-         d[1] = (d[1] & ~rwe->mask[1]) | rwe->value[1];
-         /* FALLTHROUGH */
-       case 1:
-         d[0] = (d[0] & ~rwe->mask[0]) | rwe->value[0];
-         break;
-       default:
-         abort ();
-       }
-    }
-  else
+  u32x4u *d = ((u32x4u *) h) + rwe->skip_n_vectors;
+  switch (rwe->rewrite_n_vectors)
     {
-      u64 *d = ((u64 *) h) + rwe->skip_n_vectors * 2;
-      switch (rwe->rewrite_n_vectors)
-       {
-       case 5:
-         d[8] =
-           (d[8] & ~(((u64 *) rwe->mask)[8])) | (((u64 *) rwe->value)[8]);
-         d[9] =
-           (d[9] & ~(((u64 *) rwe->mask)[9])) | (((u64 *) rwe->value)[9]);
-         /* FALLTHROUGH */
-       case 4:
-         d[6] =
-           (d[6] & ~(((u64 *) rwe->mask)[6])) | (((u64 *) rwe->value)[6]);
-         d[7] =
-           (d[7] & ~(((u64 *) rwe->mask)[7])) | (((u64 *) rwe->value)[7]);
-         /* FALLTHROUGH */
-       case 3:
-         d[4] =
-           (d[4] & ~(((u64 *) rwe->mask)[4])) | (((u64 *) rwe->value)[4]);
-         d[5] =
-           (d[5] & ~(((u64 *) rwe->mask)[5])) | (((u64 *) rwe->value)[5]);
-         /* FALLTHROUGH */
-       case 2:
-         d[2] =
-           (d[2] & ~(((u64 *) rwe->mask)[2])) | (((u64 *) rwe->value)[2]);
-         d[3] =
-           (d[3] & ~(((u64 *) rwe->mask)[3])) | (((u64 *) rwe->value)[3]);
-         /* FALLTHROUGH */
-       case 1:
-         d[0] =
-           (d[0] & ~(((u64 *) rwe->mask)[0])) | (((u64 *) rwe->value)[0]);
-         d[1] =
-           (d[1] & ~(((u64 *) rwe->mask)[1])) | (((u64 *) rwe->value)[1]);
-         break;
-       default:
-         abort ();
-       }
+    case 5:
+      d[4] = (d[4] & ~rwe->mask[4]) | rwe->value[4];
+      /* FALLTHROUGH */
+    case 4:
+      d[3] = (d[3] & ~rwe->mask[3]) | rwe->value[3];
+      /* FALLTHROUGH */
+    case 3:
+      d[2] = (d[2] & ~rwe->mask[2]) | rwe->value[2];
+      /* FALLTHROUGH */
+    case 2:
+      d[1] = (d[1] & ~rwe->mask[1]) | rwe->value[1];
+      /* FALLTHROUGH */
+    case 1:
+      d[0] = (d[0] & ~rwe->mask[0]) | rwe->value[0];
+      break;
+    default:
+      abort ();
     }
 }
 
-static uword
-l2_rw_node_fn (vlib_main_t * vm,
-              vlib_node_runtime_t * node, vlib_frame_t * frame)
+VLIB_NODE_FN (l2_rw_node) (vlib_main_t * vm,
+                          vlib_node_runtime_t * node, vlib_frame_t * frame)
 {
   l2_rw_main_t *rw = &l2_rw_main;
   u32 n_left_from, *from, *to_next, next_index;
@@ -347,6 +305,7 @@ l2_rw_node_fn (vlib_main_t * vm,
   return frame->n_vectors;
 }
 
+#ifndef CLIB_MARCH_VARIANT
 int
 l2_rw_mod_entry (u32 * index,
                 u8 * mask, u8 * value, u32 len, u32 skip, u8 is_del)
@@ -395,6 +354,7 @@ l2_rw_mod_entry (u32 * index,
 
   return 0;
 }
+#endif /* CLIB_MARCH_VARIANT */
 
 static clib_error_t *
 l2_rw_entry_cli_fn (vlib_main_t * vm,
@@ -453,6 +413,7 @@ VLIB_CLI_COMMAND (l2_rw_entry_cli, static) = {
 };
 /* *INDENT-ON* */
 
+#ifndef CLIB_MARCH_VARIANT
 int
 l2_rw_interface_set_table (u32 sw_if_index, u32 table_index, u32 miss_index)
 {
@@ -470,6 +431,7 @@ l2_rw_interface_set_table (u32 sw_if_index, u32 table_index, u32 miss_index)
 
   return 0;
 }
+#endif /* CLIB_MARCH_VARIANT */
 
 static clib_error_t *
 l2_rw_interface_cli_fn (vlib_main_t * vm,
@@ -570,9 +532,9 @@ l2_rw_show_entries_cli_fn (vlib_main_t * vm,
     vlib_cli_output (vm, "No entries\n");
 
   /* *INDENT-OFF* */
-  pool_foreach(e, rw->entries, {
+  pool_foreach (e, rw->entries) {
     vlib_cli_output (vm, "%U\n", format_l2_rw_entry, e);
-  });
+  }
   /* *INDENT-ON* */
   return 0;
 }
@@ -594,7 +556,7 @@ VLIB_CLI_COMMAND (l2_rw_show_entries_cli, static) = {
 };
 /* *INDENT-ON* */
 
-int
+static int
 l2_rw_enable_disable (u32 bridge_domain, u8 disable)
 {
   u32 mask = L2INPUT_FEAT_RW;
@@ -686,7 +648,6 @@ static char *l2_rw_error_strings[] = {
 
 /* *INDENT-OFF* */
 VLIB_REGISTER_NODE (l2_rw_node) = {
-  .function = l2_rw_node_fn,
   .name = "l2-rw",
   .vector_size = sizeof (u32),
   .format_trace = format_l2_rw_trace,
@@ -699,7 +660,6 @@ VLIB_REGISTER_NODE (l2_rw_node) = {
 };
 /* *INDENT-ON* */
 
-VLIB_NODE_FUNCTION_MULTIARCH (l2_rw_node, l2_rw_node_fn)
 /*
  * fd.io coding-style-patch-verification: ON
  *