diff options
Diffstat (limited to 'pw_snapshot')
| -rw-r--r-- | pw_snapshot/BUILD.bazel | 9 | ||||
| -rw-r--r-- | pw_snapshot/cpp_compile_test.cc | 2 | ||||
| -rw-r--r-- | pw_snapshot/pw_snapshot_protos/snapshot_metadata.proto | 7 | ||||
| -rw-r--r-- | pw_snapshot/py/BUILD.bazel | 11 | ||||
| -rw-r--r-- | pw_snapshot/py/pw_snapshot/processor.py | 9 | ||||
| -rw-r--r-- | pw_snapshot/uuid_test.cc | 2 |
6 files changed, 19 insertions, 21 deletions
diff --git a/pw_snapshot/BUILD.bazel b/pw_snapshot/BUILD.bazel index 8ee969b8e..ace6335f4 100644 --- a/pw_snapshot/BUILD.bazel +++ b/pw_snapshot/BUILD.bazel @@ -12,19 +12,18 @@ # License for the specific language governing permissions and limitations under # the License. +load("@rules_python//python:proto.bzl", "py_proto_library") load( "//pw_build:pigweed.bzl", - "pw_cc_library", "pw_cc_test", ) -load("//pw_build/bazel_internal:py_proto_library.bzl", "py_proto_library") load("//pw_protobuf_compiler:pw_proto_library.bzl", "pw_proto_library") package(default_visibility = ["//visibility:public"]) licenses(["notice"]) -pw_cc_library( +cc_library( name = "uuid", srcs = [ "uuid.cc", @@ -53,10 +52,8 @@ proto_library( ], ) -# TODO: b/241456982 - Not expected to build yet. py_proto_library( name = "metadata_proto_py_pb2", - tags = ["manual"], deps = [":metadata_proto"], ) @@ -76,10 +73,8 @@ proto_library( ], ) -# TODO: b/241456982 - Not expected to build yet. py_proto_library( name = "snapshot_proto_py_pb2", - tags = ["manual"], deps = [":snapshot_proto"], ) diff --git a/pw_snapshot/cpp_compile_test.cc b/pw_snapshot/cpp_compile_test.cc index 681c3324d..755ad6dfe 100644 --- a/pw_snapshot/cpp_compile_test.cc +++ b/pw_snapshot/cpp_compile_test.cc @@ -12,10 +12,10 @@ // License for the specific language governing permissions and limitations under // the License. -#include "gtest/gtest.h" #include "pw_protobuf/encoder.h" #include "pw_snapshot_protos/snapshot.pwpb.h" #include "pw_span/span.h" +#include "pw_unit_test/framework.h" namespace pw::snapshot { namespace { diff --git a/pw_snapshot/pw_snapshot_protos/snapshot_metadata.proto b/pw_snapshot/pw_snapshot_protos/snapshot_metadata.proto index 12b3ffbd9..06b40600a 100644 --- a/pw_snapshot/pw_snapshot_protos/snapshot_metadata.proto +++ b/pw_snapshot/pw_snapshot_protos/snapshot_metadata.proto @@ -15,7 +15,7 @@ syntax = "proto3"; package pw.snapshot; -import "pw_tokenizer/proto/options.proto"; +import "pw_tokenizer_proto/options.proto"; option java_package = "pw.snapshot.proto"; option java_outer_classname = "Snapshot"; @@ -26,6 +26,11 @@ message CpuArchitecture { ARMV6M = 1; ARMV7M = 2; ARMV8M = 3; + RV32E = 4; + RV32I = 5; + RV64E = 6; + RV64I = 7; + RV128I = 8; } } diff --git a/pw_snapshot/py/BUILD.bazel b/pw_snapshot/py/BUILD.bazel index c07d0ddf5..80cc6a415 100644 --- a/pw_snapshot/py/BUILD.bazel +++ b/pw_snapshot/py/BUILD.bazel @@ -14,15 +14,13 @@ package(default_visibility = ["//visibility:public"]) -# TODO: b/241456982 - Not expected to build yet due to the dependency on -# snapshot_proto_py_pb2. py_library( name = "pw_snapshot", srcs = [ "pw_snapshot/__init__.py", "pw_snapshot/processor.py", ], - tags = ["manual"], + imports = ["."], deps = [ ":pw_snapshot_metadata", "//pw_build_info/py:pw_build_info", @@ -35,15 +33,13 @@ py_library( ], ) -# TODO: b/241456982 - Not expected to build yet due to the dependency on -# metadata_proto_py_pb2. py_library( name = "pw_snapshot_metadata", srcs = [ "pw_snapshot_metadata/__init__.py", "pw_snapshot_metadata/metadata.py", ], - tags = ["manual"], + imports = ["."], deps = [ "//pw_log_tokenized/py:pw_log_tokenized", "//pw_snapshot:metadata_proto_py_pb2", @@ -51,12 +47,9 @@ py_library( ], ) -# TODO: b/241456982 - Not expected to build yet due to the dependency on -# snapshot_proto_py_pb2. py_test( name = "metadata_test", srcs = ["metadata_test.py"], - tags = ["manual"], deps = [ ":pw_snapshot_metadata", "//pw_snapshot:snapshot_proto_py_pb2", diff --git a/pw_snapshot/py/pw_snapshot/processor.py b/pw_snapshot/py/pw_snapshot/processor.py index 62d193338..c00b248d0 100644 --- a/pw_snapshot/py/pw_snapshot/processor.py +++ b/pw_snapshot/py/pw_snapshot/processor.py @@ -59,6 +59,7 @@ def process_snapshot( detokenizer: Optional[pw_tokenizer.Detokenizer] = None, elf_matcher: Optional[ElfMatcher] = None, symbolizer_matcher: Optional[SymbolizerMatcher] = None, + llvm_symbolizer_binary: Optional[Path] = None, ) -> str: """Processes a single snapshot.""" @@ -77,9 +78,13 @@ def process_snapshot( if symbolizer_matcher is not None: symbolizer = symbolizer_matcher(snapshot) elif elf_matcher is not None: - symbolizer = LlvmSymbolizer(elf_matcher(snapshot)) + symbolizer = LlvmSymbolizer( + elf_matcher(snapshot), llvm_symbolizer_binary=llvm_symbolizer_binary + ) else: - symbolizer = LlvmSymbolizer() + symbolizer = LlvmSymbolizer( + llvm_symbolizer_binary=llvm_symbolizer_binary + ) cortex_m_cpu_state = pw_cpu_exception_cortex_m.process_snapshot( serialized_snapshot, symbolizer diff --git a/pw_snapshot/uuid_test.cc b/pw_snapshot/uuid_test.cc index 7c2f45367..ee73a5ed2 100644 --- a/pw_snapshot/uuid_test.cc +++ b/pw_snapshot/uuid_test.cc @@ -16,13 +16,13 @@ #include <array> -#include "gtest/gtest.h" #include "pw_bytes/span.h" #include "pw_protobuf/encoder.h" #include "pw_result/result.h" #include "pw_snapshot_metadata_proto/snapshot_metadata.pwpb.h" #include "pw_span/span.h" #include "pw_status/status.h" +#include "pw_unit_test/framework.h" namespace pw::snapshot { namespace { |