diff options
Diffstat (limited to 'src/stateless/cp')
| -rw-r--r-- | src/stateless/cp/trex_stream.h | 2 | ||||
| -rw-r--r-- | src/stateless/cp/trex_stream_vm.cpp | 5 | ||||
| -rw-r--r-- | src/stateless/cp/trex_stream_vm.h | 21 |
3 files changed, 23 insertions, 5 deletions
diff --git a/src/stateless/cp/trex_stream.h b/src/stateless/cp/trex_stream.h index 36f9d407..161e9592 100644 --- a/src/stateless/cp/trex_stream.h +++ b/src/stateless/cp/trex_stream.h @@ -429,6 +429,7 @@ public: dp->m_ibg_usec = m_ibg_usec; dp->m_flags = m_flags; dp->m_action_count = m_action_count; + dp->m_random_seed = m_random_seed; dp->m_rate = m_rate; @@ -485,6 +486,7 @@ public: uint16_t m_flags; uint32_t m_stream_id; /* id from RPC can be anything */ uint16_t m_action_count; + uint32_t m_random_seed; /* config fields */ diff --git a/src/stateless/cp/trex_stream_vm.cpp b/src/stateless/cp/trex_stream_vm.cpp index 59efd6fc..7a1dc122 100644 --- a/src/stateless/cp/trex_stream_vm.cpp +++ b/src/stateless/cp/trex_stream_vm.cpp @@ -84,7 +84,7 @@ void StreamVmInstructionFlowMan::sanity_check(uint32_t ins_id,StreamVm *lp){ void StreamVmInstructionWriteMaskToPkt::Dump(FILE *fd){ - fprintf(fd," flow_var:%s, offset:%lu, cast_size:%lu, mask:0x%lx, shift:%ld, is_big:%lu \n",m_flow_var_name.c_str(),(ulong)m_pkt_offset,(ulong)m_pkt_cast_size,(ulong)m_mask,(long)m_shift,(ulong)(m_is_big_endian?1:0)); + fprintf(fd," flow_var:%s, offset:%lu, cast_size:%lu, mask:0x%lx, shift:%ld, add:%ld, is_big:%lu \n",m_flow_var_name.c_str(),(ulong)m_pkt_offset,(ulong)m_pkt_cast_size,(ulong)m_mask,(long)m_shift,(long)m_add_value,(ulong)(m_is_big_endian?1:0)); } @@ -735,6 +735,7 @@ void StreamVm::build_program(){ pmask.m_flags = flags; pmask.m_var_offset = flow_offset; pmask.m_shift = lpPkt->m_shift; + pmask.m_add_value = lpPkt->m_add_value; pmask.m_pkt_cast_size = cast_size; pmask.m_flowv_cast_size = op_size; pmask.m_pkt_offset = lpPkt->m_pkt_offset; @@ -1345,6 +1346,8 @@ void StreamDPOpPktWrMask::wr(uint8_t * flow_var_base, assert(0); } + val+=m_add_value; + /* shift the flow var val */ if (m_shift>0) { val=val<<m_shift; diff --git a/src/stateless/cp/trex_stream_vm.h b/src/stateless/cp/trex_stream_vm.h index d43d7d4b..4a0b1d59 100644 --- a/src/stateless/cp/trex_stream_vm.h +++ b/src/stateless/cp/trex_stream_vm.h @@ -444,6 +444,7 @@ struct StreamDPOpPktWrMask { uint8_t m_flowv_cast_size; /* 1,2,4 */ uint16_t m_pkt_offset; uint32_t m_mask; + int32_t m_add_value; bool is_big(){ return ( (m_flags &StreamDPOpPktWrMask::MASK_PKT_WR_IS_BIG) == StreamDPOpPktWrMask::MASK_PKT_WR_IS_BIG ?true:false); } @@ -1037,12 +1038,14 @@ public: uint8_t pkt_cast_size, /* valid 1,2,4 */ uint32_t mask, int shift, /* positive is shift left, negetive shift right */ + int32_t add_value = 0, bool is_big_endian = true) : m_flow_var_name(flow_var_name), m_pkt_offset(pkt_offset), m_pkt_cast_size(pkt_cast_size), m_mask(mask), m_shift(shift), + m_add_value(add_value), m_is_big_endian(is_big_endian) {} virtual instruction_type_t get_instruction_type() const { @@ -1057,6 +1060,7 @@ public: m_pkt_cast_size, m_mask, m_shift, + m_add_value, m_is_big_endian); } @@ -1070,7 +1074,8 @@ public: uint8_t m_pkt_cast_size; /* valid 1,2,4 */ uint32_t m_mask; - int m_shift; + int m_shift; + int m_add_value; bool m_is_big_endian; }; @@ -1271,7 +1276,8 @@ public: uint16_t prog_size, uint16_t max_pkt_offset, uint16_t prefix_size, - bool a_is_pkt_size_var + bool a_is_pkt_size_var, + bool a_is_random_seed ){ if (bss) { @@ -1298,6 +1304,7 @@ public: m_max_pkt_offset_change = max_pkt_offset; m_prefix_size = prefix_size; m_is_pkt_size_var=a_is_pkt_size_var; + m_is_random_seed=a_is_random_seed; } ~StreamVmDp(){ @@ -1320,7 +1327,8 @@ public: m_program_size, m_max_pkt_offset_change, m_prefix_size, - m_is_pkt_size_var + m_is_pkt_size_var, + m_is_random_seed ); assert(lp); return (lp); @@ -1368,6 +1376,9 @@ public: bool is_pkt_size_var(){ return (m_is_pkt_size_var); } + bool is_random_seed(){ + return (m_is_random_seed); + } private: @@ -1378,6 +1389,7 @@ private: uint16_t m_max_pkt_offset_change; uint16_t m_prefix_size; bool m_is_pkt_size_var; + bool m_is_random_seed; }; @@ -1440,7 +1452,8 @@ public: get_dp_instruction_buffer()->get_program_size(), get_max_packet_update_offset(), get_prefix_size(), - is_var_pkt_size() + is_var_pkt_size(), + m_is_random_var ); assert(lp); return (lp); |