nico
/
master-thesis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert everything besides naming

This commit is contained in:
Nico Schottelius 2019-07-23 20:33:09 +02:00
parent b7748997d5
commit 65e7893245
1 changed files with 25 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
p4src/minip4_solution.p4
View File

@ -14,8 +14,8 @@
typedef bit<48> EthAddr_t; typedef bit<48> EthAddr_t;
header Ethernet_h { header Ethernet_h {
EthAddr_t dstAddr; EthAddr_t dst_addr;
EthAddr_t srcAddr; EthAddr_t src_addr;
bit<16> etherType; bit<16> etherType;
} }
@ -39,25 +39,18 @@ struct digest_data_t {
* Parser * Parser
*/ */
// @Xilinx_MaxPacketRegion(1024)
// parser TopParser(packet_in b,
// out Parsed_packet p,
// out user_metadata_t user_metadata,
// out digest_data_t digest_data,
// inout sume_metadata_t sume_metadata) {
// }
@Xilinx_MaxPacketRegion(1024) @Xilinx_MaxPacketRegion(1024)
parser TopParser(packet_in packet, parser TopParser(packet_in packet,
out headers hdr, // out headers hdr,
out metadata meta, out Parsed_packet hdr,
// out user_metadata_t user_metadata, // out metadata meta,
out user_metadata_t user_metadata,
out digest_data_t digest_data, out digest_data_t digest_data,
inout sume_metadata_t standard_metadata) { inout sume_metadata_t standard_metadata) {
state start { state start {
packet.extract(hdr.ethernet); packet.extract(hdr.ethernet);
//user_metadata.unused = 0; user_metadata.unused = 0;
meta.task = 0; // all others missing //meta.task = 0; // all others missing
digest_data.unused = 0; digest_data.unused = 0;
transition accept; transition accept;
@ -71,15 +64,11 @@ parser TopParser(packet_in packet,
/******************************************************************************** /********************************************************************************
* Main * Main
*/ */
control TopPipe(
// control TopPipe(inout Parsed_packet p, inout Parsed_packet hdr,
// inout headers hdr,
// inout digest_data_t digest_data, //inout metadata meta,
// inout sume_metadata_t sume_metadata) { inout user_metadata_t user_metadata,
control TopPipe(inout headers hdr,
inout metadata meta,
//inout user_metadata_t user_metadata,
inout digest_data_t digest_data, inout digest_data_t digest_data,
inout sume_metadata_t sume_metadata) { inout sume_metadata_t sume_metadata) {
@ -228,9 +217,7 @@ control TopPipe(inout headers hdr,
send_to_all_ports; send_to_all_ports;
} }
size = 64; size = 64;
// default_action = swap_eth_addresses; // test_mirror(): in gen_testdata.py
default_action = send_to_port1; // test_port1() default_action = send_to_port1; // test_port1()
// default_action = send_to_all_ports; // test_allports():
} }
apply { apply {
@ -243,26 +230,19 @@ control TopPipe(inout headers hdr,
*/ */
@Xilinx_MaxPacketRegion(1024) @Xilinx_MaxPacketRegion(1024)
control TopDeparser(packet_out packet, control TopDeparser(
in headers hdr, packet_out packet,
//in user_metadata_t user_metadata, // in headers hdr,
in metadata meta, in Parsed_packet hdr,
inout digest_data_t digest_data, in user_metadata_t user_metadata,
inout sume_metadata_t sume_metadata) { //in metadata meta,
inout digest_data_t digest_data,
inout sume_metadata_t sume_metadata) {
apply {
packet.emit(hdr.ethernet);
}
// @Xilinx_MaxPacketRegion(1024) // #include "deparser.p4"
// control TopDeparser(packet_out b,
// in Parsed_packet p,
// inout digest_data_t digest_data,
// inout sume_metadata_t sume_metadata) {
apply {
packet.emit(hdr.ethernet);
}
// #include "deparser.p4"
} }