projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: ctf-text: signed base 8, 16 printout
[babeltrace.git]
/
formats
/
ctf-text
/
types
/
integer.c
diff --git
a/formats/ctf-text/types/integer.c
b/formats/ctf-text/types/integer.c
index 34df4fc9fca49190f7c55c0d26440563ed18f5d8..f4d392563b1db522bf580f53ea4f27949339f6bf 100644
(file)
--- a/
formats/ctf-text/types/integer.c
+++ b/
formats/ctf-text/types/integer.c
@@
-101,10
+101,19
@@
int ctf_text_integer_write(struct bt_stream_pos *ppos, struct bt_definition *def
{
uint64_t v;
{
uint64_t v;
- if (!integer_declaration->signedness)
+ if (!integer_declaration->signedness)
{
v = integer_definition->value._unsigned;
v = integer_definition->value._unsigned;
- else
+ } else {
v = (uint64_t) integer_definition->value._signed;
v = (uint64_t) integer_definition->value._signed;
+ if (integer_declaration->len < 64) {
+ /* Round length to the nearest 3-bit */
+ uint8_t rounded_len =
+ integer_declaration->len +
+ ((integer_declaration->len + 2) % 3);
+
+ v &= ((uint64_t) 1 << rounded_len) - 1;
+ }
+ }
fprintf(pos->fp, "0%" PRIo64, v);
break;
fprintf(pos->fp, "0%" PRIo64, v);
break;
@@
-113,10
+122,18
@@
int ctf_text_integer_write(struct bt_stream_pos *ppos, struct bt_definition *def
{
uint64_t v;
{
uint64_t v;
- if (!integer_declaration->signedness)
+ if (!integer_declaration->signedness)
{
v = integer_definition->value._unsigned;
v = integer_definition->value._unsigned;
- else
+ } else {
v = (uint64_t) integer_definition->value._signed;
v = (uint64_t) integer_definition->value._signed;
+ if (integer_declaration->len < 64) {
+ /* Round length to the nearest nibble */
+ uint8_t rounded_len =
+ ((integer_declaration->len + 3) & ~0x3);
+
+ v &= ((uint64_t) 1 << rounded_len) - 1;
+ }
+ }
fprintf(pos->fp, "0x%" PRIX64, v);
break;
fprintf(pos->fp, "0x%" PRIX64, v);
break;
This page took
0.024255 seconds
and
4
git commands to generate.