Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-11 11:08:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

renaming instruction "type" to "class"

Browse source
This commit is contained in:
Vern Paxson 2024-06-06 17:19:43 -04:00
parent 93946c7d5d
commit c0eada4187
5 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
auxil/gen-zam

@ -1 +1 @@
Subproject commit ed44de9c43ad84fbcf42176719b7a985f538cc4d Subproject commit 21ba218d2ed7ec27ef009897e9c83576106a85ae

2
src/script_opt/ZAM/AM-Opt.cc
View file

@ -303,7 +303,7 @@ bool ZAMCompiler::PruneUnused() {
if ( assignmentless_op.count(inst->op) == 0 ) if ( assignmentless_op.count(inst->op) == 0 )
reporter->InternalError("inconsistency in re-flavoring instruction with side effects"); reporter->InternalError("inconsistency in re-flavoring instruction with side effects");
inst->op_type = assignmentless_op_type[inst->op]; inst->op_type = assignmentless_op_class[inst->op];
inst->op = assignmentless_op[inst->op]; inst->op = assignmentless_op[inst->op];
inst->v1 = inst->v2; inst->v1 = inst->v2;

10
src/script_opt/ZAM/OPs/README.txt
View file

@ -145,6 +145,16 @@
# all of possible values not explicitly listed (used in # all of possible values not explicitly listed (used in
# conjunction with eval-type - see below) # conjunction with eval-type - see below)
# #
# op-types similar to op-type, but lists a type for each operand
# (including assignment target)
#
# Note that these types collectively apply to each instance of
# an operation, whereas listing multiple "op-type" types
# iterates through those one-at-a-time in turn (and generally
# the point is that the each type applies to *all* operands,
# rather than a per-operand list). Given that, the two are
# incompatible.
#
# eval specifies a block of C++ code used to evaluation the # eval specifies a block of C++ code used to evaluation the
# execution of the instruction. The block begins with the # execution of the instruction. The block begins with the
# remainder of the "eval" line and continues until either a # remainder of the "eval" line and continues until either a

4
src/script_opt/ZAM/ZInst.h
View file

@ -551,8 +551,8 @@ extern std::unordered_map<ZOp, std::unordered_map<TypeTag, ZOp>> assignment_flav
// value is superfluous. // value is superfluous.
extern std::unordered_map<ZOp, ZOp> assignmentless_op; extern std::unordered_map<ZOp, ZOp> assignmentless_op;
// Maps flavorful assignments to what op-type their non-assignment // Maps flavorful assignments to what operand class their non-assignment
// counterpart uses. // counterpart uses.
extern std::unordered_map<ZOp, ZAMOpType> assignmentless_op_type; extern std::unordered_map<ZOp, ZAMOpType> assignmentless_op_class;
} // namespace zeek::detail } // namespace zeek::detail

2
src/script_opt/ZAM/ZOp.cc
View file

@ -57,7 +57,7 @@ bool op_side_effects[] = {
std::unordered_map<ZOp, std::unordered_map<TypeTag, ZOp>> assignment_flavor; std::unordered_map<ZOp, std::unordered_map<TypeTag, ZOp>> assignment_flavor;
std::unordered_map<ZOp, ZOp> assignmentless_op; std::unordered_map<ZOp, ZOp> assignmentless_op;
std::unordered_map<ZOp, ZAMOpType> assignmentless_op_type; std::unordered_map<ZOp, ZAMOpType> assignmentless_op_class;
ZOp AssignmentFlavor(ZOp orig, TypeTag tag, bool strict) { ZOp AssignmentFlavor(ZOp orig, TypeTag tag, bool strict) {
static bool did_init = false; static bool did_init = false;