No public description PiperOrigin-RevId: 819273859 Change-Id: I17db26594f47ede76043050d58c6f544c44c1c59
diff --git a/mpact/sim/decoder/BUILD b/mpact/sim/decoder/BUILD index 00eaa42..71202c7 100644 --- a/mpact/sim/decoder/BUILD +++ b/mpact/sim/decoder/BUILD
@@ -117,6 +117,7 @@ ":antlr_parser_wrapper", ":decoder_error_listener", ":format_name", + "//util/regexp/re2", "@com_google_absl//absl/base:no_destructor", "@com_google_absl//absl/container:btree", "@com_google_absl//absl/container:flat_hash_map", @@ -128,7 +129,6 @@ "@com_google_absl//absl/status", "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/strings", - "@com_googlesource_code_re2//:re2", ], ) @@ -221,6 +221,7 @@ ":bin_format_lexer", ":bin_format_parser", ":decoder_error_listener", + "//util/regexp/re2", "@com_google_absl//absl/container:btree", "@com_google_absl//absl/container:flat_hash_map", "@com_google_absl//absl/container:flat_hash_set", @@ -230,7 +231,6 @@ "@com_google_absl//absl/status", "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/strings", - "@com_googlesource_code_re2//:re2", ], ) @@ -319,6 +319,7 @@ ":proto_format_lexer", ":proto_format_parser", "//mpact/sim/generic:type_helpers", + "//util/regexp/re2", "@com_google_absl//absl/container:btree", "@com_google_absl//absl/container:flat_hash_map", "@com_google_absl//absl/container:flat_hash_set", @@ -329,7 +330,6 @@ "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/strings", "@com_google_protobuf//:protobuf", - "@com_googlesource_code_re2//:re2", ], )
diff --git a/mpact/sim/decoder/bin_format_visitor.cc b/mpact/sim/decoder/bin_format_visitor.cc index af53535..54ec8fd 100644 --- a/mpact/sim/decoder/bin_format_visitor.cc +++ b/mpact/sim/decoder/bin_format_visitor.cc
@@ -45,7 +45,7 @@ #include "mpact/sim/decoder/instruction_encoding.h" #include "mpact/sim/decoder/instruction_group.h" #include "mpact/sim/decoder/overlay.h" -#include "re2/re2.h" +#include "util/regexp/re2/re2.h" namespace mpact { namespace sim {
diff --git a/mpact/sim/decoder/bin_format_visitor.h b/mpact/sim/decoder/bin_format_visitor.h index e1ba70f..75dab56 100644 --- a/mpact/sim/decoder/bin_format_visitor.h +++ b/mpact/sim/decoder/bin_format_visitor.h
@@ -34,7 +34,7 @@ #include "mpact/sim/decoder/bin_encoding_info.h" #include "mpact/sim/decoder/bin_format_contexts.h" #include "mpact/sim/decoder/decoder_error_listener.h" -#include "re2/re2.h" +#include "util/regexp/re2/re2.h" namespace mpact { namespace sim {
diff --git a/mpact/sim/decoder/instruction_set_visitor.cc b/mpact/sim/decoder/instruction_set_visitor.cc index 29cd685..9b785cc 100644 --- a/mpact/sim/decoder/instruction_set_visitor.cc +++ b/mpact/sim/decoder/instruction_set_visitor.cc
@@ -45,7 +45,7 @@ #include "mpact/sim/decoder/opcode.h" #include "mpact/sim/decoder/slot.h" #include "mpact/sim/decoder/template_expression.h" -#include "re2/re2.h" +#include "util/regexp/re2/re2.h" // This flag is used to set the version of the generated code. Version 1 is // the default version. Version 2 adds an instruction pointer to the resource @@ -2451,8 +2451,8 @@ "#include " "\"mpact/sim/util/asm/opcode_assembler_interface.h\"\n" "#include \"mpact/sim/util/asm/resolver_interface.h\"\n" - "#include \"re2/re2.h\"\n" - "#include \"re2/set.h\"\n" + "#include \"util/regexp/re2/re2.h\"\n" + "#include \"util/regexp/re2/set.h\"\n" "#include \"", opcode_file_name, "\"\n" @@ -2471,8 +2471,8 @@ "#include " "\"mpact/sim/util/asm/opcode_assembler_interface.h\"\n" "#include \"mpact/sim/util/asm/resolver_interface.h\"\n" - "#include \"re2/re2.h\"\n" - "#include \"re2/set.h\"\n" + "#include \"util/regexp/re2/re2.h\"\n" + "#include \"util/regexp/re2/set.h\"\n" "#include \"", opcode_file_name, "\"\n"
diff --git a/mpact/sim/decoder/instruction_set_visitor.h b/mpact/sim/decoder/instruction_set_visitor.h index 83fa3ba..82c3280 100644 --- a/mpact/sim/decoder/instruction_set_visitor.h +++ b/mpact/sim/decoder/instruction_set_visitor.h
@@ -43,7 +43,7 @@ #include "mpact/sim/decoder/opcode.h" #include "mpact/sim/decoder/slot.h" #include "mpact/sim/decoder/template_expression.h" -#include "re2/re2.h" +#include "util/regexp/re2/re2.h" // This file declares the classes that interact with the antlr4 library // to parse an input stream and generate the parse tree, then visiting the
diff --git a/mpact/sim/decoder/mpact_sim_isa.bzl b/mpact/sim/decoder/mpact_sim_isa.bzl index aab57f7..d5e0071 100644 --- a/mpact/sim/decoder/mpact_sim_isa.bzl +++ b/mpact/sim/decoder/mpact_sim_isa.bzl
@@ -126,8 +126,10 @@ lib_deps.append("@com_google_mpact-sim//mpact/sim/generic:instruction") if "@com_google_mpact-sim//mpact/sim/util/asm" not in deps: lib_deps.append("@com_google_mpact-sim//mpact/sim/util/asm") - if "@com_googlesource_code_re2//:re2" not in deps: - lib_deps.append("@com_googlesource_code_re2//:re2") + if "//util/regexp/re2" not in deps: + lib_deps.append("//util/regexp/re2") + if "//util/regexp/re2:set" not in deps: + lib_deps.append("//util/regexp/re2:set") if "@com_google_absl//absl/status" not in deps: lib_deps.append("@com_google_absl//absl/status") if "@com_google_absl//absl/status:statusor" not in deps:
diff --git a/mpact/sim/decoder/proto_format_visitor.cc b/mpact/sim/decoder/proto_format_visitor.cc index c62acc5..c562e70 100644 --- a/mpact/sim/decoder/proto_format_visitor.cc +++ b/mpact/sim/decoder/proto_format_visitor.cc
@@ -44,9 +44,9 @@ #include "mpact/sim/decoder/proto_instruction_decoder.h" #include "mpact/sim/decoder/proto_instruction_encoding.h" #include "mpact/sim/decoder/proto_instruction_group.h" -#include "re2/re2.h" #include "src/google/protobuf/compiler/importer.h" #include "src/google/protobuf/descriptor.h" +#include "util/regexp/re2/re2.h" namespace mpact { namespace sim {
diff --git a/mpact/sim/decoder/proto_format_visitor.h b/mpact/sim/decoder/proto_format_visitor.h index c57730d..2024a59 100644 --- a/mpact/sim/decoder/proto_format_visitor.h +++ b/mpact/sim/decoder/proto_format_visitor.h
@@ -37,8 +37,8 @@ #include "mpact/sim/decoder/proto_encoding_info.h" #include "mpact/sim/decoder/proto_format_contexts.h" #include "mpact/sim/decoder/proto_instruction_group.h" -#include "re2/re2.h" #include "src/google/protobuf/descriptor.h" +#include "util/regexp/re2/re2.h" // This file defines the visitor class used to generate C++ code for decoding // instructions encoded in protobufs.
diff --git a/mpact/sim/decoder/test/BUILD b/mpact/sim/decoder/test/BUILD index caf511f..7719b84 100644 --- a/mpact/sim/decoder/test/BUILD +++ b/mpact/sim/decoder/test/BUILD
@@ -153,6 +153,7 @@ deps = [ ":log_sink", "//mpact/sim/decoder:isa_parser", + "//util/regexp/re2", "@com_google_absl//absl/flags:flag", "@com_google_absl//absl/log:check", "@com_google_absl//absl/log:log_sink_registry", @@ -162,7 +163,6 @@ "@com_google_absl//absl/strings", "@com_google_googletest//:gtest", "@com_google_googletest//:gtest_main", - "@com_googlesource_code_re2//:re2", ], ) @@ -373,6 +373,7 @@ deps = [ ":log_sink", "//mpact/sim/decoder:bin_format_visitor", + "//util/regexp/re2", "@com_google_absl//absl/flags:flag", "@com_google_absl//absl/log:check", "@com_google_absl//absl/log:log_sink_registry", @@ -381,7 +382,6 @@ "@com_google_absl//absl/strings", "@com_google_googletest//:gtest", "@com_google_googletest//:gtest_main", - "@com_googlesource_code_re2//:re2", ], ) @@ -400,6 +400,7 @@ deps = [ ":log_sink", "//mpact/sim/decoder:proto_format_visitor", + "//util/regexp/re2", "@com_google_absl//absl/flags:flag", "@com_google_absl//absl/log", "@com_google_absl//absl/log:check", @@ -409,7 +410,6 @@ "@com_google_absl//absl/strings", "@com_google_googletest//:gtest", "@com_google_googletest//:gtest_main", - "@com_googlesource_code_re2//:re2", ], )
diff --git a/mpact/sim/decoder/test/bin_format_visitor_test.cc b/mpact/sim/decoder/test/bin_format_visitor_test.cc index b1da3ed..3738440 100644 --- a/mpact/sim/decoder/test/bin_format_visitor_test.cc +++ b/mpact/sim/decoder/test/bin_format_visitor_test.cc
@@ -25,7 +25,7 @@ #include "absl/strings/str_cat.h" #include "googletest/include/gtest/gtest.h" #include "mpact/sim/decoder/test/log_sink.h" -#include "re2/re2.h" +#include "util/regexp/re2/re2.h" namespace {
diff --git a/mpact/sim/decoder/test/instruction_set_visitor_test.cc b/mpact/sim/decoder/test/instruction_set_visitor_test.cc index d7c338d..a28b88c 100644 --- a/mpact/sim/decoder/test/instruction_set_visitor_test.cc +++ b/mpact/sim/decoder/test/instruction_set_visitor_test.cc
@@ -26,7 +26,7 @@ #include "googlemock/include/gmock/gmock.h" // IWYU pragma: keep #include "googletest/include/gtest/gtest.h" #include "mpact/sim/decoder/test/log_sink.h" -#include "re2/re2.h" +#include "util/regexp/re2/re2.h" namespace mpact { namespace sim {
diff --git a/mpact/sim/util/asm/BUILD b/mpact/sim/util/asm/BUILD index 3e909d1..db3d37d 100644 --- a/mpact/sim/util/asm/BUILD +++ b/mpact/sim/util/asm/BUILD
@@ -45,6 +45,7 @@ hdrs = ["simple_assembler.h"], deps = [ ":asm", + "//util/regexp/re2", "@com_github_serge1_elfio//:elfio", "@com_google_absl//absl/container:flat_hash_map", "@com_google_absl//absl/container:flat_hash_set", @@ -54,6 +55,5 @@ "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/strings", "@com_google_absl//absl/types:span", - "@com_googlesource_code_re2//:re2", ], )
diff --git a/mpact/sim/util/asm/simple_assembler.cc b/mpact/sim/util/asm/simple_assembler.cc index f9af385..78276ec 100644 --- a/mpact/sim/util/asm/simple_assembler.cc +++ b/mpact/sim/util/asm/simple_assembler.cc
@@ -41,7 +41,7 @@ #include "mpact/sim/util/asm/opcode_assembler_interface.h" #include "mpact/sim/util/asm/resolver.h" #include "mpact/sim/util/asm/resolver_interface.h" -#include "re2/re2.h" +#include "util/regexp/re2/re2.h" namespace mpact { namespace sim {
diff --git a/mpact/sim/util/asm/simple_assembler.h b/mpact/sim/util/asm/simple_assembler.h index e2ed324..9ae2b06 100644 --- a/mpact/sim/util/asm/simple_assembler.h +++ b/mpact/sim/util/asm/simple_assembler.h
@@ -33,7 +33,7 @@ #include "elfio/elfio_symbols.hpp" #include "mpact/sim/util/asm/opcode_assembler_interface.h" #include "mpact/sim/util/asm/resolver_interface.h" -#include "re2/re2.h" +#include "util/regexp/re2/re2.h" // This file declares the SimpleAssembler class, which provides simple handling // of assembly source, including a number of assembly directives. It currently
diff --git a/mpact/sim/util/asm/test/BUILD b/mpact/sim/util/asm/test/BUILD index 634b617..fc64d46 100644 --- a/mpact/sim/util/asm/test/BUILD +++ b/mpact/sim/util/asm/test/BUILD
@@ -74,12 +74,12 @@ ":riscv64x_isa", "//mpact/sim/generic:type_helpers", "//mpact/sim/util/asm", + "//util/regexp/re2", "@com_google_absl//absl/base:no_destructor", "@com_google_absl//absl/container:flat_hash_map", "@com_google_absl//absl/status", "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/strings", - "@com_googlesource_code_re2//:re2", ], ) @@ -92,6 +92,7 @@ ":riscv64x_isa", "//mpact/sim/util/asm", "//mpact/sim/util/asm:simple_assembler", + "//util/regexp/re2", "@com_github_serge1_elfio//:elfio", "@com_google_absl//absl/base:no_destructor", "@com_google_absl//absl/container:flat_hash_map", @@ -100,6 +101,5 @@ "@com_google_absl//absl/strings", "@com_google_absl//absl/types:span", "@com_google_googletest//:gtest_main", - "@com_googlesource_code_re2//:re2", ], )
diff --git a/mpact/sim/util/asm/test/riscv64x_asm_test.cc b/mpact/sim/util/asm/test/riscv64x_asm_test.cc index 3091c09..4f55ed8 100644 --- a/mpact/sim/util/asm/test/riscv64x_asm_test.cc +++ b/mpact/sim/util/asm/test/riscv64x_asm_test.cc
@@ -35,7 +35,7 @@ #include "mpact/sim/util/asm/simple_assembler.h" #include "mpact/sim/util/asm/test/riscv64x_bin_encoder_interface.h" #include "mpact/sim/util/asm/test/riscv64x_encoder.h" -#include "re2/re2.h" +#include "util/regexp/re2/re2.h" // This file contains tests for the simple assembler using a very reduced // subset of the RISC-V ISA.
diff --git a/mpact/sim/util/asm/test/riscv_bin_setters.cc b/mpact/sim/util/asm/test/riscv_bin_setters.cc index a411e87..caca342 100644 --- a/mpact/sim/util/asm/test/riscv_bin_setters.cc +++ b/mpact/sim/util/asm/test/riscv_bin_setters.cc
@@ -23,7 +23,7 @@ #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "mpact/sim/generic/type_helpers.h" -#include "re2/re2.h" +#include "util/regexp/re2/re2.h" namespace mpact { namespace sim {
diff --git a/mpact/sim/util/asm/test/riscv_bin_setters.h b/mpact/sim/util/asm/test/riscv_bin_setters.h index 83a435b..6bb5245 100644 --- a/mpact/sim/util/asm/test/riscv_bin_setters.h +++ b/mpact/sim/util/asm/test/riscv_bin_setters.h
@@ -30,7 +30,7 @@ #include "mpact/sim/util/asm/opcode_assembler_interface.h" #include "mpact/sim/util/asm/resolver_interface.h" #include "mpact/sim/util/asm/test/riscv_getter_helpers.h" -#include "re2/re2.h" +#include "util/regexp/re2/re2.h" namespace mpact { namespace sim {