diff options
author | Mark Wielaard <mjw@redhat.com> | 2009-01-23 14:28:47 +0100 |
---|---|---|
committer | Mark Wielaard <mjw@redhat.com> | 2009-01-23 14:28:47 +0100 |
commit | c3bad3042df505a3470f1e20b09822a9df1d4761 (patch) | |
tree | 6842e8eaa705e406379d34cf07a85431b6d71344 /staptree.cxx | |
parent | 750b1f2f5c84acaf0776de5239dc81e2e95c1dec (diff) | |
parent | f120873cb40cfc16cc94f06fd722abc927b96227 (diff) | |
download | systemtap-steved-c3bad3042df505a3470f1e20b09822a9df1d4761.tar.gz systemtap-steved-c3bad3042df505a3470f1e20b09822a9df1d4761.tar.xz systemtap-steved-c3bad3042df505a3470f1e20b09822a9df1d4761.zip |
Merge branch 'master' into pr6866.
Diffstat (limited to 'staptree.cxx')
-rw-r--r-- | staptree.cxx | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/staptree.cxx b/staptree.cxx index 51992d7a..fafefc4e 100644 --- a/staptree.cxx +++ b/staptree.cxx @@ -494,6 +494,10 @@ print_format::components_to_string(vector<format_component> const & components) oss << 'm'; break; + case conv_memory_hex: + oss << 'M'; + break; + default: break; } @@ -655,6 +659,10 @@ print_format::string_to_components(string const & str) curr.type = conv_memory; break; + case 'M': + curr.type = conv_memory_hex; + break; + case 'd': case 'i': curr.type = conv_signed_decimal; |