fixed l2_switch target (#186)

p4lang · Sep 6, 2016 · ff0cdf4 · ff0cdf4
1 parent 349aeba
commit ff0cdf4
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 21 deletions.
diff --git a/targets/l2_switch/l2_switch.cpp b/targets/l2_switch/l2_switch.cpp
@@ -51,6 +51,14 @@ class SimpleSwitch : public Switch {
   SimpleSwitch()
     : input_buffer(1024), output_buffer(128), pre(new McSimplePre()) {
     add_component<McSimplePre>(pre);
+
+    add_required_field("standard_metadata", "ingress_port");
+    add_required_field("standard_metadata", "egress_port");
+    add_required_field("intrinsic_metadata", "mgid");
+    add_required_field("intrinsic_metadata", "learn_id");
+
+    force_arith_header("standard_metadata");
+    force_arith_header("intrinsic_metadata");
   }
 
   int receive(int port_num, const char *buffer, int len) {
@@ -111,8 +119,6 @@ void SimpleSwitch::pipeline_thread() {
                     ingress_port);
 
     phv->get_field("standard_metadata.ingress_port").set(ingress_port);
-    ingress_port = phv->get_field("standard_metadata.ingress_port").get_int();
-    std::cout << ingress_port << std::endl;
 
     parser->parse(packet.get());
     ingress_mau->apply(packet.get());

diff --git a/targets/l2_switch/l2_switch.json b/targets/l2_switch/l2_switch.json
@@ -155,22 +155,6 @@
                 }
             ],
             "primitives": [
-                {
-                    "op": "modify_field",
-                    "parameters": [
-                        {
-                            "type": "field",
-                            "value": [
-                                "standard_metadata",
-                                "ingress_port"
-                            ]
-                        },
-                        {
-                            "type": "hexstr",
-                            "value": "0x101"
-                        }
-                    ]
-                },
                 {
                     "op": "modify_field",
                     "parameters": [
@@ -348,4 +332,4 @@
             ]
         }
     ]
-}
+}
diff --git a/targets/l2_switch/l2_switch.p4 b/targets/l2_switch/l2_switch.p4
@@ -69,8 +69,6 @@ table smac {
 }
 
 action forward(port) {
-    // hack to force BM to enable arithmetic on this field
-    modify_field(standard_metadata.ingress_port, 257);
     modify_field(standard_metadata.egress_port, port);
 }
 

diff --git a/targets/simple_switch/simple_switch.cpp b/targets/simple_switch/simple_switch.cpp
@@ -86,6 +86,7 @@ SimpleSwitch::SimpleSwitch(int max_port, bool enable_swap)
   add_required_field("standard_metadata", "instance_type");
   add_required_field("standard_metadata", "egress_spec");
   add_required_field("standard_metadata", "clone_spec");
+  add_required_field("standard_metadata", "egress_port");
 
   force_arith_field("standard_metadata", "ingress_port");
   force_arith_field("standard_metadata", "packet_length");